test suite cleanups

git-svn-id: https://svn.jboss.org/repos/hibernate/core/branches/Branch_3_2@15180 1b8cb986-b30d-0410-93ca-fae66ebed9b2
This commit is contained in:
Steve Ebersole 2008-09-10 17:56:19 +00:00
parent a426b1412b
commit 16de7ab0fe

View File

@ -66,15 +66,15 @@ public void testDefaultOptimizerBasedOnIncrementBackedBySequence() {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "10" ); 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(); Dialect dialect = new SequenceDialect();
SequenceStyleGenerator generator = new SequenceStyleGenerator(); SequenceStyleGenerator generator = new SequenceStyleGenerator();
generator.configure( Hibernate.LONG, props, dialect ); generator.configure( Hibernate.LONG, props, dialect );
assertClassAssignability( SequenceStructure.class, generator.getDatabaseStructure().getClass() ); assertClassAssignability( TableStructure.class, generator.getDatabaseStructure().getClass() );
assertClassAssignability( OptimizerFactory.HiLoOptimizer.class, generator.getOptimizer().getClass() ); assertClassAssignability( OptimizerFactory.PooledOptimizer.class, generator.getOptimizer().getClass() );
assertEquals( SequenceStyleGenerator.DEF_SEQUENCE_NAME, generator.getDatabaseStructure().getName() ); 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(); dialect = new PooledSequenceDialect();
generator = new SequenceStyleGenerator(); generator = new SequenceStyleGenerator();
generator.configure( Hibernate.LONG, props, dialect ); generator.configure( Hibernate.LONG, props, dialect );
@ -118,7 +118,7 @@ public void testForceTableUse() {
*/ */
public void testExplicitOptimizerWithExplicitIncrementSize() { public void testExplicitOptimizerWithExplicitIncrementSize() {
// with sequence ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // with sequence ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Dialect dialect = new SequenceDialect(); final Dialect dialect = new SequenceDialect();
// optimizer=none w/ increment > 1 => should honor optimizer // optimizer=none w/ increment > 1 => should honor optimizer
Properties props = new Properties(); Properties props = new Properties();
@ -134,7 +134,8 @@ public void testExplicitOptimizerWithExplicitIncrementSize() {
// optimizer=hilo w/ increment > 1 => hilo // optimizer=hilo w/ increment > 1 => hilo
props = new Properties(); props = new Properties();
props.setProperty( SequenceStyleGenerator.OPT_PARAM, OptimizerFactory.HILO ); 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 ); generator.configure( Hibernate.LONG, props, dialect );
assertClassAssignability( SequenceStructure.class, generator.getDatabaseStructure().getClass() ); assertClassAssignability( SequenceStructure.class, generator.getDatabaseStructure().getClass() );
assertClassAssignability( OptimizerFactory.HiLoOptimizer.class, generator.getOptimizer().getClass() ); assertClassAssignability( OptimizerFactory.HiLoOptimizer.class, generator.getOptimizer().getClass() );
@ -147,10 +148,13 @@ public void testExplicitOptimizerWithExplicitIncrementSize() {
props.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "20" ); props.setProperty( SequenceStyleGenerator.INCREMENT_PARAM, "20" );
generator = new SequenceStyleGenerator(); generator = new SequenceStyleGenerator();
generator.configure( Hibernate.LONG, props, dialect ); generator.configure( Hibernate.LONG, props, dialect );
assertClassAssignability( SequenceStructure.class, generator.getDatabaseStructure().getClass() ); // because the dialect reports to not support pooled seqyences, the expectation is that we will
assertClassAssignability( OptimizerFactory.HiLoOptimizer.class, generator.getOptimizer().getClass() ); // 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.getOptimizer().getIncrementSize() );
assertEquals( 20, generator.getDatabaseStructure().getIncrementSize() ); assertEquals( 20, generator.getDatabaseStructure().getIncrementSize() );
} }
private static class TableDialect extends Dialect { private static class TableDialect extends Dialect {