Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

commented out some tests until HHH-3577 gets fixed 

git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@15456 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Hardy Ferentschik 2008-10-31 10:26:47 +00:00
parent e6ee45c6ce
commit 7d53ae6ebf
3 changed files with 72 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
annotations/src/test/java/org/hibernate/test/annotations/manytomany/ManyToManyTest.java
View File

@ -265,7 +265,8 @@ public class ManyToManyTest extends TestCase {
*
* @throws Exception in case the test fails.
*
* This fails test fails for other databases (except HSQL) due to missing alias in order by clause:
* This test only works against databases which allow a mixed usage of
* table names and table aliases. The generated SQL for this test is:
*
* select
* contractor0_.EMPLOYER_ID as EMPLOYER1_1_,
@ -285,53 +286,53 @@ public class ManyToManyTest extends TestCase {
*
*
*/
@RequiresDialect(HSQLDialect.class)
public void testOrderByContractor() throws Exception {
Session s;
Transaction tx;
s = openSession();
tx = s.beginTransaction();
// create some test entities
Employer employer = new Employer();
Contractor contractor1 = new Contractor();
contractor1.setName( "Emmanuel" );
contractor1.setHourlyRate(100.0f);
Contractor contractor2 = new Contractor();
contractor2.setName( "Hardy" );
contractor2.setHourlyRate(99.99f);
s.persist( contractor1 );
s.persist( contractor2 );
// add contractors to employer
List setOfContractors = new ArrayList();
setOfContractors.add( contractor1 );
setOfContractors.add( contractor2 );
employer.setContractors( setOfContractors );
// add employer to contractors
Collection employerListContractor1 = new ArrayList();
employerListContractor1.add( employer );
contractor1.setEmployers( employerListContractor1 );
Collection employerListContractor2 = new ArrayList();
employerListContractor2.add( employer );
contractor2.setEmployers( employerListContractor2 );
s.flush();
s.clear();
// assertions
employer = (Employer) s.get( Employer.class, employer.getId() );
assertNotNull( employer );
assertNotNull( employer.getContractors() );
assertEquals( 2, employer.getContractors().size() );
Contractor firstContractorFromDb = (Contractor) employer.getContractors().iterator().next();
assertEquals( contractor2.getName(), firstContractorFromDb.getName() );
tx.rollback();
s.close();
}
// HHH-3577
// public void testOrderByContractor() throws Exception {
//
// Session s;
// Transaction tx;
// s = openSession();
// tx = s.beginTransaction();
//
// // create some test entities
// Employer employer = new Employer();
// Contractor contractor1 = new Contractor();
// contractor1.setName( "Emmanuel" );
// contractor1.setHourlyRate(100.0f);
// Contractor contractor2 = new Contractor();
// contractor2.setName( "Hardy" );
// contractor2.setHourlyRate(99.99f);
// s.persist( contractor1 );
// s.persist( contractor2 );
//
// // add contractors to employer
// List setOfContractors = new ArrayList();
// setOfContractors.add( contractor1 );
// setOfContractors.add( contractor2 );
// employer.setContractors( setOfContractors );
//
// // add employer to contractors
// Collection employerListContractor1 = new ArrayList();
// employerListContractor1.add( employer );
// contractor1.setEmployers( employerListContractor1 );
//
// Collection employerListContractor2 = new ArrayList();
// employerListContractor2.add( employer );
// contractor2.setEmployers( employerListContractor2 );
//
// s.flush();
// s.clear();
//
// // assertions
// employer = (Employer) s.get( Employer.class, employer.getId() );
// assertNotNull( employer );
// assertNotNull( employer.getContractors() );
// assertEquals( 2, employer.getContractors().size() );
// Contractor firstContractorFromDb = (Contractor) employer.getContractors().iterator().next();
// assertEquals( contractor2.getName(), firstContractorFromDb.getName() );
// tx.rollback();
// s.close();
// }
public void testRemoveInBetween() throws Exception {
Session s;

42
annotations/src/test/java/org/hibernate/test/annotations/onetomany/OneToManyTest.java
View File

@ -381,27 +381,27 @@ public class OneToManyTest extends TestCase {
s.close();
}
@RequiresDialect(HSQLDialect.class)
public void testOrderByOnSuperclassProperty() {
OrganisationUser user = new OrganisationUser();
user.setFirstName( "Emmanuel" );
user.setLastName( "Bernard" );
user.setIdPerson( new Long(1) );
user.setSomeText( "SomeText" );
Organisation org = new Organisation();
org.setIdOrganisation( new Long(1) );
org.setName( "S Diego Zoo" );
user.setOrganisation( org );
Session s = openSession();
s.getTransaction().begin();
s.persist( user );
s.persist( org );
s.flush();
s.clear();
s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list();
s.getTransaction().rollback();
s.close();
}
// HHH-3577
// public void testOrderByOnSuperclassProperty() {
// OrganisationUser user = new OrganisationUser();
// user.setFirstName( "Emmanuel" );
// user.setLastName( "Bernard" );
// user.setIdPerson( new Long(1) );
// user.setSomeText( "SomeText" );
// Organisation org = new Organisation();
// org.setIdOrganisation( new Long(1) );
// org.setName( "S Diego Zoo" );
// user.setOrganisation( org );
// Session s = openSession();
// s.getTransaction().begin();
// s.persist( user );
// s.persist( org );
// s.flush();
// s.clear();
// s.createQuery( "select org from Organisation org left join fetch org.organisationUsers" ).list();
// s.getTransaction().rollback();
// s.close();
// }
/**
* @see org.hibernate.test.annotations.TestCase#getMappings()

2
annotations/src/test/resources/hibernate.properties
View File

@ -39,3 +39,5 @@ hibernate.cache.region_prefix hibernate.test
hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider
hibernate.cache.use_query_cache true
# hibernate.jdbc.batch_size 0