Return-Path: Delivered-To: apmail-db-jdo-dev-archive@www.apache.org Received: (qmail 51463 invoked from network); 27 Jun 2005 16:24:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Jun 2005 16:24:12 -0000 Received: (qmail 66524 invoked by uid 500); 27 Jun 2005 16:24:11 -0000 Mailing-List: contact jdo-dev-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-dev@db.apache.org Received: (qmail 66511 invoked by uid 99); 27 Jun 2005 16:24:11 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2005 09:24:11 -0700 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [62.154.194.149] (HELO miraculix.spree.de) (62.154.194.149) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2005 09:24:08 -0700 Received: from [172.16.1.19] (rio.spree.de [172.16.1.19]) by miraculix.spree.de (8.11.6/8.11.6) with ESMTP id j5RGNwv13976 for ; Mon, 27 Jun 2005 18:23:58 +0200 Message-ID: <42C0296F.8090706@spree.de> Date: Mon, 27 Jun 2005 18:29:35 +0200 From: Michael Watzek Organization: Tech@Spree GmbH User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: jdo-dev@db.apache.org Subject: Patch for adding tear down classes Content-Type: multipart/mixed; boundary="------------040701050901030104020306" X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N --------------040701050901030104020306 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, please find the patch for adding tear down classes attached. The background of this patch is a duplicate error that several test cases threw. This patch adds tear down classes to all test cases which create persistent objects. Furthermore, this patch fixes some tests that added tear down instances. Those tests added transient instances: The instances were added before makePersistent was called. In this case, the current implementation of all tear down methods is silent. Should we change the implementation in order to throw an exception? Please note that the attached patch does not change tear down methods. Regards, Michael -- ------------------------------------------------------------------- Michael Watzek Tech@Spree Engineering GmbH mailto:mwa.tech@spree.de Buelowstr. 66 Tel.: ++49/30/235 520 36 10783 Berlin - Germany Fax.: ++49/30/217 520 12 http://www.spree.de/ ------------------------------------------------------------------- --------------040701050901030104020306 Content-Type: text/plain; name="CleanUp.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="CleanUp.patch" Index: test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java =================================================================== --- test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java (revision 202004) +++ test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java (working copy) @@ -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; } Index: test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java =================================================================== --- test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java (revision 202004) +++ test/java/org/apache/jdo/tck/lifecycle/nontransactional/ModificationOfNontransactionalInstanceOutsideTransaction.java (working copy) @@ -70,6 +70,13 @@ */ private int originalValue; + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(StateTransitionObj.class); + } + /** */ public void testDifferentPM() { if (!isNontransactionalWriteSupported()) { Index: test/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java =================================================================== --- test/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java (revision 202004) +++ test/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java (working copy) @@ -44,9 +44,18 @@ Address.class, Company.class, DentalInsurance.class, Department.class, Employee.class, FullTimeEmployee.class, Insurance.class, - MedicalInsurance.class, Person.class, Project.class + MedicalInsurance.class, PartTimeEmployee.class, Person.class, + Project.class }; + /** All classes in the model + */ + private static final Class[] tearDownClasses = new Class[] { + DentalInsurance.class, MedicalInsurance.class, + Person.class, Employee.class, PartTimeEmployee.class, FullTimeEmployee.class, + Project.class, Department.class, Company.class + }; + /** * Create a CompanyModelReader for the specified resourceName. * @param resourceName the name of the resource @@ -225,5 +234,11 @@ return allClasses; } + /** + * @return Returns the tearDownClasses. + */ + public Class[] getTearDownClasses() { + return tearDownClasses; + } } Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java (working copy) @@ -58,7 +58,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(MapStringValueCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java (working copy) @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(LinkedListCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java (working copy) @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(VectorCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java (working copy) @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivelong.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java (working copy) @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivebyte.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java (working copy) @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfCharacter.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java (working copy) @@ -59,7 +59,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(ListCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java (working copy) @@ -61,7 +61,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(TreeSetCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java (working copy) @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfLocale.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java (working copy) @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(MapStringKeyCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java (working copy) @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashtableStringValueCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java (working copy) @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivedouble.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java (working copy) @@ -55,7 +55,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfObject.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java (working copy) @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfString.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java (working copy) @@ -50,7 +50,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitiveboolean.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java (working copy) @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfDate.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java (working copy) @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashtableStringKeyCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java (working copy) @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(SetCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java (working copy) @@ -52,7 +52,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfBoolean.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java (working copy) @@ -52,7 +52,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfSimpleClass.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java (working copy) @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfBigInteger.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java (working copy) @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitiveint.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java (working copy) @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashMapStringValueCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java (working copy) @@ -50,7 +50,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitiveshort.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java (working copy) @@ -52,7 +52,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfInteger.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java (working copy) @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(ArrayListCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java (working copy) @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivefloat.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java (working copy) @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfLong.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java (working copy) @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfShort.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java (working copy) @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(ArrayCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java (working copy) @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfByte.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java (working copy) @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashMapStringKeyCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java (working copy) @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(TreeMapStringValueCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java (working copy) @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfFloat.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java (working copy) @@ -51,7 +51,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfPrimitivechar.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java (working copy) @@ -53,7 +53,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfDouble.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java (working copy) @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfSimpleInterface.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java (working copy) @@ -56,7 +56,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(CollectionCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java (working copy) @@ -54,7 +54,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(FieldsOfBigDecimal.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java (working copy) @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(TreeMapStringKeyCollections.class); Index: test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java =================================================================== --- test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java (working copy) @@ -57,7 +57,7 @@ } /** - * @see JDO_Test#addTearDownClass(Class) + * @see JDO_Test#localSetUp() */ protected void localSetUp() { addTearDownClass(HashSetCollections.class); Index: test/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java =================================================================== --- test/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java (working copy) @@ -24,6 +24,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; @@ -56,6 +57,13 @@ BatchTestRunner.run(PersistentFieldsArePersistentInSubClasses.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(AllPersist4.class); + } + /** */ public void test() { pm = getPM(); @@ -74,9 +82,6 @@ t.setRestoreValues(true); t.begin(); - removeAllInstances(pm); // always start fresh with no instances - t.commit(); - t.begin(); AllPersist4 refa = new AllPersist4(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); Object objPtrA = pm.getObjectId (refa); Index: test/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java =================================================================== --- test/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java (working copy) @@ -24,6 +24,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.TopNonPersistH; import org.apache.jdo.tck.util.BatchTestRunner; @@ -55,6 +56,13 @@ BatchTestRunner.run(NonpersistentSuperClass.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(TopNonPersistH.class); + } + /** */ public void test() { pm = getPM(); @@ -73,9 +81,6 @@ t.setRestoreValues(true); t.begin(); - removeAllInstances(pm); // always start fresh with no instances - t.commit(); - t.begin(); TopNonPersistH refa = new TopNonPersistH(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); Object objPtrA = pm.getObjectId(refa); Index: test/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java =================================================================== --- test/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java (working copy) @@ -24,8 +24,8 @@ 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.TopNonPersistH; import org.apache.jdo.tck.pc.inheritance.TopPersistH; import org.apache.jdo.tck.util.BatchTestRunner; @@ -59,6 +59,13 @@ BatchTestRunner.run(PersistenceCapableFlexibilityInInheritanceHierarchy.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(TopPersistH.class); + } + /** */ public void test() { pm = getPM(); @@ -77,9 +84,6 @@ t.setRestoreValues(true); t.begin(); - removeAllInstances(pm); // always start fresh with no instances - t.commit(); - t.begin(); TopPersistH refa = new TopPersistH(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); Object objPtrA = pm.getObjectId(refa); @@ -218,7 +222,7 @@ void removeAllInstances(PersistenceManager pm) { - Extent e = pm.getExtent(TopNonPersistH.class, true); + Extent e = pm.getExtent(TopPersistH.class, true); Iterator i = e.iterator(); while( i.hasNext() ){ pm.deletePersistent(i.next()); Index: test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java =================================================================== --- test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java (working copy) @@ -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(); @@ -77,9 +85,6 @@ 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); Object objPtrA = pm.getObjectId (refa); Index: test/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java =================================================================== --- test/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java (working copy) @@ -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(TransactionalFieldsAreTransactionalInSubclasses.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(AllPersist4.class); + } + /** */ public void test() { pm = getPM(); @@ -73,9 +81,6 @@ 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]); AllPersist4 d = new AllPersist4(Constants.intA_V[9], Constants.doubleB_V[9], Constants.intB_V[9], Constants.charC_V[9], Constants.booleanD_V[9], Constants.floatE_V[9], Constants.shortF_V[9], Constants.shortG_V[9], Constants.intH_V[9]); Index: test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java =================================================================== --- test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java (working copy) @@ -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(); @@ -73,9 +81,6 @@ 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]); AllPersist4 d = new AllPersist4(Constants.intA_V[9], Constants.doubleB_V[9], Constants.intB_V[9], Constants.charC_V[9], Constants.booleanD_V[9], Constants.floatE_V[9], Constants.shortF_V[9], Constants.shortG_V[9], Constants.intH_V[9]); Index: test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java =================================================================== --- test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java (revision 202004) +++ test/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java (working copy) @@ -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.Address; import org.apache.jdo.tck.pc.company.Company; -import org.apache.jdo.tck.pc.company.Address; 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(); Index: test/java/org/apache/jdo/tck/query/QueryTest.java =================================================================== --- test/java/org/apache/jdo/tck/query/QueryTest.java (revision 202004) +++ test/java/org/apache/jdo/tck/query/QueryTest.java (working copy) @@ -25,9 +25,9 @@ import java.util.List; import java.util.Map; -import javax.jdo.PersistenceManager; import javax.jdo.Extent; import javax.jdo.JDOFatalInternalException; +import javax.jdo.PersistenceManager; import javax.jdo.Query; import javax.jdo.Transaction; @@ -54,6 +54,13 @@ // Helper methods to create persistent PCPoint instances + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void initDatabase(PersistenceManager pm, Class cls){ cleanupDatabase(pm, cls); Index: test/java/org/apache/jdo/tck/query/IgnoreCacheFalse.java =================================================================== --- test/java/org/apache/jdo/tck/query/IgnoreCacheFalse.java (revision 202004) +++ test/java/org/apache/jdo/tck/query/IgnoreCacheFalse.java (working copy) @@ -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.mylib.PrimitiveTypes; import org.apache.jdo.tck.util.BatchTestRunner; @@ -60,6 +61,14 @@ BatchTestRunner.run(IgnoreCacheFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + super.localSetUp(); + addTearDownClass(PrimitiveTypes.class); + } + /** */ public void test() { pm = getPM(); @@ -73,7 +82,6 @@ runTestModifiedInstance(pm); } finally { - cleanupDatabase(pm, PrimitiveTypes.class); pm.close(); pm = null; } Index: test/java/org/apache/jdo/tck/transactions/GetSynchronization.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/GetSynchronization.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/GetSynchronization.java (working copy) @@ -64,6 +64,13 @@ BatchTestRunner.run(GetSynchronization.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void beforeCompletion(){ try { @@ -106,7 +113,6 @@ try { tx.begin(); PCPoint p1 = new PCPoint(1,3); - addTearDownInstance((Object)p1); pm.makePersistent(p1); tx.setSynchronization(this); Index: test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java (working copy) @@ -68,6 +68,13 @@ BatchTestRunner.run(BeforeCompletionMethodCalled.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void test() { pm = getPM(); Index: test/java/org/apache/jdo/tck/transactions/WhenNontransactionalReadIsFalse.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/WhenNontransactionalReadIsFalse.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/WhenNontransactionalReadIsFalse.java (working copy) @@ -65,6 +65,14 @@ BatchTestRunner.run(WhenNontransactionalReadIsFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(Department.class); + addTearDownClass(Company.class); + } + /** */ public void test() { pm = getPM(); @@ -83,8 +91,6 @@ tx.begin(); Company c = new Company(1L, "MyCompany", new Date(), null); Department d = new Department(999, "MyDepartment", c); - addTearDownInstance((Object)c); - addTearDownInstance((Object)d); pm.makePersistent(c); pm.makePersistent(d); Index: test/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java (working copy) @@ -63,6 +63,13 @@ BatchTestRunner.run(IsActiveUntilAfterCompletionMethodCalled.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void beforeCompletion() { try { @@ -107,7 +114,6 @@ try { tx.begin(); PCPoint p1 = new PCPoint(1,3); - addTearDownInstance((Object)p1); pm.makePersistent(p1); tx.setSynchronization(this); if (!tx.isActive()) { Index: test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java (working copy) @@ -67,6 +67,13 @@ BatchTestRunner.run(AfterCompletionMethodCalledWhenRolledback.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void test() { pm = getPM(); Index: test/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java (working copy) @@ -59,6 +59,13 @@ BatchTestRunner.run(GetPersistenceManager.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void test() { pm = getPM(); @@ -75,7 +82,6 @@ try { tx.begin(); PCPoint p1 = new PCPoint(1,3); - addTearDownInstance((Object)p1); pm.makePersistent(p1); PersistenceManager pm1 = tx.getPersistenceManager(); tx.commit(); Index: test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java (working copy) @@ -64,6 +64,13 @@ BatchTestRunner.run(BeforeCompletionMethodNotCalledBeforeRollback.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void test() { pm = getPM(); Index: test/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java (working copy) @@ -67,6 +67,14 @@ BatchTestRunner.run(SetNontransactionalRead.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(Department.class); + addTearDownClass(Company.class); + } + /** */ public void test() { pm = getPM(); @@ -91,8 +99,6 @@ tx.begin(); Company c = new Company(1L, "MyCompany", new Date(), null); Department d = new Department(999, "MyDepartment", c); - addTearDownInstance((Object)c); - addTearDownInstance((Object)d); pm.makePersistent(c); pm.makePersistent(d); Object oid = pm.getObjectId(d); Index: test/java/org/apache/jdo/tck/transactions/Commit.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/Commit.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/Commit.java (working copy) @@ -75,6 +75,13 @@ BatchTestRunner.run(Commit.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void test() { pm = getPM(); @@ -110,7 +117,6 @@ try { tx.begin(); PCPoint p1 = new PCPoint(1,3); - addTearDownInstance((Object)p1); pm.makePersistent(p1); if (!JDOHelper.isDirty(p1)) { fail(ASSERTION_FAILED, Index: test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java (working copy) @@ -18,7 +18,6 @@ import javax.jdo.PersistenceManager; import javax.jdo.Transaction; - import javax.transaction.Status; import javax.transaction.Synchronization; @@ -67,6 +66,13 @@ BatchTestRunner.run(AfterCompletionMethodCalledWhenCommitted.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void test() { pm = getPM(); Index: test/java/org/apache/jdo/tck/transactions/Rollback.java =================================================================== --- test/java/org/apache/jdo/tck/transactions/Rollback.java (revision 202004) +++ test/java/org/apache/jdo/tck/transactions/Rollback.java (working copy) @@ -76,6 +76,13 @@ BatchTestRunner.run(BoundParameterCheck.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /** */ public void beforeCompletion(){ beforeCompletionCalled = true; @@ -111,7 +118,6 @@ try { tx.begin(); PCPoint p1 = new PCPoint(1,3); - addTearDownInstance((Object)p1); pm.makePersistent(p1); tx.commit(); Index: test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java (working copy) @@ -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 Index: test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java (working copy) @@ -52,7 +52,6 @@ pm.makePersistent(p1); Object oid = pm.getObjectId(p1); tx.commit(); - addTearDownInstance(p1); return oid; } Index: test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java (working copy) @@ -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; @@ -60,6 +60,14 @@ BatchTestRunner.run(EvictingWithRetainValuesFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + super.localSetUp(); + addTearDownClass(PCPoint2.class); + } + /** */ public void test() { Index: test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java (working copy) @@ -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; @@ -60,6 +60,14 @@ BatchTestRunner.run(EvictingWithRestoreValuesFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + super.localSetUp(); + addTearDownClass(PCPoint2.class); + } + /** */ public void test() { pm = getPM(); Index: test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java (working copy) @@ -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; @@ -63,6 +64,14 @@ private PCPoint2 p1 = null; private PCPoint2 p2 = null; + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + super.localSetUp(); + addTearDownClass(PCPoint2.class); + } + /** */ public void testEvictingCollectionOfInstancesSideEffects() { pm = getPM(); Index: test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java (working copy) @@ -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; Index: test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java (working copy) @@ -16,20 +16,19 @@ package org.apache.jdo.tck.api.persistencemanager.extent; +import java.util.Date; 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.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.FullTimeEmployee; import org.apache.jdo.tck.pc.company.PartTimeEmployee; -import org.apache.jdo.tck.pc.company.FullTimeEmployee; - +import org.apache.jdo.tck.pc.company.Person; import org.apache.jdo.tck.util.BatchTestRunner; /** @@ -58,6 +57,16 @@ BatchTestRunner.run(GetExtentWithSubclasses.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(FullTimeEmployee.class); + addTearDownClass(PartTimeEmployee.class); + addTearDownClass(Person.class); + super.localSetUp(); + } + /** */ public void test() { pm = getPM(); Index: test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java (working copy) @@ -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(); Index: test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java (working copy) @@ -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(); Index: test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java (working copy) @@ -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. Index: test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java (working copy) @@ -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(); Index: test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java (working copy) @@ -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(); Index: test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java (working copy) @@ -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(); Index: test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java (working copy) @@ -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 Index: test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java =================================================================== --- test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java (working copy) @@ -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 Index: test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java (working copy) @@ -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.Address; import org.apache.jdo.tck.pc.company.Company; -import org.apache.jdo.tck.pc.company.Address; import org.apache.jdo.tck.util.BatchTestRunner; /** @@ -55,6 +54,13 @@ BatchTestRunner.run(GetPersistenceManagerFactoryByPropertiesInstance.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(Company.class); + } + /** */ public void test() { PMFPropertiesObject = loadProperties(PMFProperties); Index: test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java =================================================================== --- test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java (working copy) @@ -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; Index: test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java (working copy) @@ -57,6 +57,13 @@ BatchTestRunner.run(GetTransactionalObjectId.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.getTransactionalObjectId(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java (working copy) @@ -58,6 +58,13 @@ BatchTestRunner.run(IsDeletedFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isDeleted(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java (working copy) @@ -56,6 +56,13 @@ BatchTestRunner.run(IsDirty.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isDeleted(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java (working copy) @@ -56,6 +56,13 @@ BatchTestRunner.run(IsPersistent.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isPersistent(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java (working copy) @@ -56,6 +56,13 @@ BatchTestRunner.run(IsDirtyFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isDirty(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java (working copy) @@ -57,6 +57,13 @@ BatchTestRunner.run(IsDeleted.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test jdohelper.isDeleted(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java (working copy) @@ -55,6 +55,13 @@ BatchTestRunner.run(IsTransactionalFalse.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.IsTransactionalFalse(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java (working copy) @@ -59,6 +59,13 @@ BatchTestRunner.run(GetPersistenceManager.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test jdohelper.getPersistenceManager(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java (working copy) @@ -57,6 +57,13 @@ BatchTestRunner.run(GetObjectId.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.getObjectId(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsNew.java (working copy) @@ -56,6 +56,13 @@ BatchTestRunner.run(IsNew.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.isNew(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java (working copy) @@ -56,6 +56,13 @@ BatchTestRunner.run(MakeDirty.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.MakeDirty(Object pc) * */ Index: test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java =================================================================== --- test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java (revision 202004) +++ test/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java (working copy) @@ -55,6 +55,13 @@ BatchTestRunner.run(IsTransactional.class); } + /** + * @see JDO_Test#localSetUp() + */ + protected void localSetUp() { + addTearDownClass(PCPoint.class); + } + /* test JDOHelper.IsTransactional(Object pc) * */ Index: test/java/org/apache/jdo/tck/extents/ExtentTest.java =================================================================== --- test/java/org/apache/jdo/tck/extents/ExtentTest.java (revision 202004) +++ test/java/org/apache/jdo/tck/extents/ExtentTest.java (working copy) @@ -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; @@ -52,6 +52,20 @@ 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() { if (PMFProperties == null) Index: test/java/org/apache/jdo/tck/mapping/CompletenessTest.java =================================================================== --- test/java/org/apache/jdo/tck/mapping/CompletenessTest.java (revision 202004) +++ test/java/org/apache/jdo/tck/mapping/CompletenessTest.java (working copy) @@ -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() { --------------040701050901030104020306--