From f2937842431c672fc9323b19a98940d7f34daff4 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Wed, 10 Sep 2008 17:53:46 +0000 Subject: [PATCH] test suite cleanups git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@15178 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../test/filter/DynamicFilterTest.java | 2 +- .../test/hql/ASTParserLoadingTest.java | 2 +- .../enhanced/SequenceStyleConfigUnitTest.java | 19 +++++++++++-------- testsuite/src/test/resources/log4j.properties | 3 ++- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java b/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java index 4c6f92e1b5..2be8592e09 100644 --- a/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java +++ b/testsuite/src/test/java/org/hibernate/test/filter/DynamicFilterTest.java @@ -279,7 +279,7 @@ public class DynamicFilterTest extends FunctionalTestCase { session.enableFilter( "effectiveDate" ).setParameter( "asOfDate", new Date() ); Product prod = ( Product ) session.createCriteria( Product.class ) - .setResultTransformer( new DistinctRootEntityResultTransformer() ) + .setResultTransformer( DistinctRootEntityResultTransformer.INSTANCE ) .add( Restrictions.eq( "id", testData.prod1Id ) ) .uniqueResult(); diff --git a/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java b/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java index 60730d213f..f6c1a8bc2d 100644 --- a/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java +++ b/testsuite/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java @@ -1716,7 +1716,7 @@ public class ASTParserLoadingTest extends FunctionalTestCase { session = openSession(); results = session.createQuery( "select a from Animal a, Animal b order by a.id" ) - .setResultTransformer(new DistinctRootEntityResultTransformer()) + .setResultTransformer( DistinctRootEntityResultTransformer.INSTANCE ) .list(); assertEquals( "Incorrect result size", 2, results.size()); assertTrue( "Incorrect return type", results.get(0) instanceof Animal ); diff --git a/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java b/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java index 18338d8168..2a790effe0 100644 --- a/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java +++ b/testsuite/src/test/java/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java @@ -66,15 +66,15 @@ public class SequenceStyleConfigUnitTest extends UnitTestCase { Properties props = new Properties(); props.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "10" ); - // for dialects which do not support pooled sequences, we default to hilo + // for dialects which do not support pooled sequences, we default to pooled+table Dialect dialect = new SequenceDialect(); SequenceStyleGenerator generator = new SequenceStyleGenerator(); generator.configure( Hibernate.LONG, props, dialect ); - assertClassAssignability( SequenceStructure.class, generator.getDatabaseStructure().getClass() ); - assertClassAssignability( OptimizerFactory.HiLoOptimizer.class, generator.getOptimizer().getClass() ); + assertClassAssignability( TableStructure.class, generator.getDatabaseStructure().getClass() ); + assertClassAssignability( OptimizerFactory.PooledOptimizer.class, generator.getOptimizer().getClass() ); assertEquals( SequenceStyleGenerator.DEF_SEQUENCE_NAME, generator.getDatabaseStructure().getName() ); - // for dialects which do support pooled sequences, we default to pooled + // for dialects which do support pooled sequences, we default to pooled+sequence dialect = new PooledSequenceDialect(); generator = new SequenceStyleGenerator(); generator.configure( Hibernate.LONG, props, dialect ); @@ -118,7 +118,7 @@ public class SequenceStyleConfigUnitTest extends UnitTestCase { */ public void testExplicitOptimizerWithExplicitIncrementSize() { // with sequence ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - Dialect dialect = new SequenceDialect(); + final Dialect dialect = new SequenceDialect(); // optimizer=none w/ increment > 1 => should honor optimizer Properties props = new Properties(); @@ -134,7 +134,8 @@ public class SequenceStyleConfigUnitTest extends UnitTestCase { // optimizer=hilo w/ increment > 1 => hilo props = new Properties(); props.setProperty( SequenceStyleGenerator.OPT_PARAM, OptimizerFactory.HILO ); - props.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "20" );generator = new SequenceStyleGenerator(); + props.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "20" ); + generator = new SequenceStyleGenerator(); generator.configure( Hibernate.LONG, props, dialect ); assertClassAssignability( SequenceStructure.class, generator.getDatabaseStructure().getClass() ); assertClassAssignability( OptimizerFactory.HiLoOptimizer.class, generator.getOptimizer().getClass() ); @@ -147,8 +148,10 @@ public class SequenceStyleConfigUnitTest extends UnitTestCase { props.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "20" ); generator = new SequenceStyleGenerator(); generator.configure( Hibernate.LONG, props, dialect ); - assertClassAssignability( SequenceStructure.class, generator.getDatabaseStructure().getClass() ); - assertClassAssignability( OptimizerFactory.HiLoOptimizer.class, generator.getOptimizer().getClass() ); + // because the dialect reports to not support pooled seqyences, the expectation is that we will + // use a table for the backing structure... + assertClassAssignability( TableStructure.class, generator.getDatabaseStructure().getClass() ); + assertClassAssignability( OptimizerFactory.PooledOptimizer.class, generator.getOptimizer().getClass() ); assertEquals( 20, generator.getOptimizer().getIncrementSize() ); assertEquals( 20, generator.getDatabaseStructure().getIncrementSize() ); diff --git a/testsuite/src/test/resources/log4j.properties b/testsuite/src/test/resources/log4j.properties index dee74ac910..ef5e69d6f3 100644 --- a/testsuite/src/test/resources/log4j.properties +++ b/testsuite/src/test/resources/log4j.properties @@ -6,4 +6,5 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n log4j.rootLogger=info, stdout -log4j.logger.org.hibernate.test=info \ No newline at end of file +log4j.logger.org.hibernate.test=info +log4j.logger.org.hibernate.tool.hbm2ddl=debug