Hibernate SVN: r15283 - in  entitymanager...

Author Login • Post Reply

Author: jcosta@(protected)
Date: 2008-10-08 07:58:24 -0400 (Wed, 08 Oct 2008)
New Revision: 15283

Modified:
entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushModeTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java
entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java
Log:
EJB-393 - Replaced factory.createEntityManager by getEntityManager in the test cases and added exception handling in the parent test case

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/EntityManagerTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
//
// Item item = new Item( "Mouse", "Micro$oft mouse" );
//
-// EntityManager em = factory.createEntityManager();
+// EntityManager em = getEntityManager();
// em.getTransaction().begin();
// em.persist( item );
// assertTrue( em.contains( item ) );
@@(protected) @@

Item item = new Item( "Mouse", "Micro$oft mouse" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@(protected) @@
stats.clear();
stats.setStatisticsEnabled( true );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();

em.persist( res );
@@(protected) @@
assertEquals( 1, stats.getSecondLevelCachePutCount() );
assertEquals( 0, stats.getSecondLevelCacheHitCount() );

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
Item second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@(protected) @@
em.getTransaction().commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@(protected) @@
}

public void testContains() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Integer nonManagedObject = new Integer( 4 );
try {
@@(protected) @@
finally {
em.close();
}
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
Item item = new Item();
item.setDescr( "Mine" );
@@(protected) @@
}

public void testClear() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@(protected) @@
}

public void testFlushMode() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.setFlushMode( FlushModeType.COMMIT );
assertEquals( FlushModeType.COMMIT, em.getFlushMode() );
( (HibernateEntityManager) em ).getSession().setFlushMode( FlushMode.ALWAYS );
@@(protected) @@
}

public void testPersistNoneGenerator() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@(protected) @@
}

public void testSerializableException() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
try {
Query query = em.createQuery( "SELECT p FETCH JOIN p.distributors FROM Item p" );
@@(protected) @@
}

public void testIsOpen() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
assertTrue( em.isOpen() );
em.getTransaction().begin();
assertTrue( em.isOpen() );
@@(protected) @@

//EJB-9
// public void testGet() throws Exception {
-// EntityManager em = factory.createEntityManager();
+// EntityManager em = getEntityManager();
// em.getTransaction().begin();
// Item item = (Item) em.get(Item.class, "nonexistentone");
// try {

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/PackagedEntityManagerTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@

Item item = new Item( "Mouse", "Micro$oft mouse" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@(protected) @@
stats.clear();
stats.setStatisticsEnabled( true );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();

em.persist( res );
@@(protected) @@
assertEquals( 1, stats.getSecondLevelCachePutCount() );
assertEquals( 0, stats.getSecondLevelCacheHitCount() );

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
Item second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@(protected) @@
em.getTransaction().commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
second = em.find( Item.class, item.getName() );
assertEquals( 1, second.getDistributors().size() );
@@(protected) @@
}

public void testExternalJar() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Scooter s = new Scooter();
s.setModel( "Abadah" );
s.setSpeed( 85l );
@@(protected) @@
em.persist( s );
em.getTransaction().commit();
em.close();
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
s = em.find( Scooter.class, s.getModel() );
assertEquals( new Long( 85 ), s.getSpeed() );
@@(protected) @@
}

public void testORMFileOnMainAndExplicitJars() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Seat seat = new Seat();
seat.setNumber( "3B" );
Airplane plane = new Airplane();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/QueryTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class QueryTest extends TestCase {

public void testPagedQuery() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Item item = new Item( "Mouse", "Micro$oft mouse" );
em.persist( item );
@@(protected) @@
}

