Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 20709 invoked from network); 27 Jun 2005 22:50:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Jun 2005 22:50:07 -0000 Received: (qmail 1567 invoked by uid 500); 27 Jun 2005 22:50:07 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 1554 invoked by uid 99); 27 Jun 2005 22:50:07 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 27 Jun 2005 15:50:04 -0700 Received: (qmail 20619 invoked by uid 65534); 27 Jun 2005 22:50:02 -0000 Message-ID: <20050627225002.20618.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r202089 [1/2] - in /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck: api/instancecallbacks/ api/jdohelper/ api/persistencemanager/ api/persistencemanager/cache/ api/persistencemanager/extent/ api/persistencemanager/getobject/ api/per... Date: Mon, 27 Jun 2005 22:49:45 -0000 To: jdo-commits@db.apache.org From: mcaisse@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mcaisse Date: Mon Jun 27 15:49:40 2005 New Revision: 202089 URL: http://svn.apache.org/viewcvs?rev=202089&view=rev Log: Adds teardown classes to all tests that create persistent objects. Submitted by Michael Watzek Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/extents/ExtentTest.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/IgnoreCacheFalse.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/Commit.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/GetSynchronization.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/Rollback.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/transactions/WhenNontransactionalReadIsFalse.java Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java Mon Jun 27 15:49:40 2005 @@ -21,6 +21,7 @@ import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass; import org.apache.jdo.tck.util.BatchTestRunner; @@ -64,6 +65,13 @@ BatchTestRunner.run(AccessOtherInstancesInPrestore.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackClass.class); + } + /** */ public void test() throws Exception { @@ -71,9 +79,6 @@ Transaction t = pm.currentTransaction(); InstanceCallbackClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); InstanceCallbackClass.performPreStoreTests = true; t.begin(); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java Mon Jun 27 15:49:40 2005 @@ -23,6 +23,7 @@ import javax.jdo.JDOUserException; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass; import org.apache.jdo.tck.util.BatchTestRunner; @@ -70,15 +71,19 @@ BatchTestRunner.run(AccessingFieldsInPredelete.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackClass.class); + } + /** */ public void test() throws Exception { pm = getPM(); Transaction t = pm.currentTransaction(); InstanceCallbackClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); InstanceCallbackClass.performPreDeleteTests = true; t.begin(); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java Mon Jun 27 15:49:40 2005 @@ -68,6 +68,13 @@ BatchTestRunner.run(CallingJdoPostload.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackNonPersistFdsClass.class); + } + /** */ public void test() throws Exception { @@ -75,9 +82,6 @@ Transaction t = pm.currentTransaction(); InstanceCallbackNonPersistFdsClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackNonPersistFdsClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); t.begin(); // create instance Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java Mon Jun 27 15:49:40 2005 @@ -25,6 +25,7 @@ import javax.jdo.JDOUserException; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass; import org.apache.jdo.tck.util.BatchTestRunner; @@ -64,6 +65,13 @@ BatchTestRunner.run(CallingJdoPreclear.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackClass.class); + } + /** */ public void test() throws Exception { @@ -72,9 +80,6 @@ t.setRetainValues(false); // instances transition to hollow after commit InstanceCallbackClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); t.begin(); Calendar cal = Calendar.getInstance(); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java Mon Jun 27 15:49:40 2005 @@ -69,6 +69,13 @@ BatchTestRunner.run(CallingJdoPredelete.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackClass.class); + } + /** */ public void test() throws Exception { @@ -76,9 +83,6 @@ Transaction t = pm.currentTransaction(); InstanceCallbackClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); InstanceCallbackClass.performPreDeleteTests = true; // enabling PreDelete tests t.begin(); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java Mon Jun 27 15:49:40 2005 @@ -73,6 +73,13 @@ BatchTestRunner.run(CallingJdoPrestore.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackNonPersistFdsClass.class); + } + /** */ public void test() throws Exception { @@ -80,9 +87,6 @@ Transaction t = pm.currentTransaction(); InstanceCallbackClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackNonPersistFdsClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); InstanceCallbackClass.performPreStoreTests = true; t.begin(); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java Mon Jun 27 15:49:40 2005 @@ -64,6 +64,13 @@ BatchTestRunner.run(ModificationOfNontransactionalNonpersistentFields.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackNonPersistFdsClass.class); + } + /** */ public void test() throws Exception { @@ -71,9 +78,6 @@ Transaction t = pm.currentTransaction(); InstanceCallbackNonPersistFdsClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackNonPersistFdsClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); t.begin(); // create instance Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java Mon Jun 27 15:49:40 2005 @@ -62,6 +62,13 @@ BatchTestRunner.run(NoAccessToFieldsAfterPredelete.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(InstanceCallbackClass.class); + } + /** */ public void test() throws Exception { @@ -69,9 +76,6 @@ Transaction t = pm.currentTransaction(); InstanceCallbackClass.initializeStaticsForTest(); - t.begin(); - InstanceCallbackClass.removeAllInstances(pm); // always start fresh with no instances - t.commit(); t.begin(); // make intValue outside the range of zero to arraySize-1 to skip most jdoPreDelete() code. Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java Mon Jun 27 15:49:40 2005 @@ -57,6 +57,13 @@ BatchTestRunner.run(GetObjectId.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.getObjectId(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java Mon Jun 27 15:49:40 2005 @@ -59,6 +59,13 @@ BatchTestRunner.run(GetPersistenceManager.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test jdohelper.getPersistenceManager(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java Mon Jun 27 15:49:40 2005 @@ -57,6 +57,13 @@ BatchTestRunner.run(GetTransactionalObjectId.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.getTransactionalObjectId(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java Mon Jun 27 15:49:40 2005 @@ -57,6 +57,13 @@ BatchTestRunner.run(IsDeleted.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test jdohelper.isDeleted(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java Mon Jun 27 15:49:40 2005 @@ -58,6 +58,13 @@ BatchTestRunner.run(IsDeletedFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isDeleted(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java Mon Jun 27 15:49:40 2005 @@ -56,6 +56,13 @@ BatchTestRunner.run(IsDirty.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isDeleted(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java Mon Jun 27 15:49:40 2005 @@ -56,6 +56,13 @@ BatchTestRunner.run(IsDirtyFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isDirty(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java Mon Jun 27 15:49:40 2005 @@ -56,6 +56,13 @@ BatchTestRunner.run(IsNew.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isNew(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java Mon Jun 27 15:49:40 2005 @@ -56,6 +56,13 @@ BatchTestRunner.run(IsPersistent.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isPersistent(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java Mon Jun 27 15:49:40 2005 @@ -55,6 +55,13 @@ BatchTestRunner.run(IsTransactional.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.IsTransactional(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java Mon Jun 27 15:49:40 2005 @@ -55,6 +55,13 @@ BatchTestRunner.run(IsTransactionalFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.IsTransactionalFalse(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java Mon Jun 27 15:49:40 2005 @@ -56,6 +56,13 @@ BatchTestRunner.run(MakeDirty.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.MakeDirty(Object pc) * */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java Mon Jun 27 15:49:40 2005 @@ -52,7 +52,6 @@ pm.makePersistent(p1); Object oid = pm.getObjectId(p1); tx.commit(); - addTearDownInstance(p1); return oid; } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java Mon Jun 27 15:49:40 2005 @@ -22,6 +22,7 @@ import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest; import org.apache.jdo.tck.pc.mylib.PCPoint2; import org.apache.jdo.tck.util.BatchTestRunner; @@ -62,6 +63,14 @@ private PCPoint2 pnt2 = null; private PCPoint2 p1 = null; private PCPoint2 p2 = null; + + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + super.localSetUp(); + addTearDownClass(PCPoint2.class); + } /** */ public void testEvictingCollectionOfInstancesSideEffects() { Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java Mon Jun 27 15:49:40 2005 @@ -17,9 +17,9 @@ package org.apache.jdo.tck.api.persistencemanager.cache; -import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest; import org.apache.jdo.tck.pc.mylib.PCPoint2; import org.apache.jdo.tck.util.BatchTestRunner; @@ -59,6 +59,14 @@ public static void main(String[] args) { BatchTestRunner.run(EvictingWithRestoreValuesFalse.class); } + + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + super.localSetUp(); + addTearDownClass(PCPoint2.class); + } /** */ public void test() { Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java Mon Jun 27 15:49:40 2005 @@ -17,9 +17,9 @@ package org.apache.jdo.tck.api.persistencemanager.cache; -import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest; import org.apache.jdo.tck.pc.mylib.PCPoint2; import org.apache.jdo.tck.util.BatchTestRunner; @@ -59,6 +59,14 @@ public static void main(String[] args) { BatchTestRunner.run(EvictingWithRetainValuesFalse.class); } + + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + super.localSetUp(); + addTearDownClass(PCPoint2.class); + } /** */ public void test() { Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java Mon Jun 27 15:49:40 2005 @@ -16,20 +16,19 @@ package org.apache.jdo.tck.api.persistencemanager.extent; -import java.util.Iterator; import java.util.Date; +import java.util.Iterator; import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest; - -import org.apache.jdo.tck.pc.company.Person; import org.apache.jdo.tck.pc.company.Employee; -import org.apache.jdo.tck.pc.company.PartTimeEmployee; import org.apache.jdo.tck.pc.company.FullTimeEmployee; - +import org.apache.jdo.tck.pc.company.PartTimeEmployee; +import org.apache.jdo.tck.pc.company.Person; import org.apache.jdo.tck.util.BatchTestRunner; /** @@ -56,6 +55,16 @@ */ public static void main(String[] args) { BatchTestRunner.run(GetExtentWithSubclasses.class); + } + + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(FullTimeEmployee.class); + addTearDownClass(PartTimeEmployee.class); + addTearDownClass(Person.class); + super.localSetUp(); } /** */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java Mon Jun 27 15:49:40 2005 @@ -17,7 +17,6 @@ package org.apache.jdo.tck.api.persistencemanager.getobject; import javax.jdo.JDOObjectNotFoundException; -import javax.jdo.PersistenceManager; import javax.jdo.Transaction; import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest; Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java Mon Jun 27 15:49:40 2005 @@ -16,19 +16,16 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle; -import java.util.Iterator; import java.util.Date; -import javax.jdo.Extent; import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest; +import org.apache.jdo.tck.pc.company.Address; import org.apache.jdo.tck.pc.company.Company; import org.apache.jdo.tck.pc.company.Department; -import org.apache.jdo.tck.pc.company.Address; - import org.apache.jdo.tck.util.BatchTestRunner; -import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest; /** *Title: MakePersistent And Instances Not Reachable Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java Mon Jun 27 15:49:40 2005 @@ -22,11 +22,10 @@ import java.util.Iterator; import java.util.Properties; -import javax.jdo.PersistenceManagerFactory; -import javax.jdo.PersistenceManager; import javax.jdo.JDOException; import javax.jdo.JDOFatalInternalException; import javax.jdo.JDOUserException; +import javax.jdo.PersistenceManagerFactory; import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.util.BatchTestRunner; Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java Mon Jun 27 15:49:40 2005 @@ -19,12 +19,11 @@ import java.util.Date; import javax.jdo.JDOHelper; -import javax.jdo.PersistenceManager; import javax.jdo.Transaction; import org.apache.jdo.tck.JDO_Test; -import org.apache.jdo.tck.pc.company.Company; import org.apache.jdo.tck.pc.company.Address; +import org.apache.jdo.tck.pc.company.Company; import org.apache.jdo.tck.util.BatchTestRunner; /** @@ -53,6 +52,13 @@ */ public static void main(String[] args) { BatchTestRunner.run(GetPersistenceManagerFactoryByPropertiesInstance.class); + } + + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(Company.class); } /** */ Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/extents/ExtentTest.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/extents/ExtentTest.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/extents/ExtentTest.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/extents/ExtentTest.java Mon Jun 27 15:49:40 2005 @@ -33,10 +33,10 @@ import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.company.Address; import org.apache.jdo.tck.pc.company.Company; +import org.apache.jdo.tck.pc.company.DentalInsurance; import org.apache.jdo.tck.pc.company.Department; import org.apache.jdo.tck.pc.company.Employee; import org.apache.jdo.tck.pc.company.FullTimeEmployee; -import org.apache.jdo.tck.pc.company.DentalInsurance; import org.apache.jdo.tck.pc.company.MedicalInsurance; import org.apache.jdo.tck.pc.company.PartTimeEmployee; import org.apache.jdo.tck.pc.company.Project; @@ -51,6 +51,20 @@ protected Class extentClass = Employee.class; protected Company company; protected Object companyOID; + + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(DentalInsurance.class); + addTearDownClass(MedicalInsurance.class); + addTearDownClass(Project.class); + addTearDownClass(FullTimeEmployee.class); + addTearDownClass(PartTimeEmployee.class); + addTearDownClass(Employee.class); + addTearDownClass(Department.class); + addTearDownClass(Company.class); + } /** Creates new ExtentTest */ public ExtentTest() { Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java Mon Jun 27 15:49:40 2005 @@ -47,6 +47,14 @@ BatchTestRunner.run(HollowInstanceMaintainsPK.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCRect.class); + addTearDownClass(PCPoint.class); + } + /** */ public void test() { if (!isApplicationIdentitySupported()) { @@ -79,7 +87,6 @@ "from transient instance via makePersistent(), state is " + states[curr]); } - addTearDownInstance(obj); return obj; } Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java Mon Jun 27 15:49:40 2005 @@ -70,6 +70,13 @@ */ private int originalValue; + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(StateTransitionObj.class); + } + /** */ public void testDifferentPM() { if (!isNontransactionalWriteSupported()) { Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java Mon Jun 27 15:49:40 2005 @@ -16,14 +16,9 @@ package org.apache.jdo.tck.mapping; -import java.util.Collection; -import java.util.HashSet; - -import javax.jdo.PersistenceManager; - import org.apache.jdo.tck.JDO_Test; -import org.apache.jdo.tck.pc.company.CompanyModelReader; import org.apache.jdo.tck.pc.company.Company; +import org.apache.jdo.tck.pc.company.CompanyModelReader; import org.apache.jdo.tck.util.BatchTestRunner; import org.apache.jdo.tck.util.EqualityHelper; @@ -59,6 +54,9 @@ BatchTestRunner.run(CompletenessTest.class); } + /** + * @see JDO_Test#localSetUp() + */ protected void localSetUp() { CompanyModelReader reader = new CompanyModelReader(inputFilename); // persist test data @@ -66,11 +64,12 @@ pm.currentTransaction().begin(); Object root = reader.getCompany("company1"); pm.makePersistent(root); - addTearDownClass(reader.getAllClasses()); + addTearDownClass(reader.getTearDownClasses()); rootOid = pm.getObjectId(root); pm.currentTransaction().commit(); cleanupPM(); } + /** */ public void test() { Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java Mon Jun 27 15:49:40 2005 @@ -17,15 +17,14 @@ package org.apache.jdo.tck.models.embedded; -import javax.jdo.PersistenceManager; import java.util.Date; import java.util.Set; import org.apache.jdo.tck.JDO_Test; -import org.apache.jdo.tck.util.BatchTestRunner; -import org.apache.jdo.tck.pc.company.Company; import org.apache.jdo.tck.pc.company.Address; +import org.apache.jdo.tck.pc.company.Company; import org.apache.jdo.tck.pc.company.Department; +import org.apache.jdo.tck.util.BatchTestRunner; /** *Title: Embedded Objects Track Their Changes @@ -57,6 +56,13 @@ BatchTestRunner.run(SecondClassObjectsTrackTheirChanges.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(Company.class); + } + /** This tests that persistence-capable instances track changes or notify their owning instance that they are dirty */ public void testPCInstance() { pm = getPM(); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java Mon Jun 27 15:49:40 2005 @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(ArrayCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java Mon Jun 27 15:49:40 2005 @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(ArrayListCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java Mon Jun 27 15:49:40 2005 @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(CollectionCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java Mon Jun 27 15:49:40 2005 @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfBigDecimal.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java Mon Jun 27 15:49:40 2005 @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfBigInteger.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java Mon Jun 27 15:49:40 2005 @@ -52,7 +52,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfBoolean.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java Mon Jun 27 15:49:40 2005 @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfByte.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java Mon Jun 27 15:49:40 2005 @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfCharacter.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java Mon Jun 27 15:49:40 2005 @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfDate.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java Mon Jun 27 15:49:40 2005 @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfDouble.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java Mon Jun 27 15:49:40 2005 @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfFloat.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java Mon Jun 27 15:49:40 2005 @@ -52,7 +52,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfInteger.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java Mon Jun 27 15:49:40 2005 @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfLocale.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java Mon Jun 27 15:49:40 2005 @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfLong.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java Mon Jun 27 15:49:40 2005 @@ -55,7 +55,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfObject.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java Mon Jun 27 15:49:40 2005 @@ -50,7 +50,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitiveboolean.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java Mon Jun 27 15:49:40 2005 @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivebyte.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java Mon Jun 27 15:49:40 2005 @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivechar.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java Mon Jun 27 15:49:40 2005 @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivedouble.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java Mon Jun 27 15:49:40 2005 @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivefloat.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java Mon Jun 27 15:49:40 2005 @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitiveint.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java Mon Jun 27 15:49:40 2005 @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivelong.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java Mon Jun 27 15:49:40 2005 @@ -50,7 +50,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitiveshort.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java Mon Jun 27 15:49:40 2005 @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfShort.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java Mon Jun 27 15:49:40 2005 @@ -52,7 +52,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfSimpleClass.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java Mon Jun 27 15:49:40 2005 @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfSimpleInterface.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java Mon Jun 27 15:49:40 2005 @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfString.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java Mon Jun 27 15:49:40 2005 @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashMapStringKeyCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java Mon Jun 27 15:49:40 2005 @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashMapStringValueCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java Mon Jun 27 15:49:40 2005 @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashSetCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java Mon Jun 27 15:49:40 2005 @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashtableStringKeyCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java Mon Jun 27 15:49:40 2005 @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashtableStringValueCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java Mon Jun 27 15:49:40 2005 @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(LinkedListCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java Mon Jun 27 15:49:40 2005 @@ -59,7 +59,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(ListCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java Mon Jun 27 15:49:40 2005 @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(MapStringKeyCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java Mon Jun 27 15:49:40 2005 @@ -58,7 +58,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(MapStringValueCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java Mon Jun 27 15:49:40 2005 @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(SetCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java Mon Jun 27 15:49:40 2005 @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(TreeMapStringKeyCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java Mon Jun 27 15:49:40 2005 @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(TreeMapStringValueCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java Mon Jun 27 15:49:40 2005 @@ -61,7 +61,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(TreeSetCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java Mon Jun 27 15:49:40 2005 @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(VectorCollections.class); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java Mon Jun 27 15:49:40 2005 @@ -25,6 +25,7 @@ import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.inheritance.Constants; import org.apache.jdo.tck.pc.inheritance.FieldSameName4; import org.apache.jdo.tck.util.BatchTestRunner; @@ -59,6 +60,13 @@ BatchTestRunner.run(FieldWithSameNameInSuperclass.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(FieldSameName4.class); + } + /** */ public void test() { pm = getPM(); @@ -76,9 +84,6 @@ try { t.setRestoreValues(true); - t.begin(); - removeAllInstances(pm); // always start fresh with no instances - t.commit(); t.begin(); FieldSameName4 refa = new FieldSameName4(Constants.intA_V[1], Constants.doubleB_V[1], Constants.intB_V[1], Constants.charC_V[1], Constants.booleanD_V[1], Constants.floatE_V[1], Constants.shortF_V[1], Constants.shortG_V[1], Constants.intH_V[1]); pm.makePersistent(refa); Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java?rev=202089&r1=202088&r2=202089&view=diff ============================================================================== --- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java (original) +++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java Mon Jun 27 15:49:40 2005 @@ -23,6 +23,7 @@ import javax.jdo.PersistenceManager; import javax.jdo.Transaction; +import org.apache.jdo.tck.JDO_Test; import org.apache.jdo.tck.pc.inheritance.AllPersist4; import org.apache.jdo.tck.pc.inheritance.Constants; import org.apache.jdo.tck.util.BatchTestRunner; @@ -55,6 +56,13 @@ BatchTestRunner.run(NonPersistentFieldsAreNonPersistentInSubclasses.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(AllPersist4.class); + } + /** */ public void test() { pm = getPM(); @@ -72,9 +80,6 @@ try { t.setRestoreValues(true); - t.begin(); - removeAllInstances(pm); // always start fresh with no instances - t.commit(); t.begin(); // create new objects and make persistent AllPersist4 c = new AllPersist4(Constants.intA_V[8], Constants.doubleB_V[8], Constants.intB_V[8], Constants.charC_V[8], Constants.booleanD_V[8], Constants.floatE_V[8], Constants.shortF_V[8], Constants.shortG_V[8], Constants.intH_V[8]);