JDO-375: obtain tearDown classes from correct reader + fix list of tearDown classes in CompanyFactoryPMClass
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 @@
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();
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 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