public void testAggregationReturnType() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Item item = new Item( "Mouse", "Micro$oft mouse" );
em.persist( item );
@@(protected) @@
final Item item = new Item( "Mouse", "Micro$oft mouse" );
final Item item2 = new Item( "Computer", "D�ll computer" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
em.persist( item2 );
@@(protected) @@
// auchan.setName("Auchan");
// item.addDistributor(auchan);
//
-// EntityManager em = factory.createEntityManager();
+// EntityManager em = getEntityManager();
// em.getTransaction().begin();
// em.persist(fnac);
// em.persist(auchan);
@@(protected) @@
final Item item = new Item( "Mouse", "Micro_oft mouse" );
final Item item2 = new Item( "Computer", "D�ll computer" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
em.persist( item2 );
@@(protected) @@

Item item = new Item( "Mouse", "Micro$oft mouse" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@(protected) @@

Item item = new Item( "Mouse", "Micro$oft mouse" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@(protected) @@
}

public void testExplicitPositionalParameter() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@(protected) @@
}

public void testNativeQuestionMarkParameter() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Wallet w = new Wallet();
w.setBrand( "Lacoste" );
@@(protected) @@

Item item = new Item( "Mouse", "Micro$oft mouse" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@(protected) @@
}

public void testDistinct() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.createQuery( "delete Item" ).executeUpdate();
em.createQuery( "delete Distributor" ).executeUpdate();
@@(protected) @@
}

public void testIsNull() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Distributor d1 = new Distributor();
d1.setName( "Fnac" );
@@(protected) @@

Item item = new Item( "Mouse", "Micro$oft mouse" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
assertTrue( em.contains( item ) );
@@(protected) @@
public void testUnavailableNamedQuery() throws Exception {
Item item = new Item( "Mouse", "Micro$oft mouse" );

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( item );
try {

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/TestCase.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+
+import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;

@@(protected) @@
*/
public abstract class TestCase extends junit.framework.TestCase {
protected EntityManagerFactory factory;
+ protected EntityManager em;

public TestCase() {
super();
@@(protected) @@
public void tearDown() {
factory.close();
}
+
+ @Override
+ public void runTest() throws Throwable {
+ try {
+ em = getEntityManager();
+ super.runTest();
+ } catch (Throwable t) {
+ if (em.getTransaction().isActive())
+ em.getTransaction().rollback();
+ throw t;
+ }
+ }
+
+ protected EntityManager getEntityManager() {
+ if (em == null || !em.isOpen())
+ em = factory.createEntityManager();
+ return em;
+ }

+ protected EntityManager getEntityManager(Map properties) {
+ if (em == null || !em.isOpen())
+ em = factory.createEntityManager(properties);
+ return em;
+ }
+
public abstract Class[] getAnnotatedClasses();

public String[] getEjb3DD() {

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/association/AssociationTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
*/
public class AssociationTest extends TestCase {
public void testBidirOneToOne() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
String id = "10";
Incident i = em.find( Incident.class, id );
@@(protected) @@
}

public void testMergeAndBidirOneToOne() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Oven oven = new Oven();
Kitchen kitchen = new Kitchen();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbackAndDirtyTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class CallbackAndDirtyTest extends TestCase {

public void testDirtyButNotDirty() throws Exception {
- EntityManager manager = factory.createEntityManager();
+ EntityManager manager = getEntityManager();
manager.getTransaction().begin();
Employee mark = new Employee();
mark.setName( "Mark" );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/callbacks/CallbacksTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class CallbacksTest extends TestCase {

public void testCallbackMethod() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Cat c = new Cat();
c.setName( "Kitty" );
c.setDateOfBirth( new Date( 90, 11, 15 ) );
@@(protected) @@
}

public void testEntityListener() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Cat c = new Cat();
c.setName( "Kitty" );
c.setLength( 12 );
@@(protected) @@

public void testPostPersist() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Cat c = new Cat();
em.getTransaction().begin();
c.setLength( 23 );
@@(protected) @@

//Not a test since the spec did not make the proper change on listeners
public void listenerAnnotation() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Translation tl = new Translation();
em.getTransaction().begin();
tl.setInto( "France" );
@@(protected) @@
}

public void testPrePersistOnCascade() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Television tv = new Television();
RemoteControl rc = new RemoteControl();
@@(protected) @@
}

public void testCallBackListenersHierarchy() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Television tv = new Television();
em.persist( tv );
@@(protected) @@
}

public void testException() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Rythm r = new Rythm();
try {
@@(protected) @@
public void testIdNullSetByPrePersist() throws Exception {
Plant plant = new Plant();
plant.setName( "Origuna plantula gigantic" );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( plant );
em.flush();
@@(protected) @@
// public void testPostUpdateCollection() throws Exception {
//
// // create a cat
-// EntityManager em = factory.createEntityManager();
+// EntityManager em = getEntityManager();
// Cat cat = new Cat();
// em.getTransaction().begin();
// cat.setLength( 23 );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/CascadeTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@

public void testCascade() throws Exception {

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();

Teacher teacher = null;
@@(protected) @@
em.getTransaction().commit();

System.out.println("***************************");
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();

Teacher foundTeacher = (Teacher) em.createQuery( "select t from Teacher as t" ).getSingleResult();
@@(protected) @@

e1.setAuthor(e2);

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
EntityTransaction tx = em.getTransaction();
tx.begin();
em.persist(e2);
@@(protected) @@
tx.commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();

e1 = em.find(Song.class, e1.getId());
e2 = null;

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/DeleteOrphanTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public void testDeleteOrphan() throws Exception {
EntityTransaction tx;

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
tx = em.getTransaction();
tx.begin();
Troop disney = new Troop();
@@(protected) @@
tx.commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
tx = em.getTransaction();
tx.begin();
Troop troop = em.find( Troop.class, disney.getId() );
@@(protected) @@
troop.getSoldiers().remove( soldier );
troop = (Troop) unserialize( serialize( troop ) );

- em = factory.createEntityManager();
+ em = getEntityManager();
tx = em.getTransaction();
tx.begin();
em.merge( troop );
tx.commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
tx = em.getTransaction();
tx.begin();
soldier = em.find( Soldier.class, mickey.getId() );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/cascade/FetchTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class FetchTest extends TestCase {

public void testCascadeAndFetchCollection() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Troop disney = new Troop();
disney.setName( "Disney" );
@@(protected) @@
em.getTransaction().commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
Troop troop = em.find( Troop.class, disney.getId() );
assertFalse( Hibernate.isInitialized( troop.getSoldiers() ) );
@@(protected) @@
assertFalse( Hibernate.isInitialized( troop.getSoldiers() ) );
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
troop = em.find( Troop.class, disney.getId() );
em.remove( troop );
@@(protected) @@
}

public void testCascadeAndFetchEntity() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Troop disney = new Troop();
disney.setName( "Disney" );
@@(protected) @@
em.getTransaction().commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
Soldier soldier = em.find( Soldier.class, mickey.getId() );
assertFalse( Hibernate.isInitialized( soldier.getTroop() ) );
em.getTransaction().commit();
assertFalse( Hibernate.isInitialized( soldier.getTroop() ) );
em.close();
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
Troop troop = em.find( Troop.class, disney.getId() );
em.remove( troop );
@@(protected) @@
public void testTwoLevelDeepPersist() throws Exception {
EntityTransaction tx;

- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
tx = em.getTransaction();
tx.begin();
Conference jbwBarcelona = new Conference();
@@(protected) @@
tx.commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
tx = em.getTransaction();
tx.begin();
jbwBarcelona = em.find( Conference.class, jbwBarcelona.getId() );
@@(protected) @@

public void testTwoLevelDeepPersistOnManyToOne() throws Exception {
EntityTransaction tx;
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
tx = em.getTransaction();
tx.begin();
Grandson gs = new Grandson();
@@(protected) @@
em.persist( gs );
tx.commit();
em.close();
- em = factory.createEntityManager();
+ em = getEntityManager();
tx = em.getTransaction();
tx.begin();
gs = em.find( Grandson.class, gs.getId() );
@@(protected) @@
}

public void testPerfCascadeAndFetchEntity() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
//init data
em.getTransaction().begin();
int loop = 50;
@@(protected) @@
em.close();

//Warm up loop
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
for ( int i = 0; i < loop ; i++ ) {
//Soldier soldier = em.find( Soldier.class, new Integer(i) );
@@(protected) @@

//do not evict
for ( int j = 0; j < 10 ; j++ ) {
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
for ( int i = 0; i < loop ; i++ ) {
Troop troop = em.find( Troop.class, new Integer( i ) );
@@(protected) @@
em.close();

//evict
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
for ( int i = 0; i < loop ; i++ ) {
//Soldier soldier = em.find( Soldier.class, new Integer(i) );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushModeTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushModeTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushModeTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public void testCreateEMFlushMode() throws Exception {
Map properties = new HashMap();
properties.put( "org.hibernate.flushMode", "manual" );
- EntityManager em = factory.createEntityManager( properties );
+ EntityManager em = getEntityManager( properties );
em.getTransaction().begin();
Dress dress = new Dress();
dress.name = "long dress";

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/FlushTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@

//Test for EJBTHREE-722
public void testFlushOnDetached() throws Exception {
- EntityManager manager = factory.createEntityManager( );
+ EntityManager manager = getEntityManager( );

manager.getTransaction().begin();
Pet p1 = createCat("Toonses", 15.0, 9, manager);

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/GetReferenceTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class GetReferenceTest extends TestCase {

public void testWrongIdType() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
try {
Competitor c = em.getReference( Competitor.class, new String("30") );
fail("Expected IllegalArgumentException");

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/MergeTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
race.competitors.add( new Competitor("Name") );
race.competitors.add( new Competitor() );
race.competitors.add( new Competitor() );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@(protected) @@
competition.getCompetitors().add( new Competitor("Name") );
competition.getCompetitors().add( new Competitor() );
competition.getCompetitors().add( new Competitor() );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( competition );
em.flush();
@@(protected) @@
competition.getCompetitors().add( new Competitor("Name") );
competition.getCompetitors().add( new Competitor() );
competition.getCompetitors().add( new Competitor() );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( competition );
em.flush();
@@(protected) @@

public void testRemoveAndMerge() {
Race race = new Race();
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@(protected) @@
public void testConcurrentMerge() {
Race race = new Race();
race.name = "Derby";
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@(protected) @@

race.name = "Magnicourt";

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
Race race2 = em.find(Race.class, race.id );
race2.name = "Mans";
@@(protected) @@
em.getTransaction().commit();
em.close();

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
race2 = em.find(Race.class, race.id );
assertEquals( "Last commit win in merge", "Magnicourt", race2.name );
@@(protected) @@
}

public void testMergeUnidirectionalOneToMany() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Empire roman = new Empire();
em.persist( roman );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RefreshTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class RefreshTest extends TestCase {

public void testRefreshNonManaged() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Race race = new Race();
em.persist( race );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/RemoveTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
race.competitors.add( new Competitor() );
race.competitors.add( new Competitor() );
race.competitors.add( new Competitor() );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( race );
em.flush();
@@(protected) @@

public void testRemoveAndFind() {
Race race = new Race();
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( race );
em.remove( race );
@@(protected) @@
em.close();
}

- public void testUpdatedAndRemove() {
+ public void testUpdatedAndRemove() throws Exception {
Music music = new Music();
music.setName( "Classical" );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( music );
em.getTransaction().commit();

em.clear();

- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
+
EntityManager em2 = factory.createEntityManager();
- em2.getTransaction().begin();
+ try {
+ em2.getTransaction().begin();
+ //read music from 2nd EM
+ music = em2.find( Music.class, music.getId() );
+ } catch (Exception e) {
+ em2.getTransaction().rollback();
+ em2.close();
+ throw e;
+ }

- //read music from 2nd EM
- music = em2.find( Music.class, music.getId() );
-
//change music
em.find( Music.class, music.getId() ).setName( "Rap" );
em.getTransaction().commit();
@@(protected) @@
}
finally {
em2.getTransaction().rollback();
+ em2.close();
}

//clean
em.remove( em.find( Music.class, music.getId() ) );

em.close();
- em2.close();
}

public Class[] getAnnotatedClasses() {

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class CascadePersistTest extends TestCase {

public void testLazyCollectionsStayLazyOnPersist() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
//initialize
A a = new A();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/exception/ExceptionTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
-// $Id:$
+// $Id$
package org.hibernate.ejb.test.exception;

import java.util.Map;
@@(protected) @@
private final Logger log = LoggerFactory.getLogger(ExceptionTest.class);

public void testOptimisticLockingException() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
EntityManager em2 = factory.createEntityManager();
em.getTransaction().begin();
Music music = new Music();
@@(protected) @@
em.persist( music );
em.getTransaction().commit();

- em2.getTransaction().begin();
- Music music2 = em2.find( Music.class, music.getId() );
- music2.setName( "HouseMusic" );
- em2.getTransaction().commit();
- em2.close();
+ try {
+ em2.getTransaction().begin();
+ Music music2 = em2.find( Music.class, music.getId() );
+ music2.setName( "HouseMusic" );
+ em2.getTransaction().commit();
+ } catch (Exception e){
+ em2.getTransaction().rollback();
+ throw e;
+ } finally {
+ em2.close();
+ }

em.getTransaction().begin();
music.setName( "Rock" );
@@(protected) @@
}

public void testEntityNotFoundException() throws Exception {
- EntityManager em = factory.createEntityManager( );
+ EntityManager em = getEntityManager( );
Music music = em.getReference( Music.class, new Integer(-1) );
try {
music.getName();
@@(protected) @@
}

public void testConstraintViolationException() throws Exception {
- EntityManager em = factory.createEntityManager( );
+ EntityManager em = getEntityManager( );
em.getTransaction().begin();
Music music = new Music();
music.setName( "Jazz" );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/inheritance/InheritanceTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class InheritanceTest extends TestCase {

public void testFind() throws Exception {
- EntityManager firstSession = factory.createEntityManager( );
+ EntityManager firstSession = getEntityManager( );
Strawberry u = new Strawberry();
u.setSize( 12l );
firstSession.getTransaction().begin();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/lob/BlobTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class BlobTest extends TestCase {

public void testBlobSerialization() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Map image = new HashMap();
image.put( "meta", "metadata" );
@@(protected) @@
em.persist( reader );
em.getTransaction().commit();
em.close(); //useless but y'a know
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
reader = em.find( ImageReader.class, reader.getId() );
ObjectInputStream ois = new ObjectInputStream( reader.getImage().getBinaryStream() );

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/lock/LockTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public void testLockRead() throws Exception {
Lock lock = new Lock();
lock.setName( "name" );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( lock );
em.getTransaction().commit();
@@(protected) @@
public void testLockWrite() throws Exception {
Lock lock = new Lock();
lock.setName( "second" );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( lock );
em.getTransaction().commit();
@@(protected) @@
public void testLockWriteOnUnversioned() throws Exception {
UnversionedLock lock = new UnversionedLock();
lock.setName( "second" );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( lock );
em.getTransaction().commit();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/FindTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
Mammal mammal = new Mammal();
mammal.setMamalNbr( 2 );
mammal.setName( "Human" );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( mammal );
em.flush();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/ops/MergeNewTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
Workload load = new Workload();
load.name = "Cleaning";
load.load = 10;
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
load = em.merge( load );
assertNotNull( load.id );
@@(protected) @@
Workload load = new Workload();
load.name = "Cleaning";
load.load = 10;
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
load = em.merge( load );
em.flush();
em.getTransaction().commit();
em.close();
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
load = em.find( Workload.class, load.id );
em.remove( load );
em.flush();
em.getTransaction().commit();
em.close();
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
em.merge( load );
em.flush();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/transaction/FlushAndTransactionTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public void testAlwaysTransactionalOperations() throws Exception {
Book book = new Book();
book.name = "Le petit prince";
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( book );
em.getTransaction().commit();
@@(protected) @@
// public void testTransactionalOperationsWhenTransactional() throws Exception {
// Book book = new Book();
// book.name = "Le petit prince";
-// EntityManager em = factory.createEntityManager( PersistenceContextType.TRANSACTION );
+// EntityManager em = getEntityManager( PersistenceContextType.TRANSACTION );
// try {
// em.persist( book );
// fail("flush has to be inside a Tx");
@@(protected) @@
public void testTransactionalOperationsWhenExtended() throws Exception {
Book book = new Book();
book.name = "Le petit prince";
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Statistics stats = ( (HibernateEntityManagerFactory) factory ).getSessionFactory().getStatistics();
stats.clear();
stats.setStatisticsEnabled( true );
@@(protected) @@
public void testMergeWhenExtended() throws Exception {
Book book = new Book();
book.name = "Le petit prince";
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
Statistics stats = ( (HibernateEntityManagerFactory) factory ).getSessionFactory().getStatistics();

em.getTransaction().begin();
@@(protected) @@
}

public void testCloseAndTransaction() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Book book = new Book();
book.name = "Java for Dummies";
@@(protected) @@
}
em.getTransaction().commit();
assertFalse( em.isOpen() );
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
book = em.find( Book.class, book.id );
assertEquals( "C# for Dummies", book.name );
@@(protected) @@
}

public void testTransactionCommitDoesNotFlush() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Book book = new Book();
book.name = "Java for Dummies";
em.persist( book );
em.getTransaction().commit();
em.close();
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
List result = em.createQuery("select book from Book book where book.name = :title").
setParameter( "title", book.name ).getResultList();
@@(protected) @@
}

public void testTransactionAndContains() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
Book book = new Book();
book.name = "Java for Dummies";
em.persist( book );
em.getTransaction().commit();
em.close();
- em = factory.createEntityManager();
+ em = getEntityManager();
em.getTransaction().begin();
List result = em.createQuery("select book from Book book where book.name = :title").
setParameter( "title", book.name ).getResultList();
@@(protected) @@
Book book = new Book();
book.name = "Stolen keys";
book.id = null; //new Integer( 50 );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
try {
em.persist( book );
@@(protected) @@
Book book = new Book();
book.name = "Stolen keys";
book.id = null; //new Integer( 50 );
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( book );
em.flush();
@@(protected) @@
public void testRollbackClearPC() throws Exception {
Book book = new Book();
book.name = "Stolen keys";
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();
em.persist( book );
em.getTransaction().commit();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
public class XmlAttributeOverrideTest extends TestCase {

public void testAttributeOverriding() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();

Employee e = new Employee();
@@(protected) @@
}

public void testDefaultEventListener() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.getTransaction().begin();

CounterListener.reset();

Modified: entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java
===================================================================
--- entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java 2008-10-08 11:44:18 UTC (rev 15282)
+++ entitymanager/trunk/src/test/org/hibernate/ejb/test/xml/XmlTest.java 2008-10-08 11:58:24 UTC (rev 15283)
@@(protected) @@
*/
public class XmlTest extends TestCase {
public void testXmlMappingCorrectness() throws Exception {
- EntityManager em = factory.createEntityManager();
+ EntityManager em = getEntityManager();
em.close();
}

_______________________________________________
hibernate-commits mailing list
hibernate-commits@(protected)
https://lists.jboss.org/mailman/listinfo/hibernate-commits

[hibernate-commits] Hibernate SVN: r15283 - in entitymanager/trunk/src/test/org/hibernate/ejb/test: association and 11 other directories.

hibernate-commits

2008-10-08

[hibernate-commits] Hibernate SVN: r15283 - in
entitymanager/trunk/src/test/org/hibernate/ejb/test:
association and 11 other directories.