svn commit: r1021976 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach: TestDetachNoProxy.java TestDetachReloadProp.java

[dwoods]

Author: dwoods
Date: Wed Oct 13 02:16:07 2010
New Revision: 1021976

URL: http://svn.apache.org/viewvc?rev=1021976&view=rev
Log:
make sure tests cleanup EMs and EMFs

Modified:
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java?rev=1021976&r1=1021975&r2=1021976&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
 Wed Oct 13 02:16:07 2010
@@ -100,7 +100,7 @@ public class TestDetachNoProxy extends S
         verifySerializable(e20, true, false);
                
         em.close();
-        emf2.close();
+        closeEMF(emf2);
     }
 
     /* 
@@ -151,7 +151,7 @@ public class TestDetachNoProxy extends S
         verifySerializable(e20copy, false, false);
         
         em.close();
-        emf2.close();
+        closeEMF(emf2);
     }
 
     /*
@@ -206,7 +206,7 @@ public class TestDetachNoProxy extends S
         }
 
         em.close();
-        emf2.close();
+        closeEMF(emf2);
     }
 
     /*
@@ -260,7 +260,7 @@ public class TestDetachNoProxy extends S
         }
 
         em.close();
-        emf1.close();
+        closeEMF(emf1);
     }
 
     /*
@@ -314,7 +314,7 @@ public class TestDetachNoProxy extends S
         }
 
         em.close();
-        emf2.close();
+        closeEMF(emf2);
     }
 
     /*
@@ -367,7 +367,7 @@ public class TestDetachNoProxy extends S
         }
 
         em.close();
-        emf2.close();
+        closeEMF(emf2);
     }
 
     /**

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java?rev=1021976&r1=1021975&r2=1021976&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachReloadProp.java
 Wed Oct 13 02:16:07 2010
@@ -27,7 +27,6 @@ public class TestDetachReloadProp extend
     TimestampVersionEntity tsVer;
     NoVersionEntity noVer;
     int id;
-    OpenJPAEntityManager em;
     Compatibility compat;
     
     public void setUp() {
@@ -51,12 +50,13 @@ public class TestDetachReloadProp extend
     }
     
     private void persist() {
-        em = emf.createEntityManager();
+        OpenJPAEntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         em.persist(noVer);
         em.persist(intVer); // also persists referenced tsVer
         em.getTransaction().commit();
         em.close();
+        em = null;
     }
     
     public void testReloadTrue() {
@@ -71,7 +71,7 @@ public class TestDetachReloadProp extend
     
     private void detachProcessing() {
         // Detach individual entities explicitly
-        em = emf.createEntityManager();
+        OpenJPAEntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         intVer = em.find(IntVersionEntity.class, id);
         tsVer = em.find(TimestampVersionEntity.class, id);