From 16de7ab0fe2c7ecadc9b7a0189fba5d1a1dea532 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Wed, 10 Sep 2008 17:56:19 +0000 Subject: [PATCH] test suite cleanups git-svn-id: https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_2@15180 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../enhanced/SequenceStyleConfigUnitTest.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java b/test/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java index 0bedcd15db..2a790effe0 100644 --- a/test/org/hibernate/test/idgen/enhanced/SequenceStyleConfigUnitTest.java +++ b/test/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,10 +148,13 @@ 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() ); + } private static class TableDialect extends Dialect {