Author: stliu Date: 2010-01-10 08:45:23 -0500 (Sun, 10 Jan 2010) New Revision: 18497 Added: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java Log: JBPAPP-3377 HHH-4523 some EM test doesn't be tested on other DBs Added: entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties (rev 0) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/bundles/overridenpar/overridenpar.properties 2010-01-10 13:45:23 UTC (rev 18497) @@ -0,0 +1,5 @@ +hibernate.connection.driver_class ${jdbc.driver} +hibernate.connection.url ${jdbc.url} +hibernate.connection.username ${jdbc.user} +hibernate.connection.password ${jdbc.pass} +hibernate.connection.isolation ${jdbc.isolation} \ No newline at end of file Modified: entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java =================================================================== --- entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-01-09 23:50:55 UTC (rev 18496) +++ entitymanager/branches/v3_4_0_GA_CP/src/test/java/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2010-01-10 13:45:23 UTC (rev 18497) @@ -2,6 +2,8 @@ import java.util.HashMap; import java.util.HashSet; +import java.util.Properties; + import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; @@ -27,6 +29,7 @@ import org.hibernate.engine.SessionImplementor; import org.hibernate.event.EventListeners; import org.hibernate.stat.Statistics; +import org.hibernate.util.ConfigHelper; //$Id$ @@ -197,10 +200,9 @@ public void testOverridenPar() throws Exception { HashMap properties = new HashMap(); properties.put( HibernatePersistence.JTA_DATASOURCE, null ); - properties.put( "hibernate.connection.driver_class", "org.hsqldb.jdbcDriver" ); - properties.put( "hibernate.connection.username", "sa" ); - properties.put( "hibernate.connection.password", "" ); - properties.put( "hibernate.connection.url", "jdbc:hsqldb:." ); + Properties p=new Properties(); + p.load( ConfigHelper.getResourceAsStream( "/overridenpar.properties" ) ); + properties.putAll( p ); EntityManagerFactory emf = Persistence.createEntityManagerFactory( "overridenpar", properties ); EntityManager em = emf.createEntityManager(); org.hibernate.ejb.test.pack.overridenpar.Bug bug = new org.hibernate.ejb.test.pack.overridenpar.Bug();