commit f54c5867653b3efce41147e483c61dddbe8a08ee
author Michelle Caisse <mcaisse@apache.org> Fri Nov 14 20:51:16 2008 +0000
committer Michelle Caisse <mcaisse@apache.org> Fri Nov 14 20:51:16 2008 +0000
tree dff0502c4900bfb3f1a2250c0f12d2d749951f89
parent 550721c0d8332527af885c9675e226068f6a2a35

JDO-613 Missing addTearDownClass in PersistenceManagerTest. Also removed comments from teardown classes in PersistenceManagerTest.java

tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java

diff --git a/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java b/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
index 2c258c6..3cfe253 100644
--- a/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
+++ b/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
@@ -74,6 +74,13 @@
     private Object p4oid = null;
     private Object p5oid = null;
     
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(VersionedPCPoint.class);
+    }
+
     /** */
     public void test() {
         pm = getPM();

tck2/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java

diff --git a/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java b/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
index 1eaf8da..d39953e 100644
--- a/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
+++ b/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
@@ -27,9 +27,6 @@
 import org.apache.jdo.tck.pc.mylib.PCPoint;
 import org.apache.jdo.tck.pc.mylib.PCPoint2;
 import org.apache.jdo.tck.pc.mylib.PCRect;
-import org.apache.jdo.tck.pc.newInstance.Address;
-import org.apache.jdo.tck.pc.newInstance.AAddress;
-import org.apache.jdo.tck.pc.newInstance.IAddress;
 
 public abstract class PersistenceManagerTest extends JDO_Test {
     
@@ -46,9 +43,6 @@
         addTearDownClass(PCPoint.class);
         addTearDownClass(Department.class);
         addTearDownClass(Company.class);
-//        addTearDownClass(Address.class);
-//        addTearDownClass(AAddress.class);
-//        addTearDownClass(IAddress.class);
     }
     
     /** */

tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java

diff --git a/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java b/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
index 49922aa..4acfa6a 100644
--- a/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
+++ b/tck2/src/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
@@ -73,6 +73,15 @@
     private static final Integer one = new Integer(1);
     private static final Integer three = new Integer(3);
 
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(PCPoint2.class);
+        addTearDownClass(PCRect.class);
+        addTearDownClass(PCPoint.class);
+    }
+
     /** */
     public void test () {
         pm = getPM();