Author: steve.ebersole(a)jboss.com Date: 2006-12-12 19:14:17 -0500 (Tue, 12 Dec 2006) New Revision: 10981 Modified: trunk/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java trunk/Hibernate3/test/org/hibernate/test/AllTests.java trunk/Hibernate3/test/org/hibernate/test/bidi/AuctionTest2.java trunk/Hibernate3/test/org/hibernate/test/legacy/MasterDetailTest.java Log: cleanup Modified: trunk/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java 2006-12-13 00:13:43 UTC (rev 10980) +++ trunk/Hibernate3/test/org/hibernate/junit/functional/FunctionalTestCase.java 2006-12-13 00:14:17 UTC (rev 10981) @@ -377,7 +377,7 @@ * @return true if sensitive */ protected boolean dialectIsCaseSensitive(String testDescription) { - if ( getDialect().areStringComparisonsCaseInsensitive() ) { + if ( ! getDialect().areStringComparisonsCaseInsensitive() ) { reportSkip( "Dialect is case sensitive. ", testDescription ); return true; } Modified: trunk/Hibernate3/test/org/hibernate/test/AllTests.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/AllTests.java 2006-12-13 00:13:43 UTC (rev 10980) +++ trunk/Hibernate3/test/org/hibernate/test/AllTests.java 2006-12-13 00:14:17 UTC (rev 10981) @@ -66,7 +66,6 @@ import org.hibernate.test.legacy.CacheTest; import org.hibernate.test.legacy.ComponentNotNullTest; import org.hibernate.test.legacy.ConfigurationPerformanceTest; -import org.hibernate.test.legacy.CustomSQLTest; import org.hibernate.test.legacy.FooBarTest; import org.hibernate.test.legacy.FumTest; import org.hibernate.test.legacy.IJ2Test; @@ -122,12 +121,12 @@ import org.hibernate.test.unconstrained.UnconstrainedTest; import org.hibernate.test.unidir.BackrefTest; import org.hibernate.test.unionsubclass.UnionSubclassTest; +import org.hibernate.test.usercollection.UserCollectionTypeTest; import org.hibernate.test.util.UtilSuite; import org.hibernate.test.version.VersionTest; import org.hibernate.test.version.db.DbVersionTest; import org.hibernate.test.version.sybase.SybaseTimestampVersioningTest; import org.hibernate.test.where.WhereTest; -import org.hibernate.test.usercollection.UserCollectionTypeTest; /** * @author Gavin King @@ -322,7 +321,6 @@ suite.addTest( OneToOneCacheTest.suite() ); suite.addTest( NonReflectiveBinderTest.suite() ); suite.addTest( ConfigurationPerformanceTest.suite() ); // Added to ensure we can utilize the recommended performance tips ;) - suite.addTest( CustomSQLTest.suite() ); return filter( suite ); // return suite; } Modified: trunk/Hibernate3/test/org/hibernate/test/bidi/AuctionTest2.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/bidi/AuctionTest2.java 2006-12-13 00:13:43 UTC (rev 10980) +++ trunk/Hibernate3/test/org/hibernate/test/bidi/AuctionTest2.java 2006-12-13 00:14:17 UTC (rev 10981) @@ -9,7 +9,6 @@ import org.hibernate.Transaction; import org.hibernate.junit.functional.FunctionalTestCase; import org.hibernate.junit.functional.FunctionalTestClassTestSuite; -import org.hibernate.dialect.Oracle9Dialect; import junit.framework.Test; @@ -30,10 +29,14 @@ return new FunctionalTestClassTestSuite( AuctionTest2.class ); } + public boolean createSchema() { + return getDialect().supportsExistsInSelect(); + } + public void testLazy() { - - if ( getDialect() instanceof Oracle9Dialect ) { - return; //ora doesn't like exists() in the select clause + if ( ! getDialect().supportsExistsInSelect() ) { + reportSkip( "dialect does not support exist fragments in the select clause", "bidi support" ); + return; } Session s = openSession(); Modified: trunk/Hibernate3/test/org/hibernate/test/legacy/MasterDetailTest.java =================================================================== --- trunk/Hibernate3/test/org/hibernate/test/legacy/MasterDetailTest.java 2006-12-13 00:13:43 UTC (rev 10980) +++ trunk/Hibernate3/test/org/hibernate/test/legacy/MasterDetailTest.java 2006-12-13 00:14:17 UTC (rev 10981) @@ -877,7 +877,7 @@ ss.close(); s.refresh(c); - assertTrue( c.getSubcategories().size()==2 ); + assertEquals( 2, c.getSubcategories().size() ); s.flush(); s.connection().commit(); @@ -885,7 +885,7 @@ s = openSession(); c = (Category) s.load(Category.class, id); - assertTrue( c.getSubcategories().size()==2 ); + assertEquals( 2, c.getSubcategories().size() ); s.delete(c); s.flush(); s.connection().commit();