db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [db-jdo] 21/43: JDO-375: obtain tearDown classes from correct reader + fix list of tearDown classes in CompanyFactoryPMClass
Date Fri, 07 May 2021 23:12:03 GMT
This is an automated email from the ASF dual-hosted git repository.

clr pushed a commit to branch origin/2.0.1
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit d5945031615bbc3dcc32c10f17da31b2417a59d2
Author: Michael Bouschen <mbo@apache.org>
AuthorDate: Sun Apr 30 14:59:20 2006 +0000

    JDO-375: obtain tearDown classes from correct reader + fix list of tearDown classes in
CompanyFactoryPMClass
---
 .../java/org/apache/jdo/tck/mapping/CompletenessTest.java   | 13 +++++--------
 .../apache/jdo/tck/pc/company/CompanyFactoryPMClass.java    |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java b/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
index de9d90f..1137d2a 100644
--- a/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
+++ b/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
@@ -49,9 +49,6 @@ public class CompletenessTest extends JDO_Test {
     private final boolean isTestToBePerformed = isTestToBePerformed();
 
     /** */
-    private CompanyModelReader reader;
-    
-    /** */
     protected List rootOids;
     
     /** */
@@ -71,14 +68,10 @@ public class CompletenessTest extends JDO_Test {
      */
     protected void localSetUp() {
         if (isTestToBePerformed) {
-            // register the default factory
-            CompanyFactoryRegistry.registerFactory();
-            // get new obj graph to compare persistent graph with
-            reader = new CompanyModelReader(inputFilename);
-            addTearDownClass(reader.getTearDownClassesFromFactory());
             getPM();
             CompanyFactoryRegistry.registerFactory(pm);
             CompanyModelReader reader = new CompanyModelReader(inputFilename);
+            addTearDownClass(reader.getTearDownClassesFromFactory());
             // persist test data
             pm.currentTransaction().begin();
             List rootList = reader.getRootList();
@@ -96,6 +89,10 @@ public class CompletenessTest extends JDO_Test {
     /** */
     public void test() {
         if (isTestToBePerformed) {
+            // register the default factory
+            CompanyFactoryRegistry.registerFactory();
+            // get new obj graph to compare persistent graph with
+            CompanyModelReader reader = new CompanyModelReader(inputFilename);
             List rootList = reader.getRootList();
             
             getPM();
diff --git a/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java b/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
index a54113e..fb5accc 100644
--- a/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
+++ b/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
@@ -29,7 +29,7 @@ public class CompanyFactoryPMClass
     
     /** */
     public static final Class[] tearDownClasses = new Class[] {
-        DentalInsurance.class, IMedicalInsurance.class,
+        DentalInsurance.class, MedicalInsurance.class,
         Person.class, Employee.class, 
         PartTimeEmployee.class, FullTimeEmployee.class,  
         Project.class, Department.class, Company.class

Mime
View raw message