db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r398354 - in /db/jdo: branches/2.0/tck20/src/java/org/apache/jdo/tck/mapping/ branches/2.0/tck20/src/java/org/apache/jdo/tck/pc/company/ trunk/tck20/src/java/org/apache/jdo/tck/mapping/ trunk/tck20/src/java/org/apache/jdo/tck/pc/company/
Date Sun, 30 Apr 2006 14:59:21 GMT
Author: mbo
Date: Sun Apr 30 07:59:20 2006
New Revision: 398354

URL: http://svn.apache.org/viewcvs?rev=398354&view=rev
Log:
JDO-375: obtain tearDown classes from correct reader + fix list of tearDown classes in CompanyFactoryPMClass

Modified:
    db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
    db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java

Modified: db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
URL: http://svn.apache.org/viewcvs/db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java?rev=398354&r1=398353&r2=398354&view=diff
==============================================================================
--- db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java (original)
+++ db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java Sun
Apr 30 07:59:20 2006
@@ -49,9 +49,6 @@
     private final boolean isTestToBePerformed = isTestToBePerformed();
 
     /** */
-    private CompanyModelReader reader;
-    
-    /** */
     protected List rootOids;
     
     /** */
@@ -71,14 +68,10 @@
      */
     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 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();

Modified: db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
URL: http://svn.apache.org/viewcvs/db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java?rev=398354&r1=398353&r2=398354&view=diff
==============================================================================
--- db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
(original)
+++ db/jdo/branches/2.0/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
Sun Apr 30 07:59:20 2006
@@ -29,7 +29,7 @@
     
     /** */
     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

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java?rev=398354&r1=398353&r2=398354&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/mapping/CompletenessTest.java Sun Apr 30
07:59:20 2006
@@ -49,9 +49,6 @@
     private final boolean isTestToBePerformed = isTestToBePerformed();
 
     /** */
-    private CompanyModelReader reader;
-    
-    /** */
     protected List rootOids;
     
     /** */
@@ -71,14 +68,10 @@
      */
     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 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();

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java?rev=398354&r1=398353&r2=398354&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java Sun
Apr 30 07:59:20 2006
@@ -29,7 +29,7 @@
     
     /** */
     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