svn commit: r1005863 - /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java

[dw...@apache.org]

Author: dwoods
Date: Fri Oct  8 15:39:52 2010
New Revision: 1005863

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

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java?rev=1005863&r1=1005862&r2=1005863&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java Fri Oct  8 15:39:52 2010
@@ -20,16 +20,18 @@ package org.apache.openjpa.meta;
 
 import javax.persistence.EntityManagerFactory;
 
-import org.apache.openjpa.persistence.test.AbstractCachedEMFTestCase;
-import org.apache.openjpa.persistence.test.PersistenceTestCase;
+import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 import org.apache.openjpa.persistence.JPAFacadeHelper;
 
-public class TestMetaDataInheritanceComparator extends AbstractCachedEMFTestCase {
+public class TestMetaDataInheritanceComparator extends SingleEMFTestCase {
 
     public void testInheritanceComparatorWithBase() {
         inheritanceComparatorHelper(true);
     }
 
+    public void setUp() {
+        setUp(A.class, B.class, C.class, AbstractThing.class);
+    }
     private void inheritanceComparatorHelper(boolean base) {
         InheritanceComparator comp = new InheritanceComparator();
         if (base)
@@ -53,17 +55,12 @@ public class TestMetaDataInheritanceComp
         if (base)
             comp.setBase(AbstractThing.class);
 
-        EntityManagerFactory emf = createEMF(A.class, B.class, C.class,
-            AbstractThing.class);
-
         ClassMetaData a = JPAFacadeHelper.getMetaData(emf, A.class);
         ClassMetaData b = JPAFacadeHelper.getMetaData(emf, B.class);
         ClassMetaData c = JPAFacadeHelper.getMetaData(emf, C.class);
         ClassMetaData at = JPAFacadeHelper.getMetaData(emf,
             AbstractThing.class);
 
-        emf.close();
-
         assertEquals(-1, comp.compare(a, b));
         assertEquals(-1, comp.compare(b, c));
         assertTrue(comp.compare(a, c) < 0);
@@ -79,9 +76,6 @@ public class TestMetaDataInheritanceComp
 
     public void testEndToEnd() {
         // make sure we can get things fully instantiated
-        EntityManagerFactory emf = createEMF(A.class, B.class, C.class,
-            AbstractThing.class);
         emf.createEntityManager().close();
-        emf.close();
     }
 }