test cleanup

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1027638 13f79535-47bb-0310-9956-ffa450edef68

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/CacheLoadTest.java

@@ -65,6 +65,7 @@ public class CacheLoadTest
     @Override
     public void tearDown() throws Exception {
         closeEMF(emf);
+        emf = null;
         super.tearDown();
     }
     

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestDataCacheBehavesIdentical.java

@@ -106,7 +106,9 @@ public class TestDataCacheBehavesIdentical extends AbstractTestCase {
         // HACK - need to manually close EMFs after all tests have run
         if (TEST_COUNT >= 21) {
             closeEMF(emfWithDataCache);
+            emfWithDataCache = null;
             closeEMF(emfWithoutDataCache);
+            emfWithoutDataCache = null;
             super.tearDown();            
         }
     }

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestEntitiesAsKeys.java

@@ -42,6 +42,7 @@ public class TestEntitiesAsKeys extends AbstractPersistenceTestCase {
     public void tearDown() throws Exception {
         closeEMF(emf);
         emf = null;
+        super.tearDown();
     }
     
     public void populate() {

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2Queries.java

@@ -68,6 +68,7 @@ public class TestJPQL2Queries
         throws Exception {
         try {
             _factory.close();
+            _factory = null;
         } catch (Exception e) {
         }
 

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQL2ResultsAndResultClasses.java

@@ -106,7 +106,7 @@ public class TestJPQL2ResultsAndResultClasses
     public void tearDown()
         throws Exception {
         _factory.close();
-
+        _factory = null;
         super.tearDown();
     }
 

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestJPQLRelationProjections.java

@@ -95,7 +95,7 @@ public class TestJPQLRelationProjections
     public void tearDown()
         throws Exception {
         _factory.close();
-
+        _factory = null;
         super.tearDown();
     }
 

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java

@@ -80,6 +80,7 @@ public class TestMutableParameters
         throws Exception {
         try {
             _factory.close();
+            _factory = null;
         } catch (Exception e) {
         }
 

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestResultShapes.java

@@ -69,7 +69,7 @@ public class TestResultShapes extends AbstractTestCase {
 
     public void tearDown() throws Exception {
         _broker.close();
-
+        _broker = null;
         super.tearDown();
     }