make sure tests cleanup EMs and EMFs

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

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractCachedEMFTestCase.java

@@ -76,10 +76,18 @@ public abstract class AbstractCachedEMFTestCase extends AbstractPersistenceTestC
         @Override
         protected boolean removeEldestEntry(Map.Entry<K,V> entry) {
             OpenJPAEntityManagerFactorySPI oemf = (OpenJPAEntityManagerFactorySPI)entry.getValue();
-            // if (oemf != null && oemf.isOpen()) {
+            if (this.size() > 2) {
-            //     oemf.close();
+                // if the eldest should be removed, then try to close it first
-            // }
+                if (oemf != null && oemf.isOpen()) {
-            return this.size() > 2;
+                    try {
+                        oemf.close();
+                    } catch (Exception e) {
+                        // no-op - eat it
+                    }
+                }
+                return true;
+            }
+            return false;
         }
     }
 

openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/SingleEMFTestCase.java

@@ -85,6 +85,7 @@ public abstract class SingleEMFTestCase
                 throw e;
         } finally {
             closeEMF(emf);
+            emf = null;
         }
     }