diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java index 54fb7d0d4f..fc579ee3db 100644 --- a/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java @@ -23,6 +23,7 @@ * */ package org.hibernate.dialect.resolver; + import java.sql.Connection; import java.util.Properties; import junit.framework.Test; @@ -46,11 +47,13 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SybaseASE15Dialect; import org.hibernate.dialect.SybaseAnywhereDialect; import org.hibernate.dialect.TestingDialects; +import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.jdbc.dialect.internal.DialectFactoryImpl; import org.hibernate.service.jdbc.dialect.internal.DialectResolverSet; import org.hibernate.service.jdbc.dialect.internal.StandardDialectResolver; import org.hibernate.service.jdbc.dialect.spi.DialectResolver; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * TODO : javadoc @@ -58,19 +61,21 @@ import org.hibernate.test.common.ServiceRegistryHolder; * @author Steve Ebersole */ public class DialectFactoryTest extends TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; public DialectFactoryTest(String name) { super( name ); } - protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + @Override + protected void setUp() { + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + @Override + protected void tearDown() { + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } @@ -121,7 +126,7 @@ public class DialectFactoryTest extends TestCase { private DialectFactoryImpl getDialectFactoryImpl(DialectResolver dialectResolver) { DialectFactoryImpl dialectFactoryImpl = new DialectFactoryImpl(); - dialectFactoryImpl.setClassLoaderService( serviceRegistryHolder.getClassLoaderService() ); + dialectFactoryImpl.setClassLoaderService( serviceRegistry.getService( ClassLoaderService.class ) ); dialectFactoryImpl.setDialectResolver( dialectResolver ); return dialectFactoryImpl; } diff --git a/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java b/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java index 7b5e90755a..728fcb5ffd 100644 --- a/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java +++ b/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorNoIncrementTest.java @@ -41,7 +41,8 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.impl.SessionImpl; import org.hibernate.jdbc.Work; import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * I went back to 3.3 source and grabbed the code/logic as it existed back then and crafted this @@ -54,7 +55,7 @@ public class SequenceHiLoGeneratorNoIncrementTest extends TestCase { private static final String TEST_SEQUENCE = "test_sequence"; private Configuration cfg; - ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; private SessionFactoryImplementor sessionFactory; private SequenceHiLoGenerator generator; @@ -94,8 +95,8 @@ public class SequenceHiLoGeneratorNoIncrementTest extends TestCase { ) ); - serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); - sessionFactory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); + sessionFactory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); } @Override @@ -103,8 +104,8 @@ public class SequenceHiLoGeneratorNoIncrementTest extends TestCase { if ( sessionFactory != null ) { sessionFactory.close(); } - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } super.tearDown(); } diff --git a/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java index 6048af69ba..7b1308d4fb 100644 --- a/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/id/SequenceHiLoGeneratorTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -41,7 +42,8 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.impl.SessionImpl; import org.hibernate.jdbc.Work; import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * I went back to 3.3 source and grabbed the code/logic as it existed back then and crafted this @@ -54,7 +56,7 @@ public class SequenceHiLoGeneratorTest extends TestCase { private static final String TEST_SEQUENCE = "test_sequence"; private Configuration cfg; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; private SessionFactoryImplementor sessionFactory; private SequenceHiLoGenerator generator; @@ -93,10 +95,8 @@ public class SequenceHiLoGeneratorTest extends TestCase { generator.sqlDropStrings( dialect )[0] ) ); - serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); - - sessionFactory = - (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); + sessionFactory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); } @Override @@ -104,8 +104,8 @@ public class SequenceHiLoGeneratorTest extends TestCase { if ( sessionFactory != null ) { sessionFactory.close(); } - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } super.tearDown(); } diff --git a/hibernate-core/src/test/java/org/hibernate/id/TableHiLoGeneratorTest.java b/hibernate-core/src/test/java/org/hibernate/id/TableHiLoGeneratorTest.java index 1cb3ebcf10..922263ca61 100644 --- a/hibernate-core/src/test/java/org/hibernate/id/TableHiLoGeneratorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/id/TableHiLoGeneratorTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.id; + import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -41,7 +42,8 @@ import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.impl.SessionImpl; import org.hibernate.jdbc.Work; import org.hibernate.mapping.SimpleAuxiliaryDatabaseObject; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * I went back to 3.3 source and grabbed the code/logic as it existed back then and crafted this @@ -55,7 +57,7 @@ public class TableHiLoGeneratorTest extends TestCase { private static final String GEN_COLUMN = TableHiLoGenerator.DEFAULT_COLUMN_NAME; private Configuration cfg; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; private SessionFactoryImplementor sessionFactory; private TableHiLoGenerator generator; @@ -64,8 +66,8 @@ public class TableHiLoGeneratorTest extends TestCase { super.setUp(); Properties properties = new Properties(); - properties.setProperty( TableHiLoGenerator.TABLE, GEN_TABLE ); - properties.setProperty( TableHiLoGenerator.COLUMN, GEN_COLUMN ); + properties.setProperty( TableGenerator.TABLE, GEN_TABLE ); + properties.setProperty( TableGenerator.COLUMN, GEN_COLUMN ); properties.setProperty( TableHiLoGenerator.MAX_LO, "3" ); properties.put( PersistentIdentifierGenerator.IDENTIFIER_NORMALIZER, @@ -103,9 +105,8 @@ public class TableHiLoGeneratorTest extends TestCase { ) ); - serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); - sessionFactory = - (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); + sessionFactory = (SessionFactoryImplementor) cfg.buildSessionFactory( serviceRegistry ); } @Override @@ -113,8 +114,8 @@ public class TableHiLoGeneratorTest extends TestCase { if ( sessionFactory != null ) { sessionFactory.close(); } - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } super.tearDown(); diff --git a/hibernate-core/src/test/java/org/hibernate/subclassProxyInterface/SubclassProxyInterfaceTest.java b/hibernate-core/src/test/java/org/hibernate/subclassProxyInterface/SubclassProxyInterfaceTest.java index 9e0c14db35..da82e280b4 100644 --- a/hibernate-core/src/test/java/org/hibernate/subclassProxyInterface/SubclassProxyInterfaceTest.java +++ b/hibernate-core/src/test/java/org/hibernate/subclassProxyInterface/SubclassProxyInterfaceTest.java @@ -26,7 +26,8 @@ import junit.framework.TestCase; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.H2Dialect; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * TODO : javadoc @@ -36,10 +37,10 @@ import org.hibernate.test.common.ServiceRegistryHolder; public class SubclassProxyInterfaceTest extends TestCase { public void testSubclassProxyInterfaces() { final Configuration cfg = new Configuration() - .setProperty( Environment.DIALECT, H2Dialect.class.getName() ); - cfg.addClass( Person.class ); - ServiceRegistryHolder serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); - cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ).close(); - serviceRegistryHolder.destroy(); + .setProperty( Environment.DIALECT, H2Dialect.class.getName() ) + .addClass( Person.class ); + ServiceRegistry serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); + cfg.buildSessionFactory( serviceRegistry ).close(); + ServiceRegistryBuilder.destroy( serviceRegistry ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java index a763b5485b..357d5f9bc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/ConfigurationTest.java @@ -7,21 +7,22 @@ import org.hibernate.SessionFactory; import org.hibernate.Transaction; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard */ public class ConfigurationTest extends junit.framework.TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } @@ -29,7 +30,7 @@ public class ConfigurationTest extends junit.framework.TestCase { AnnotationConfiguration cfg = new AnnotationConfiguration(); cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); Session s = sf.openSession(); Transaction tx = s.beginTransaction(); @@ -47,7 +48,7 @@ public class ConfigurationTest extends junit.framework.TestCase { cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); cfg.setProperty( AnnotationConfiguration.ARTEFACT_PROCESSING_ORDER, "class" ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); Session s = sf.openSession(); Transaction tx = s.beginTransaction(); @@ -71,7 +72,7 @@ public class ConfigurationTest extends junit.framework.TestCase { cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); cfg.addAnnotatedClass( Boat.class ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); Session s = sf.openSession(); s.getTransaction().begin(); @@ -97,7 +98,7 @@ public class ConfigurationTest extends junit.framework.TestCase { cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); cfg.setProperty( AnnotationConfiguration.ARTEFACT_PROCESSING_ORDER, "class, hbm" ); cfg.addAnnotatedClass( Boat.class ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); Session s = sf.openSession(); s.getTransaction().begin(); @@ -121,7 +122,7 @@ public class ConfigurationTest extends junit.framework.TestCase { cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.addClass( Ferry.class ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); Session s = sf.openSession(); Transaction tx = s.beginTransaction(); @@ -139,7 +140,7 @@ public class ConfigurationTest extends junit.framework.TestCase { cfg.configure( "org/hibernate/test/annotations/hibernate.cfg.xml" ); cfg.addAnnotatedClass( Port.class ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactory sf = cfg.buildSessionFactory( serviceRegistry ); assertNotNull( sf ); Session s = sf.openSession(); Transaction tx = s.beginTransaction(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java index 846edf5d15..179dd9c4ab 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/SafeMappingTest.java @@ -1,10 +1,10 @@ //$Id$ package org.hibernate.test.annotations; import org.hibernate.AnnotationException; -import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard @@ -14,18 +14,18 @@ public class SafeMappingTest extends junit.framework.TestCase { AnnotationConfiguration cfg = new AnnotationConfiguration(); cfg.addAnnotatedClass( IncorrectEntity.class ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - ServiceRegistryHolder serviceRegistryHolder = null; + ServiceRegistry serviceRegistry = null; try { - serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); + cfg.buildSessionFactory( serviceRegistry ); fail( "Entity wo id should fail" ); } catch (AnnotationException e) { //success } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java index 88e7990a26..e4921f0b6d 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/SecuredBindingTest.java @@ -1,12 +1,14 @@ //$Id$ package org.hibernate.test.annotations; + import java.util.Properties; import junit.framework.TestCase; import org.hibernate.HibernateException; import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard @@ -29,22 +31,25 @@ public class SecuredBindingTest extends TestCase { ac.setProperties( p ); ac.addAnnotatedClass( Plane.class ); SessionFactory sf; - ServiceRegistryHolder serviceRegistryHolder = null; + ServiceRegistry serviceRegistry = null; try { - serviceRegistryHolder = new ServiceRegistryHolder( p ); - sf = ac.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( p ); + sf = ac.buildSessionFactory( serviceRegistry ); + try { + sf.close(); + } + catch (Exception ignore) { + } fail( "Driver property overriding should work" ); - sf.close(); } catch (HibernateException he) { //success } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } - } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/TestCase.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/TestCase.java index 20f93f1c8d..d3bfd86d9b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/TestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/TestCase.java @@ -23,12 +23,14 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.annotations; + import java.io.InputStream; import org.hibernate.HibernateException; import org.hibernate.Interceptor; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.testing.junit.functional.annotations.HibernateTestCase; @@ -78,7 +80,7 @@ public abstract class TestCase extends HibernateTestCase { return (SessionFactoryImplementor) getSessions(); } - @Override + @Override protected void buildConfiguration() throws Exception { if ( sessions != null ) { sessions.close(); @@ -86,7 +88,7 @@ public abstract class TestCase extends HibernateTestCase { try { setCfg( new AnnotationConfiguration() ); // by default use the new id generator scheme... - cfg.setProperty( AnnotationConfiguration.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); + cfg.setProperty( Configuration.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); configure( cfg ); if ( recreateSchema() ) { cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java index 21689c0d90..bdfe9207e0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/jpa/AccessMappingTest.java @@ -31,7 +31,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.property.BasicPropertyAccessor; import org.hibernate.property.DirectPropertyAccessor; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.tuple.entity.EntityMetamodel; import org.hibernate.tuple.entity.PojoEntityTuplizer; @@ -43,15 +44,15 @@ import org.hibernate.tuple.entity.PojoEntityTuplizer; */ public class AccessMappingTest extends TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } @@ -60,7 +61,7 @@ public class AccessMappingTest extends TestCase { cfg.addAnnotatedClass( Course1.class ); cfg.addAnnotatedClass( Student.class ); try { - cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + cfg.buildSessionFactory( serviceRegistry ); fail( "@Id and @OneToMany are not placed consistently in test entities. SessionFactory creation should fail." ); } catch ( MappingException e ) { @@ -73,7 +74,7 @@ public class AccessMappingTest extends TestCase { Class classUnderTest = Course6.class; cfg.addAnnotatedClass( classUnderTest ); cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); EntityMetamodel metaModel = factory.getEntityPersister( classUnderTest.getName() ) .getEntityMetamodel(); PojoEntityTuplizer tuplizer = ( PojoEntityTuplizer ) metaModel.getTuplizer( EntityMode.POJO ); @@ -88,7 +89,7 @@ public class AccessMappingTest extends TestCase { Class classUnderTest = Course7.class; cfg.addAnnotatedClass( classUnderTest ); cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); EntityMetamodel metaModel = factory.getEntityPersister( classUnderTest.getName() ) .getEntityMetamodel(); PojoEntityTuplizer tuplizer = ( PojoEntityTuplizer ) metaModel.getTuplizer( EntityMode.POJO ); @@ -103,7 +104,7 @@ public class AccessMappingTest extends TestCase { Class classUnderTest = Course2.class; cfg.addAnnotatedClass( classUnderTest ); cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); EntityMetamodel metaModel = factory.getEntityPersister( classUnderTest.getName() ) .getEntityMetamodel(); PojoEntityTuplizer tuplizer = ( PojoEntityTuplizer ) metaModel.getTuplizer( EntityMode.POJO ); @@ -118,7 +119,7 @@ public class AccessMappingTest extends TestCase { cfg.addAnnotatedClass( Course4.class ); cfg.addAnnotatedClass( Student.class ); try { - cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + cfg.buildSessionFactory( serviceRegistry ); fail( "@Id and @OneToMany are not placed consistently in test entities. SessionFactory creation should fail." ); } catch ( MappingException e ) { @@ -131,7 +132,7 @@ public class AccessMappingTest extends TestCase { Class classUnderTest = Course3.class; cfg.addAnnotatedClass( classUnderTest ); cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); EntityMetamodel metaModel = factory.getEntityPersister( classUnderTest.getName() ) .getEntityMetamodel(); PojoEntityTuplizer tuplizer = ( PojoEntityTuplizer ) metaModel.getTuplizer( EntityMode.POJO ); @@ -151,7 +152,7 @@ public class AccessMappingTest extends TestCase { Class classUnderTest = Course5.class; cfg.addAnnotatedClass( classUnderTest ); cfg.addAnnotatedClass( Student.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); EntityMetamodel metaModel = factory.getEntityPersister( classUnderTest.getName() ) .getEntityMetamodel(); PojoEntityTuplizer tuplizer = ( PojoEntityTuplizer ) metaModel.getTuplizer( EntityMode.POJO ); @@ -172,7 +173,7 @@ public class AccessMappingTest extends TestCase { cfg.addAnnotatedClass( classUnderTest ); cfg.addAnnotatedClass( Person.class ); cfg.addAnnotatedClass( Being.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); EntityMetamodel metaModel = factory.getEntityPersister( classUnderTest.getName() ) .getEntityMetamodel(); PojoEntityTuplizer tuplizer = ( PojoEntityTuplizer ) metaModel.getTuplizer( EntityMode.POJO ); @@ -187,7 +188,7 @@ public class AccessMappingTest extends TestCase { cfg.addAnnotatedClass( Horse.class ); cfg.addAnnotatedClass( Animal.class ); - SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + SessionFactoryImplementor factory = ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); EntityMetamodel metaModel = factory.getEntityPersister( Animal.class.getName() ) .getEntityMetamodel(); PojoEntityTuplizer tuplizer = ( PojoEntityTuplizer ) metaModel.getTuplizer( EntityMode.POJO ); @@ -212,6 +213,6 @@ public class AccessMappingTest extends TestCase { AnnotationConfiguration cfg = new AnnotationConfiguration(); cfg.addAnnotatedClass( Course8.class ); cfg.addAnnotatedClass( Student.class ); - cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + cfg.buildSessionFactory( serviceRegistry ); } } \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java index 8c2448196e..48c3b1b215 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/access/xml/XmlAccessTest.java @@ -23,6 +23,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.annotations.access.xml; + import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; @@ -35,7 +36,8 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionFactoryImplementor; import org.hibernate.property.BasicPropertyAccessor; import org.hibernate.property.DirectPropertyAccessor; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.tuple.entity.EntityMetamodel; import org.hibernate.tuple.entity.PojoEntityTuplizer; @@ -47,15 +49,17 @@ import org.hibernate.tuple.entity.PojoEntityTuplizer; */ public class XmlAccessTest extends TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; - protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + @Override + protected void setUp() { + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + @Override + protected void tearDown() { + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } @@ -181,7 +185,7 @@ public class XmlAccessTest extends TestCase { InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( configFile ); cfg.addInputStream( is ); } - return ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + return ( SessionFactoryImplementor ) cfg.buildSessionFactory( serviceRegistry ); } // uses the first getter of the tupelizer for the assertions diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java index 23d7bb62d8..37c2948350 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/backquotes/BackquoteTest.java @@ -1,5 +1,6 @@ //$Id$ package org.hibernate.test.annotations.backquotes; + import static org.hibernate.TestLogger.LOG; import java.io.PrintWriter; import java.io.StringWriter; @@ -7,7 +8,8 @@ import junit.framework.TestCase; import org.hibernate.MappingException; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * Testcase for ANN-718 - @JoinTable / @JoinColumn fail when using backquotes in PK field name. @@ -17,18 +19,16 @@ import org.hibernate.test.common.ServiceRegistryHolder; */ public class BackquoteTest extends TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; @Override protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } @Override protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - } + if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry); } public void testBackquotes() { @@ -36,7 +36,7 @@ public class BackquoteTest extends TestCase { AnnotationConfiguration config = new AnnotationConfiguration(); config.addAnnotatedClass(Bug.class); config.addAnnotatedClass(Category.class); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); } catch( Exception e ) { StringWriter writer = new StringWriter(); @@ -58,7 +58,7 @@ public class BackquoteTest extends TestCase { AnnotationConfiguration config = new AnnotationConfiguration(); config.addAnnotatedClass(Printer.class); config.addAnnotatedClass(PrinterCable.class); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); fail("expected MappingException to be thrown"); } //we WANT MappingException to be thrown diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java index 55880387fd..c963dc9549 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/duplicatedgenerator/DuplicateTest.java @@ -1,10 +1,12 @@ //$Id$ package org.hibernate.test.annotations.duplicatedgenerator; import junit.framework.TestCase; + import org.hibernate.AnnotationException; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard @@ -13,22 +15,22 @@ public class DuplicateTest extends TestCase { public void testDuplicateEntityName() throws Exception { AnnotationConfiguration cfg = new AnnotationConfiguration(); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - ServiceRegistryHolder serviceRegistryHolder = null; + ServiceRegistry serviceRegistry = null; try { cfg.addAnnotatedClass( Flight.class ); cfg.addAnnotatedClass( org.hibernate.test.annotations.Flight.class ); cfg.addResource( "org/hibernate/test/annotations/orm.xml" ); cfg.addResource( "org/hibernate/test/annotations/duplicatedgenerator/orm.xml" ); - serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); - cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); + cfg.buildSessionFactory( serviceRegistry ); fail( "Should not be able to map the same entity name twice" ); } catch (AnnotationException ae) { //success } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java index 8d106c3b6f..2da3122e84 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/fetchprofile/FetchProfileTest.java @@ -23,7 +23,9 @@ * Boston, MA 02110-1301 USA * */ + package org.hibernate.test.annotations.fetchprofile; + import static org.hibernate.TestLogger.LOG; import java.io.InputStream; import junit.framework.TestCase; @@ -31,7 +33,8 @@ import org.hibernate.MappingException; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; import org.hibernate.engine.SessionFactoryImplementor; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * Test case for HHH-4812 @@ -40,18 +43,16 @@ import org.hibernate.test.common.ServiceRegistryHolder; */ public class FetchProfileTest extends TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; @Override protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } @Override protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - } + if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry); } public void testFetchProfileConfigured() { @@ -61,7 +62,7 @@ public class FetchProfileTest extends TestCase { config.addAnnotatedClass( SupportTickets.class ); config.addAnnotatedClass( Country.class ); SessionFactoryImplementor sessionImpl = ( SessionFactoryImplementor ) config.buildSessionFactory( - serviceRegistryHolder.getServiceRegistry() + serviceRegistry ); assertTrue( @@ -81,7 +82,7 @@ public class FetchProfileTest extends TestCase { config.addAnnotatedClass( Country.class ); try { - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); fail(); } catch ( MappingException e ) { @@ -96,7 +97,7 @@ public class FetchProfileTest extends TestCase { config.addAnnotatedClass( Country.class ); try { - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); fail(); } catch ( MappingException e ) { @@ -111,7 +112,7 @@ public class FetchProfileTest extends TestCase { config.addAnnotatedClass( Country.class ); try { - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); fail(); } catch ( MappingException e ) { @@ -129,7 +130,7 @@ public class FetchProfileTest extends TestCase { .getResourceAsStream( "org/hibernate/test/annotations/fetchprofile/mappings.hbm.xml" ); config.addInputStream( is ); SessionFactoryImplementor sessionImpl = ( SessionFactoryImplementor ) config.buildSessionFactory( - serviceRegistryHolder.getServiceRegistry() + serviceRegistry ); assertTrue( @@ -143,7 +144,7 @@ public class FetchProfileTest extends TestCase { config.addAnnotatedClass( Order.class ); config.addAnnotatedClass( Country.class ); try { - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); fail(); } catch ( MappingException e ) { @@ -159,7 +160,7 @@ public class FetchProfileTest extends TestCase { config.addAnnotatedClass( Country.class ); config.addPackage( Customer.class.getPackage().getName() ); SessionFactoryImplementor sessionImpl = ( SessionFactoryImplementor ) config.buildSessionFactory( - serviceRegistryHolder.getServiceRegistry() + serviceRegistry ); assertTrue( diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java index 600a49b312..73ba10f0cd 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/fkcircularity/FkCircularityTest.java @@ -1,14 +1,16 @@ -// $Id$ +// $Id$ package org.hibernate.test.annotations.fkcircularity; -import static org.hibernate.TestLogger.LOG; -import java.io.PrintWriter; -import java.io.StringWriter; -import junit.framework.TestCase; -import org.hibernate.cfg.AnnotationConfiguration; -import org.hibernate.cfg.Environment; -import org.hibernate.dialect.HSQLDialect; -import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.test.common.ServiceRegistryHolder; + +import static org.hibernate.TestLogger.LOG; +import java.io.PrintWriter; +import java.io.StringWriter; +import junit.framework.TestCase; +import org.hibernate.cfg.AnnotationConfiguration; +import org.hibernate.cfg.Environment; +import org.hibernate.dialect.HSQLDialect; +import org.hibernate.dialect.SQLServerDialect; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * Test case for ANN-722 and ANN-730. @@ -17,18 +19,16 @@ import org.hibernate.test.common.ServiceRegistryHolder; */ public class FkCircularityTest extends TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; - @Override + @Override protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - @Override + @Override protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - } + if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry); } public void testJoinedSublcassesInPK() { @@ -38,7 +38,7 @@ public class FkCircularityTest extends TestCase { config.addAnnotatedClass(B.class); config.addAnnotatedClass(C.class); config.addAnnotatedClass(D.class); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); String[] schema = config .generateSchemaCreationScript(new SQLServerDialect()); for (String s : schema) { @@ -60,7 +60,7 @@ public class FkCircularityTest extends TestCase { config.addAnnotatedClass(ClassB.class); config.addAnnotatedClass(ClassC.class); config.addAnnotatedClass(ClassD.class); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); String[] schema = config .generateSchemaCreationScript(new HSQLDialect()); for (String s : schema) { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java index 70fdefe005..e18a9660cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/namingstrategy/NamingStrategyTest.java @@ -1,5 +1,6 @@ // $Id$ package org.hibernate.test.annotations.namingstrategy; + import static org.hibernate.TestLogger.LOG; import java.io.PrintWriter; import java.io.StringWriter; @@ -10,7 +11,8 @@ import org.hibernate.cfg.EJB3NamingStrategy; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Mappings; import org.hibernate.mapping.Table; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * Test harness for ANN-716. @@ -19,18 +21,16 @@ import org.hibernate.test.common.ServiceRegistryHolder; */ public class NamingStrategyTest extends TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; @Override protected void setUp() { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } @Override protected void tearDown() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - } + if (serviceRegistry != null) ServiceRegistryBuilder.destroy(serviceRegistry); } public void testWithCustomNamingStrategy() throws Exception { @@ -39,7 +39,7 @@ public class NamingStrategyTest extends TestCase { config.setNamingStrategy(new DummyNamingStrategy()); config.addAnnotatedClass(Address.class); config.addAnnotatedClass(Person.class); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); } catch( Exception e ) { StringWriter writer = new StringWriter(); @@ -55,7 +55,7 @@ public class NamingStrategyTest extends TestCase { config.setNamingStrategy(EJB3NamingStrategy.INSTANCE); config.addAnnotatedClass(A.class); config.addAnnotatedClass(AddressEntry.class); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); Mappings mappings = config.createMappings(); boolean foundIt = false; @@ -83,7 +83,7 @@ public class NamingStrategyTest extends TestCase { AnnotationConfiguration config = new AnnotationConfiguration(); config.addAnnotatedClass(Address.class); config.addAnnotatedClass(Person.class); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + config.buildSessionFactory( serviceRegistry ); } catch( Exception e ) { StringWriter writer = new StringWriter(); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java index 34ab8f2b2a..4c8204ded0 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/OneToOneErrorTest.java @@ -1,10 +1,11 @@ //$Id$ package org.hibernate.test.annotations.onetoone; + import org.hibernate.AnnotationException; -import org.hibernate.SessionFactory; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Emmanuel Bernard @@ -15,19 +16,19 @@ public class OneToOneErrorTest extends junit.framework.TestCase { cfg.addAnnotatedClass( Show.class ) .addAnnotatedClass( ShowDescription.class ); cfg.setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); - ServiceRegistryHolder serviceRegistryHolder = null; + ServiceRegistry serviceRegistry = null; try { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); - SessionFactory sf = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); + cfg.buildSessionFactory( serviceRegistry ); fail( "Wrong mappedBy does not fail property" ); } catch (AnnotationException e) { //success } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - } + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + } } } } \ No newline at end of file diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java index a892f06128..18b8495812 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/primarykey/NullablePrimaryKeyTest.java @@ -1,11 +1,13 @@ //$Id: A320.java 14736 2008-06-04 14:23:42Z hardy.ferentschik $ package org.hibernate.test.annotations.onetoone.primarykey; + import static org.hibernate.TestLogger.LOG; import junit.framework.TestCase; import org.hibernate.cfg.AnnotationConfiguration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * Test harness for ANN-742. @@ -17,13 +19,13 @@ public class NullablePrimaryKeyTest extends TestCase { public void testGeneratedSql() { - ServiceRegistryHolder serviceRegistryHolder = null; + ServiceRegistry serviceRegistry = null; try { AnnotationConfiguration config = new AnnotationConfiguration(); config.addAnnotatedClass(Address.class); config.addAnnotatedClass(Person.class); - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); - config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); + config.buildSessionFactory( serviceRegistry ); String[] schema = config .generateSchemaCreationScript(new SQLServerDialect()); for (String s : schema) { @@ -36,8 +38,8 @@ public class NullablePrimaryKeyTest extends TestCase { fail(e.getMessage()); } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java index fcb8c35b75..ee76cccd0b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/ConfigurationSerializationTest.java @@ -20,13 +20,15 @@ * Boston, MA 02110-1301 USA\ */ package org.hibernate.test.cfg; + import javax.persistence.Entity; import javax.persistence.Id; import junit.framework.Test; import junit.framework.TestSuite; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.junit.UnitTestCase; import org.hibernate.util.SerializationHelper; @@ -102,18 +104,18 @@ public class ConfigurationSerializationTest extends UnitTestCase { cfg = ( Configuration ) SerializationHelper.deserialize( bytes ); SessionFactory factory = null; - ServiceRegistryHolder serviceRegistryHolder = null; + ServiceRegistry serviceRegistry = null; try { - serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); // try to build SF - factory = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry()); + factory = cfg.buildSessionFactory( serviceRegistry ); } finally { if ( factory != null ) { factory.close(); } - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java index d0f420b5c1..d94a8952ba 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/cfg/persister/PersisterClassProviderTest.java @@ -20,12 +20,11 @@ */ package org.hibernate.test.cfg.persister; -import junit.framework.TestCase; - import org.hibernate.MappingException; import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.junit.UnitTestCase; /** @@ -40,9 +39,9 @@ public class PersisterClassProviderTest extends UnitTestCase { Configuration cfg = new Configuration(); cfg.addAnnotatedClass( Gate.class ); - ServiceRegistryHolder serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); + ServiceRegistry serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); //no exception as the GoofyPersisterClassProvider is not set - SessionFactory sessionFactory = cfg.buildSessionFactory(serviceRegistryHolder.getServiceRegistry()); + SessionFactory sessionFactory = cfg.buildSessionFactory( serviceRegistry ); sessionFactory.close(); @@ -50,7 +49,7 @@ public class PersisterClassProviderTest extends UnitTestCase { cfg.addAnnotatedClass( Gate.class ); cfg.setPersisterClassProvider( new GoofyPersisterClassProvider() ); try { - sessionFactory = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + sessionFactory = cfg.buildSessionFactory( serviceRegistry ); sessionFactory.close(); } catch ( MappingException e ) { @@ -66,7 +65,7 @@ public class PersisterClassProviderTest extends UnitTestCase { cfg.addAnnotatedClass( Window.class ); cfg.setPersisterClassProvider( new GoofyPersisterClassProvider() ); try { - sessionFactory = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + sessionFactory = cfg.buildSessionFactory( serviceRegistry ); sessionFactory.close(); } catch ( MappingException e ) { @@ -76,8 +75,8 @@ public class PersisterClassProviderTest extends UnitTestCase { ( (GoofyException) e.getCause() ).getValue() ); } - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/AbstractExecutable.java b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/AbstractExecutable.java index b8108b5846..1ee2efe875 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/AbstractExecutable.java +++ b/hibernate-core/src/test/java/org/hibernate/test/instrument/cases/AbstractExecutable.java @@ -1,25 +1,27 @@ package org.hibernate.test.instrument.cases; + import org.hibernate.SessionFactory; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; /** * @author Steve Ebersole */ public abstract class AbstractExecutable implements Executable { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; private SessionFactory factory; public final void prepare() { Configuration cfg = new Configuration().setProperty( Environment.HBM2DDL_AUTO, "create-drop" ); String[] resources = getResources(); - for ( int i = 0; i < resources.length; i++ ) { - cfg.addResource( resources[i] ); + for ( String resource : resources ) { + cfg.addResource( resource ); } - serviceRegistryHolder = new ServiceRegistryHolder( cfg.getProperties() ); - factory = cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( cfg.getProperties() ); + factory = cfg.buildSessionFactory( serviceRegistry ); } public final void complete() { @@ -28,9 +30,9 @@ public abstract class AbstractExecutable implements Executable { } finally { factory.close(); - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - } + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + } } } diff --git a/hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java b/hibernate-core/src/test/java/org/hibernate/testing/ServiceRegistryBuilder.java similarity index 51% rename from hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java rename to hibernate-core/src/test/java/org/hibernate/testing/ServiceRegistryBuilder.java index 78458b14bf..ae29b096ac 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/common/ServiceRegistryHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/ServiceRegistryBuilder.java @@ -1,7 +1,7 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * Copyright (c) 2011, Red Hat Inc. or third-party contributors as * indicated by the @author tags or express copyright attribution * statements applied by the authors. All third-party contributions are * distributed under license by Red Hat Inc. @@ -21,57 +21,28 @@ * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA */ -package org.hibernate.test.common; +package org.hibernate.testing; import java.util.Map; import java.util.Properties; import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.internal.JdbcServicesImpl; -import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.internal.util.config.ConfigurationHelper; -import org.hibernate.service.classloading.spi.ClassLoaderService; import org.hibernate.service.internal.ServiceRegistryImpl; import org.hibernate.service.spi.ServiceRegistry; /** - * @author Gail Badner + * @author Steve Ebersole */ -public class ServiceRegistryHolder { - private final ServiceRegistryImpl serviceRegistry; - private final Properties properties; - - public ServiceRegistryHolder(Map props) { - properties = new Properties(); - properties.putAll( props ); +public class ServiceRegistryBuilder { + public static ServiceRegistryImpl buildServiceRegistry(Map serviceRegistryConfig) { + Properties properties = new Properties(); + properties.putAll( serviceRegistryConfig ); Environment.verifyProperties( properties ); ConfigurationHelper.resolvePlaceHolders( properties ); - serviceRegistry = new ServiceRegistryImpl( properties ); - properties.putAll( serviceRegistry.getService( JdbcServices.class ).getDialect().getDefaultProperties() ); + return new ServiceRegistryImpl( properties ); } - public Properties getProperties() { - return properties; - } - - public ServiceRegistry getServiceRegistry() { - return serviceRegistry; - } - - public JdbcServices getJdbcServices() { - return serviceRegistry.getService( JdbcServices.class ); - } - - public JdbcServicesImpl getJdbcServicesImpl() { - return ( JdbcServicesImpl ) getJdbcServices(); - } - - public ClassLoaderService getClassLoaderService() { - return serviceRegistry.getService( ClassLoaderService.class ); - } - - public void destroy() { - if ( serviceRegistry != null ) { - serviceRegistry.destroy(); - } + public static void destroy(ServiceRegistry serviceRegistry) { + ( (ServiceRegistryImpl) serviceRegistry ).destroy(); } } diff --git a/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java index d52e5c3918..965008711f 100644 --- a/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/junit/UnitTestCase.java @@ -20,12 +20,12 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - */ + */ package org.hibernate.testing.junit; + import static org.hibernate.TestLogger.LOG; import java.util.Enumeration; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; import junit.framework.AssertionFailedError; import junit.framework.Test; @@ -36,7 +36,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.service.jdbc.connections.spi.ConnectionProvider; import org.hibernate.service.spi.ServiceRegistry; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.testing.ServiceRegistryBuilder; import org.jboss.logging.Logger; /** @@ -47,7 +47,7 @@ import org.jboss.logging.Logger; */ public abstract class UnitTestCase extends junit.framework.TestCase { - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; public UnitTestCase(String string) { super( string ); @@ -87,17 +87,17 @@ public abstract class UnitTestCase extends junit.framework.TestCase { @Override protected void tearDown() throws Exception { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - serviceRegistryHolder = null; + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + serviceRegistry = null; } } protected ServiceRegistry getServiceRegistry() { - if ( serviceRegistryHolder == null ) { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + if ( serviceRegistry == null ) { + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - return serviceRegistryHolder.getServiceRegistry(); + return serviceRegistry; } protected JdbcServices getJdbcServices() { @@ -121,9 +121,8 @@ public abstract class UnitTestCase extends junit.framework.TestCase { // additional assertions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public static void assertElementTypeAssignability(java.util.Collection collection, Class clazz) throws AssertionFailedError { - Iterator itr = collection.iterator(); - while ( itr.hasNext() ) { - assertClassAssignability( itr.next().getClass(), clazz ); + for ( Object aCollection : collection ) { + assertClassAssignability( aCollection.getClass(), clazz ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java index ba7f1445e2..cc4b1cf9b9 100644 --- a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/ExecutionEnvironment.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.testing.junit.functional; + import java.sql.Blob; import java.sql.Clob; import java.util.HashMap; @@ -39,7 +40,7 @@ import org.hibernate.mapping.Property; import org.hibernate.mapping.SimpleValue; import org.hibernate.service.jdbc.connections.internal.ConnectionProviderInitiator; import org.hibernate.service.spi.ServiceRegistry; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.testing.ServiceRegistryBuilder; /** * {@inheritDoc} @@ -53,8 +54,8 @@ public class ExecutionEnvironment { private final ExecutionEnvironment.Settings settings; private Map conectionProviderInjectionProperties; - private ServiceRegistryHolder serviceRegistryHolder; private Configuration configuration; + private ServiceRegistry serviceRegistry; private SessionFactory sessionFactory; private boolean allowRebuild; @@ -79,7 +80,7 @@ public class ExecutionEnvironment { } public ServiceRegistry getServiceRegistry() { - return serviceRegistryHolder.getServiceRegistry(); + return serviceRegistry; } public SessionFactory getSessionFactory() { @@ -115,8 +116,8 @@ public class ExecutionEnvironment { this.configuration = configuration; - serviceRegistryHolder = new ServiceRegistryHolder( getServiceRegistryProperties() ); - sessionFactory = configuration.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( getServiceRegistryProperties() ); + sessionFactory = configuration.buildSessionFactory( serviceRegistry ); settings.afterSessionFactoryBuilt( ( SessionFactoryImplementor ) sessionFactory ); } @@ -184,12 +185,11 @@ public class ExecutionEnvironment { sessionFactory.close(); sessionFactory = null; } - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - serviceRegistryHolder = null; + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } - serviceRegistryHolder = new ServiceRegistryHolder( getServiceRegistryProperties() ); - sessionFactory = configuration.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( getServiceRegistryProperties() ); + sessionFactory = configuration.buildSessionFactory( serviceRegistry ); settings.afterSessionFactoryBuilt( ( SessionFactoryImplementor ) sessionFactory ); } @@ -198,9 +198,9 @@ public class ExecutionEnvironment { sessionFactory.close(); sessionFactory = null; } - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - serviceRegistryHolder = null; + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + serviceRegistry = null; } configuration = null; } diff --git a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java index a68e7a0020..c23e2692a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/testing/junit/functional/annotations/HibernateTestCase.java @@ -23,8 +23,8 @@ */ // $Id$ - package org.hibernate.testing.junit.functional.annotations; + import static org.hibernate.TestLogger.LOG; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationTargetException; @@ -39,7 +39,7 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.jdbc.spi.JdbcServices; import org.hibernate.jdbc.Work; import org.hibernate.service.spi.ServiceRegistry; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.testing.junit.DialectChecks; import org.hibernate.testing.junit.FailureExpected; import org.hibernate.testing.junit.RequiresDialect; @@ -58,7 +58,7 @@ public abstract class HibernateTestCase extends TestCase { protected static Configuration cfg; private static Class lastTestClass; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; public HibernateTestCase() { super(); @@ -146,10 +146,10 @@ public abstract class HibernateTestCase extends TestCase { } protected ServiceRegistry getServiceRegistry() { - if ( serviceRegistryHolder == null ) { - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + if ( serviceRegistry == null ) { + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); } - return serviceRegistryHolder.getServiceRegistry(); + return serviceRegistry; } protected JdbcServices getJdbcServices() { @@ -275,9 +275,9 @@ public abstract class HibernateTestCase extends TestCase { protected abstract void handleUnclosedResources(); protected void closeResources() { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - serviceRegistryHolder = null; + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + serviceRegistry = null; } } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java index 09b9b40c09..ec91d42d95 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractOneSessionTest.java @@ -1,4 +1,5 @@ package org.hibernate.envers.test; + import java.io.File; import java.net.URISyntaxException; import java.net.URL; @@ -9,7 +10,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -19,20 +21,20 @@ import org.testng.annotations.Parameters; /** * Base class for testing envers with Session when the same session and * auditReader must be used for the hole test. - * + * * @author Hernán Chanfreau - * + * */ public abstract class AbstractOneSessionTest { - + protected Configuration config; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; private SessionFactory sessionFactory; private Session session ; private AuditReader auditReader; - - + + @BeforeClass @Parameters("auditStrategy") public void init(@Optional String auditStrategy) throws URISyntaxException { @@ -45,35 +47,35 @@ public abstract class AbstractOneSessionTest { } this.initMappings(); - - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); - sessionFactory = config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); + sessionFactory = config.buildSessionFactory( serviceRegistry ); } - + protected abstract void initMappings() throws MappingException, URISyntaxException ; protected String getHibernateConfigurationFileName(){ return "hibernate.test.session-cfg.xml"; - } + } private SessionFactory getSessionFactory(){ return sessionFactory; } - + @AfterClass public void closeSessionFactory() { try { sessionFactory.close(); } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - serviceRegistryHolder = null; + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + serviceRegistry = null; } } } - + /** * Creates a new session and auditReader only if there is nothing created * before @@ -92,8 +94,8 @@ public abstract class AbstractOneSessionTest { public void forceNewSession() { session = getSessionFactory().openSession(); auditReader = AuditReaderFactory.get(session); - } - + } + protected Session getSession() { return session; } @@ -103,7 +105,7 @@ public abstract class AbstractOneSessionTest { protected AuditReader getAuditReader() { return auditReader; } - + } diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractSessionTest.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractSessionTest.java index 43840bccd7..b7023b885a 100644 --- a/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractSessionTest.java +++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/AbstractSessionTest.java @@ -1,4 +1,5 @@ package org.hibernate.envers.test; + import java.io.File; import java.net.URISyntaxException; import java.net.URL; @@ -9,7 +10,8 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.service.spi.ServiceRegistry; +import org.hibernate.testing.ServiceRegistryBuilder; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -18,24 +20,24 @@ import org.testng.annotations.Parameters; /** * Base class for testing envers with Session. - * + * * @author Hernán Chanfreau * */ public abstract class AbstractSessionTest { protected Configuration config; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; private SessionFactory sessionFactory; private Session session ; private AuditReader auditReader; - - + + @BeforeClass @Parameters("auditStrategy") public void init(@Optional String auditStrategy) throws URISyntaxException { config = new Configuration(); - URL url = Thread.currentThread().getContextClassLoader().getResource(getHibernateConfigurationFileName()); + URL url = Thread.currentThread().getContextClassLoader().getResource(getHibernateConfigurationFileName()); config.configure(new File(url.toURI())); if (auditStrategy != null && !"".equals(auditStrategy)) { @@ -43,16 +45,16 @@ public abstract class AbstractSessionTest { } this.initMappings(); - - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); - sessionFactory = config.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); + sessionFactory = config.buildSessionFactory( serviceRegistry ); } - + protected abstract void initMappings() throws MappingException, URISyntaxException ; - protected String getHibernateConfigurationFileName(){ - return "hibernate.test.session-cfg.xml"; - } + protected String getHibernateConfigurationFileName(){ + return "hibernate.test.session-cfg.xml"; + } private SessionFactory getSessionFactory(){ @@ -65,21 +67,21 @@ public abstract class AbstractSessionTest { session = getSessionFactory().openSession(); auditReader = AuditReaderFactory.get(session); } - + @AfterClass public void closeSessionFactory() { try { sessionFactory.close(); } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); - serviceRegistryHolder = null; + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); + serviceRegistry = null; } } } - - + + protected Session getSession() { return session; } diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java index 7311d9ec88..59a76ac160 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/collection/AbstractCollectionRegionAccessStrategyTestCase.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.collection; + import static org.hibernate.TestLogger.LOG; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -48,10 +49,12 @@ import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.infinispan.util.FlagAdapter; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase; import org.hibernate.test.cache.infinispan.functional.cluster.DualNodeJtaTransactionManagerImpl; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.util.ComparableComparator; import org.infinispan.transaction.tm.BatchModeTransactionManager; @@ -513,7 +516,7 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs private final String configResource; private final String configName; private String preferIPv4Stack; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; public AccessStrategyTestSetup( Test test, String configName ) { @@ -536,13 +539,13 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs preferIPv4Stack = System.getProperty(PREFER_IPV4STACK); System.setProperty(PREFER_IPV4STACK, "true"); - serviceRegistryHolder = new ServiceRegistryHolder(Environment.getProperties()); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry(Environment.getProperties()); localCfg = createConfiguration(configName, configResource); - localRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistryHolder.getJdbcServicesImpl(), localCfg); + localRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistry.getService(JdbcServices.class), localCfg); remoteCfg = createConfiguration(configName, configResource); - remoteRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistryHolder.getJdbcServicesImpl(), remoteCfg); + remoteRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistry.getService(JdbcServices.class), remoteCfg); } @Override @@ -559,8 +562,8 @@ public abstract class AbstractCollectionRegionAccessStrategyTestCase extends Abs if (remoteRegionFactory != null) remoteRegionFactory.stop(); } finally { - if (serviceRegistryHolder != null) { - serviceRegistryHolder.destroy(); + if (serviceRegistry != null) { + ServiceRegistryBuilder.destroy(serviceRegistry); } } } diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java index 356c750713..59b062b851 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/entity/AbstractEntityRegionAccessStrategyTestCase.java @@ -3,7 +3,7 @@ * * Copyright (c) 2007, Red Hat, Inc. and/or it's affiliates or third-party contributors as * indicated by the @author tags or express copyright attribution - * statements applied by the authors.  All third-party contributions are + * statements applied by the authors. All third-party contributions are * distributed under license by Red Hat, Inc. and/or it's affiliates. * * This copyrighted material is made available to anyone wishing to use, modify, @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.entity; + import static org.hibernate.TestLogger.LOG; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -40,9 +41,11 @@ import org.hibernate.cache.infinispan.util.CacheAdapter; import org.hibernate.cache.infinispan.util.FlagAdapter; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; +import org.hibernate.engine.jdbc.spi.JdbcServices; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.test.cache.infinispan.AbstractNonFunctionalTestCase; import org.hibernate.test.cache.infinispan.util.CacheTestUtil; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.testing.ServiceRegistryBuilder; import org.hibernate.util.ComparableComparator; import org.infinispan.transaction.tm.BatchModeTransactionManager; @@ -631,7 +634,7 @@ public abstract class AbstractEntityRegionAccessStrategyTestCase extends Abstrac private static final String PREFER_IPV4STACK = "java.net.preferIPv4Stack"; private final String configName; private String preferIPv4Stack; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; public AccessStrategyTestSetup( Test test, String configName ) { @@ -652,13 +655,13 @@ public abstract class AbstractEntityRegionAccessStrategyTestCase extends Abstrac preferIPv4Stack = System.getProperty(PREFER_IPV4STACK); System.setProperty(PREFER_IPV4STACK, "true"); - serviceRegistryHolder = new ServiceRegistryHolder(Environment.getProperties()); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry(Environment.getProperties()); localCfg = createConfiguration(configName); - localRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistryHolder.getJdbcServicesImpl(), localCfg); + localRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistry.getService(JdbcServices.class), localCfg); remoteCfg = createConfiguration(configName); - remoteRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistryHolder.getJdbcServicesImpl(), remoteCfg); + remoteRegionFactory = CacheTestUtil.startRegionFactory(serviceRegistry.getService(JdbcServices.class), remoteCfg); } @Override @@ -670,8 +673,8 @@ public abstract class AbstractEntityRegionAccessStrategyTestCase extends Abstrac if (remoteRegionFactory != null) remoteRegionFactory.stop(); } finally { - if (serviceRegistryHolder != null) { - serviceRegistryHolder.destroy(); + if (serviceRegistry != null) { + ServiceRegistryBuilder.destroy(serviceRegistry); } } } diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java index d592ea5afa..9f26ed40f4 100644 --- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java +++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/tm/JBossStandaloneJtaExampleTest.java @@ -22,6 +22,7 @@ * Boston, MA 02110-1301 USA */ package org.hibernate.test.cache.infinispan.tm; + import java.sql.Connection; import java.sql.SQLException; import java.util.Iterator; @@ -43,9 +44,10 @@ import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.mapping.Collection; import org.hibernate.mapping.PersistentClass; +import org.hibernate.service.spi.ServiceRegistry; import org.hibernate.stat.Statistics; import org.hibernate.test.cache.infinispan.functional.Item; -import org.hibernate.test.common.ServiceRegistryHolder; +import org.hibernate.testing.ServiceRegistryBuilder; import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup; import org.infinispan.util.logging.Log; import org.infinispan.util.logging.LogFactory; @@ -69,12 +71,12 @@ public class JBossStandaloneJtaExampleTest extends TestCase { private static final JBossStandaloneJTAManagerLookup lookup = new JBossStandaloneJTAManagerLookup(); Context ctx; Main jndiServer; - private ServiceRegistryHolder serviceRegistryHolder; + private ServiceRegistry serviceRegistry; @Override protected void setUp() throws Exception { super.setUp(); - serviceRegistryHolder = new ServiceRegistryHolder( Environment.getProperties() ); + serviceRegistry = ServiceRegistryBuilder.buildServiceRegistry( Environment.getProperties() ); jndiServer = startJndiServer(); ctx = createJndiContext(); bindTransactionManager(); @@ -90,8 +92,8 @@ public class JBossStandaloneJtaExampleTest extends TestCase { jndiServer.stop(); } finally { - if ( serviceRegistryHolder != null ) { - serviceRegistryHolder.destroy(); + if ( serviceRegistry != null ) { + ServiceRegistryBuilder.destroy( serviceRegistry ); } } } @@ -270,7 +272,7 @@ public class JBossStandaloneJtaExampleTest extends TestCase { } private SessionFactory buildSessionFactory() { - // Extra options located in src/test/resources/hibernate.properties + // Extra options located in src/test/resources/hibernate.properties Configuration cfg = new Configuration(); cfg.setProperty(Environment.DIALECT, "org.hibernate.dialect.HSQLDialect"); cfg.setProperty(Environment.HBM2DDL_AUTO, "create-drop"); @@ -298,6 +300,6 @@ public class JBossStandaloneJtaExampleTest extends TestCase { Collection coll = (Collection) iter.next(); cfg.setCollectionCacheConcurrencyStrategy(coll.getRole(), "transactional"); } - return cfg.buildSessionFactory( serviceRegistryHolder.getServiceRegistry() ); + return cfg.buildSessionFactory( serviceRegistry ); } }