db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r219063 - in /incubator/jdo/trunk/tck20/test: java/org/apache/jdo/tck/mapping/ java/org/apache/jdo/tck/pc/company/ java/org/apache/jdo/tck/query/ java/org/apache/jdo/tck/query/operators/ testdata/org/apache/jdo/tck/pc/company/
Date Thu, 14 Jul 2005 17:11:19 GMT
Author: mcaisse
Date: Thu Jul 14 10:11:15 2005
New Revision: 219063

URL: http://svn.apache.org/viewcvs?rev=219063&view=rev
Log:
JDO-69 and other issues: add a root object to the completeness test. Submitted by Michael Bouschen

Modified:
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Address.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/DentalInsurance.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Department.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Insurance.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Project.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SetterReplacePreviousValues.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/company.xml
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml

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=219063&r1=219062&r2=219063&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 Thu Jul 14 10:11:15 2005
@@ -16,10 +16,15 @@
 
 package org.apache.jdo.tck.mapping;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.jdo.tck.JDO_Test;
 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.DeepEquality;
 import org.apache.jdo.tck.util.EqualityHelper;
 
 //import org.springframework.beans.factory.xml.XmlBeanFactory;
@@ -40,7 +45,11 @@
     private static final String ASSERTION_FAILED = 
         "Assertion A18-[not identified] failed: ";
     
-    protected Object rootOid;
+    /** */
+    public static final String ROOT_NAME = "root";
+    
+    /** */
+    protected List rootOids;
     
         // todo: get filename from property
     protected String inputFilename = "org/apache/jdo/tck/pc/company/companyNoRelationships.xml";
@@ -59,13 +68,17 @@
      */
     protected void localSetUp() {
         CompanyModelReader reader = new CompanyModelReader(inputFilename);
-            // persist test data
+        // persist test data
         getPM();
         pm.currentTransaction().begin();
-        Object root = reader.getCompany("company1");
-        pm.makePersistent(root);
+        List rootList = (List)reader.getBean(ROOT_NAME);
+        pm.makePersistentAll(rootList);
         addTearDownClass(reader.getTearDownClasses());
-        rootOid = pm.getObjectId(root);
+        rootOids = new ArrayList();
+        for (Iterator i = rootList.iterator(); i.hasNext(); ) {
+            Object pc = i.next();
+            rootOids.add(pm.getObjectId(pc));
+        }
         pm.currentTransaction().commit();
         cleanupPM();
     }
@@ -75,15 +88,29 @@
         
         // get new obj graph
         CompanyModelReader reader = new CompanyModelReader(inputFilename);
-        Company companyExpected = reader.getCompany("company1");
-
+        List rootList = (List)reader.getBean(ROOT_NAME);
+        
         getPM();
         pm.currentTransaction().begin();
         // compare persisted and new
-        if (!companyExpected.deepCompareFields(
-            (Company)pm.getObjectById(rootOid), new EqualityHelper())) {
-            fail("Persistent company not equal to expected company");
+        int size = rootList.size();
+        StringBuffer msg = new StringBuffer();
+        for (int i = 0; i < size; i++) {
+            DeepEquality expected = (DeepEquality) rootList.get(i);
+            Object oid = rootOids.get(i);
+            DeepEquality persisted = (DeepEquality) pm.getObjectById(oid);
+            if (!expected.deepCompareFields(persisted, new EqualityHelper())) {
+                if (msg.length() > 0) {
+                    msg.append("\n");
+                }
+                msg.append("  Persistent instance " + persisted + 
+                           " not equal to expected instance " + expected);
+            }
         }
         pm.currentTransaction().commit();
+        // fail test if at least one of the instances is not the expected one
+        if (msg.length() > 0) {
+            fail("CompletenessTest failed; see list of failed instances below:", msg.toString());
+        }
     }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Address.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Address.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Address.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Address.java Thu Jul 14 10:11:15 2005
@@ -145,6 +145,29 @@
         this.country = country;
     }
 
+    /**
+     * Returns a String representation of a <code>Adress</code> object.
+     * @return a String representation of a <code>Adress</code> object.
+     */
+    public String toString() {
+        return "Adress(" + getFieldRepr() + ")";
+    }
+    
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(addrid);
+        rc.append(", street ").append(street);
+        rc.append(", city ").append(city);
+        rc.append(", state ").append(state);
+        rc.append(", zipcode ").append(zipcode);
+        rc.append(", country ").append(country);
+        return rc.toString();
+    }
+
     /** 
      * Returns <code>true</code> if all the fields of this instance are
      * deep equal to the coresponding fields of the specified Person.

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Company.java Thu Jul 14 10:11:15 2005
@@ -20,6 +20,8 @@
 import java.io.ObjectInputStream;
 import java.io.IOException;
 
+import java.text.SimpleDateFormat;
+
 import java.util.Collections;
 import java.util.Set;
 import java.util.HashSet;
@@ -40,6 +42,9 @@
     private Address     address;
     private transient Set departments = new HashSet(); // element type is Department
 
+    protected static SimpleDateFormat formatter =
+        new SimpleDateFormat("d/MMM/yyyy");
+
     /** This is the JDO-required no-args constructor */
     protected Company() {}
 
@@ -175,6 +180,26 @@
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         departments = new HashSet();
+    }
+
+    /**
+     * Returns a String representation of a <code>Company</code> object.
+     * @return a String representation of a <code>Company</code> object.
+     */
+    public String toString() {
+        return "Company(" + getFieldRepr()+ ")";
+    }
+    
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(companyid);
+        rc.append(", name ").append(name);
+        rc.append(", founded ").append(formatter.format(founded));
+        return rc.toString();
     }
 
     /** 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/DentalInsurance.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/DentalInsurance.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/DentalInsurance.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/DentalInsurance.java Thu Jul 14 10:11:15 2005
@@ -73,6 +73,27 @@
         this.lifetimeOrthoBenefit = lifetimeOrthoBenefit;
     }
 
+    /**
+     * Returns a String representation of a <code>DentalInsurance</code>
+     * object.
+     * @return a String representation of a <code>DentalInsurance</code>
+     * object.
+     */
+    public String toString() {
+        return "DentalInsurance(" + getFieldRepr()+ ")";
+    }
+
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(super.getFieldRepr());
+        rc.append(", lifetimeOrthoBenefit ").append(lifetimeOrthoBenefit);
+        return rc.toString();
+    }
+
     /** 
      * Returns <code>true</code> if all the fields of this instance are
      * deep equal to the coresponding fields of the specified Person.

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Department.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Department.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Department.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Department.java Thu Jul 14 10:11:15 2005
@@ -240,6 +240,25 @@
             helper.deepEquals(fundedEmps, otherDept.fundedEmps);
     }
     
+    /**
+     * Returns a String representation of a <code>Department</code> object.
+     * @return a String representation of a <code>Department</code> object.
+     */
+    public String toString() {
+        return "Department(" + getFieldRepr()+ ")";
+    }
+
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(deptid);
+        rc.append(", name ").append(name);
+        return rc.toString();
+    }
+
     /** 
      * Compares this object with the specified object for order. Returns a
      * negative integer, zero, or a positive integer as this object is less

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Employee.java Thu Jul 14 10:11:15 2005
@@ -418,6 +418,26 @@
         hradvisees = new HashSet();
     }
 
+    /**
+     * Return a String representation of a <code>Employee</code> object.
+     * @return a String representation of a <code>Employee</code> object.
+     */
+    public String toString() {
+        return "Employee(" + getFieldRepr() + ")";
+    }
+
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(super.getFieldRepr());
+        rc.append(", hired ").append(formatter.format(hiredate));
+        rc.append(", weeklyhours ").append(weeklyhours);
+        return rc.toString();
+    }
+
     /** 
      * Returns <code>true</code> if all the fields of this instance are
      * deep equal to the corresponding fields of the specified Employee.

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java Thu Jul 14 10:11:15 2005
@@ -82,11 +82,22 @@
         this.salary = salary;
     }
     
-    /** */
+    /**
+     * Return a String representation of a <code>FullTimeEmployee</code> object.
+     * @return a String representation of a <code>FullTimeEmployee</code> object.
+     */
     public String toString() {
-        StringBuffer rc = new StringBuffer("FullTimeEmployee: ");
-        rc.append(super.toString());
-        rc.append(" $" + salary);
+        return "FullTimeEmployee(" + getFieldRepr() + ")";
+    }
+
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    public String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(super.getFieldRepr());
+        rc.append(", $").append(salary);
         return rc.toString();
     }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Insurance.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Insurance.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Insurance.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Insurance.java Thu Jul 14 10:11:15 2005
@@ -105,6 +105,25 @@
         this.employee = employee;
     }
 
+    /**
+     * Returns a String representation of a <code>Insurance</code> object.
+     * @return a String representation of a <code>Insurance</code> object.
+     */
+    public String toString() {
+        return "Insurance(" + getFieldRepr() + ")";
+    }
+
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(insid);
+        rc.append(", carrier ").append(carrier);
+        return rc.toString();
+    }
+
     /** 
      * Returns <code>true</code> if all the fields of this instance are
      * deep equal to the coresponding fields of the specified Person.

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java Thu Jul 14 10:11:15 2005
@@ -76,6 +76,27 @@
     }
 
     /**
+     * Returns a String representation of a <code>MedicalInsurance</code>
+     * object.
+     * @return a String representation of a <code>MedicalInsurance</code>
+     * object.
+     */
+    public String toString() {
+        return "MedicalInsurance(" + getFieldRepr() + ")";
+    }
+
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(super.getFieldRepr());
+        rc.append(", planType ").append(planType);
+        return rc.toString();
+    }
+
+    /**
      * Indicates whether some other object is "deep equal to" this one.
      * @param other the object with which to compare.
      * @param helper EqualityHelper to keep track of instances that have

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java Thu Jul 14 10:11:15 2005
@@ -81,11 +81,22 @@
         this.wage = wage;
     }
 
-    /** */
+    /**
+     * Returns a String representation of a <code>PartTimeEmployee</code> object.
+     * @return a String representation of a <code>PartTimeEmployee</code> object.
+     */
     public String toString() {
-        StringBuffer rc = new StringBuffer("PartTimeEmployee: ");
-        rc.append(super.toString());
-        rc.append(" $" + wage);
+        return "PartTimeEmployee(" + getFieldRepr() + ")";
+    }
+
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    public String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(super.getFieldRepr());
+        rc.append(", $" + wage);
         return rc.toString();
     }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Person.java Thu Jul 14 10:11:15 2005
@@ -232,16 +232,24 @@
     }
 
     /**
-     * Return a String representation of a <code>Person</code> object.
+     * Returns a String representation of a <code>Person</code> object.
+     * @return a string representation of a <code>Person</code> object.
      */
     public String toString() {
-        StringBuffer rc = new StringBuffer("Person: ");
+        return "Person(" + getFieldRepr() + ")";
+    }
+    
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
         rc.append(personid);
-        rc.append(", ");
-        rc.append(lastname);
-        rc.append(", " + firstname);
-        rc.append(", born " + formatter.format(birthdate));
-        rc.append(", phone " + phoneNumbers);
+        rc.append(", ").append(lastname);
+        rc.append(", ").append(firstname);
+        rc.append(", born ").append(formatter.format(birthdate));
+        rc.append(", phone ").append(phoneNumbers);
         return rc.toString();
     }
 

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Project.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Project.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Project.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/company/Project.java Thu Jul 14 10:11:15 2005
@@ -173,6 +173,26 @@
         members = new HashSet();
     }
 
+    /**
+     * Returns a String representation of a <code>Project</code> object.
+     * @return a String representation of a <code>Project</code> object.
+     */
+    public String toString() {
+        return "Project(" + getFieldRepr() + ")";
+    }
+    
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(projid);
+        rc.append(", name ").append(name);
+        rc.append(", budget ").append(budget);
+        return rc.toString();
+    }
+
     /** 
      * Returns <code>true</code> if all the fields of this instance are
      * deep equal to the coresponding fields of the specified Person.

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/Cast.java Thu Jul 14 10:11:15 2005
@@ -61,8 +61,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingCollectionFieldToNull.java Thu Jul 14 10:11:15 2005
@@ -63,8 +63,8 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(
+                pm, "org/apache/jdo/tck/pc/company/companyForQueryTests.xml");
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ComparingPersistentAndNonPersistentInstance.java Thu Jul 14 10:11:15 2005
@@ -61,8 +61,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/DenoteUniquenessInFilter.java Thu Jul 14 10:11:15 2005
@@ -68,8 +68,8 @@
         
         try {
             // read test data
-            CompanyModelReader reader = loadCompanyModel(
-                pm, "org/apache/jdo/tck/query/company.xml", Department.class);
+            CompanyModelReader reader = 
+                loadCompanyModel(pm, COMPANY_TESTDATA, Department.class);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/MultipleIdenticalImports.java Thu Jul 14 10:11:15 2005
@@ -60,8 +60,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughACollectionField.java Thu Jul 14 10:11:15 2005
@@ -61,8 +61,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughANullValuedField.java Thu Jul 14 10:11:15 2005
@@ -64,8 +64,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NavigationThroughReferencesUsesDotOperator.java Thu Jul 14 10:11:15 2005
@@ -61,8 +61,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndContainsMethod.java Thu Jul 14 10:11:15 2005
@@ -62,8 +62,7 @@
                 
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/NullCollectionsAndIsEmpty.java Thu Jul 14 10:11:15 2005
@@ -60,8 +60,7 @@
                 
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/ParameterBoundToDifferentPM.java Thu Jul 14 10:11:15 2005
@@ -61,8 +61,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/QueryTest.java Thu Jul 14 10:11:15 2005
@@ -43,8 +43,15 @@
 
 public abstract class QueryTest extends JDO_Test {
 
-   /** */
+    /** */
     public static final String SERIALZED_QUERY = "query.ser";
+
+    /** */
+    public static final String COMPANY_TESTDATA = 
+        "org/apache/jdo/tck/pc/company/companyForQueryTests.xml";
+
+    /** */
+    public static final String ROOT_NAME = "root";
     
     /** 
      * List of inserted instances (see methods insertPCPoints and
@@ -123,12 +130,9 @@
         CompanyModelReader reader = new CompanyModelReader(filename);
         Transaction tx = pm.currentTransaction();
         tx.begin();
-        String[] names = reader.getBeanDefinitionNames();
-        for (int i = 0; i < names.length; i++) {
-            Object bean = reader.getBean(names[i]);
-            pm.makePersistent(bean);
-            if (debug) logger.debug("inserted " + bean);
-        }
+        List rootList = (List)reader.getBean(ROOT_NAME);
+        pm.makePersistentAll(rootList);
+        if (debug) logger.debug("inserted " + rootList);
         tx.commit();
         tx = null;
         return reader;

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SeparateNamespaceForTypeNames.java Thu Jul 14 10:11:15 2005
@@ -63,8 +63,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SetterReplacePreviousValues.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SetterReplacePreviousValues.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SetterReplacePreviousValues.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SetterReplacePreviousValues.java Thu Jul 14 10:11:15 2005
@@ -61,8 +61,7 @@
                 
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/StartsWithAndEndsWith.java Thu Jul 14 10:11:15 2005
@@ -63,8 +63,7 @@
                 
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/SupportedCollectionMethods.java Thu Jul 14 10:11:15 2005
@@ -64,8 +64,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTestIsEmpty(pm, reader);
             runTestContains(pm, reader);
         }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/company.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/company.xml?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/company.xml (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/company.xml Thu Jul 14 10:11:15 2005
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-    <description>Company instances for query testing</description>
-
-    <bean id="dept1" class="org.apache.jdo.tck.pc.company.Department">
-        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String" ><value>Development</value></constructor-arg>
-        <property name="employees">
-            <set>
-                <ref local="emp1"/>
-                <ref local="emp2"/>
-                <ref local="emp3"/>
-            </set>
-        </property>
-    </bean>
-
-    <bean id="emp1" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
-        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String"><value>emp1First</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
-        <constructor-arg index="3" type="java.lang.String"><value>emp1Middle</value></constructor-arg>
-        <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.Address"><ref local="addr1"/></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>20000</value></constructor-arg>
-        <property name="department"><ref bean="dept1"/></property>
-        <property name="medicalInsurance"><ref bean="medicalIns1"/></property>
-        <property name="phoneNumbers">
-	    <map>
-                <entry key="home"><value>1111</value></entry>
-                <entry key="work"><value>123456-1</value></entry>
-            </map>
-	</property>
-    </bean>
-    <bean id="emp2" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
-        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String"><value>emp2First</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
-        <constructor-arg index="3" type="java.lang.String"><value>emp2Middle</value></constructor-arg>
-        <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.Address"><ref local="addr2"/></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
-        <property name="department"><ref bean="dept1"/></property>
-        <property name="phoneNumbers">
-	    <map>
-                <entry key="home"><value>2222</value></entry>
-                <entry key="work"><value>123456-2</value></entry>
-            </map>
-	</property>
-    </bean>
-    <bean id="emp3" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
-        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String"><value>emp3First</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
-        <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
-        <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="5" type="org.apache.jdo.tck.pc.company.Address"><ref local="addr3"/></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>15000</value></constructor-arg>
-        <property name="department"><ref bean="dept1"/></property>
-        <property name="phoneNumbers">
-	    <map>
-                <entry key="home"><value>3333</value></entry>
-                <entry key="work"><value>123456-3</value></entry>
-            </map>
-	</property>
-    </bean>
-
-    <bean id="addr1" class="org.apache.jdo.tck.pc.company.Address">
-        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String"><value>Unter den Linden 1</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>Berlin</value></constructor-arg>
-        <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
-        <constructor-arg index="4" type="java.lang.String"><value>12345</value></constructor-arg>
-        <constructor-arg index="5" type="java.lang.String"><value>Germany</value></constructor-arg>
-    </bean>
-    <bean id="addr2" class="org.apache.jdo.tck.pc.company.Address">
-        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String"><value>Broadway 1</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>New York</value></constructor-arg>
-        <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
-        <constructor-arg index="4" type="java.lang.String"><value>10000</value></constructor-arg>
-        <constructor-arg index="5" type="java.lang.String"><value>USA</value></constructor-arg>
-    </bean>
-    <bean id="addr3" class="org.apache.jdo.tck.pc.company.Address">
-        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String"><value>Market St.</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>San Francisco</value></constructor-arg>
-        <constructor-arg index="3" type="java.lang.String"><value></value></constructor-arg>
-        <constructor-arg index="4" type="java.lang.String"><value>94102</value></constructor-arg>
-        <constructor-arg index="5" type="java.lang.String"><value>USA</value></constructor-arg>
-    </bean>
-
-    <bean id="medicalIns1" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
-        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
-        <constructor-arg index="1" type="java.lang.String"><value>Carrier1</value></constructor-arg>
-        <constructor-arg index="2" type="java.lang.String"><value>PPO</value></constructor-arg>
-        <property name="employee"><ref bean="emp1"/></property>
-    </bean>
-</beans>

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java Thu Jul 14 10:11:15 2005
@@ -78,8 +78,7 @@
         
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java Thu Jul 14 10:11:15 2005
@@ -63,8 +63,7 @@
                 
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {
@@ -111,4 +110,4 @@
 
         tx.commit();
     }
-}
\ No newline at end of file
+}

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/query/operators/StringConcatenation.java Thu Jul 14 10:11:15 2005
@@ -62,8 +62,7 @@
                 
         try {
             // read test data
-            CompanyModelReader reader = 
-                loadCompanyModel(pm, "org/apache/jdo/tck/query/company.xml");
+            CompanyModelReader reader = loadCompanyModel(pm, COMPANY_TESTDATA);
             runTest(pm, reader);
         }
         finally {

Modified: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company.xml?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company.xml (original)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company.xml Thu Jul 14 10:11:15 2005
@@ -4,6 +4,14 @@
 <beans>
     <description>Company instances for CompletenessTest</description>
 
+    <bean id="root" class="java.util.ArrayList">
+        <constructor-arg index="0">
+            <list>
+                <ref local="company1"/>
+            </list>
+        </constructor-arg>
+    </bean>
+
     <bean id="company1" class="org.apache.jdo.tck.pc.company.Company">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>

Modified: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml?rev=219063&r1=219062&r2=219063&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml (original)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyNoRelationships.xml Thu Jul 14 10:11:15 2005
@@ -4,6 +4,28 @@
 <beans>
     <description>Company instances for CompletenessTest</description>
 
+    <bean id="root" class="java.util.ArrayList">
+        <constructor-arg index="0">
+            <list>
+                <ref local="company1"/>
+                <ref local="dept1"/>
+                <ref local="dept2"/>
+                <ref local="emp1"/>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+                <ref local="medicalIns1"/>
+                <ref local="medicalIns2"/>
+                <ref local="medicalIns3"/>
+                <ref local="dentalIns1"/>
+                <ref local="proj1"/>
+                <ref local="proj2"/>
+                <ref local="proj3"/>
+            </list>
+        </constructor-arg>
+    </bean>
+
     <bean id="company1" class="org.apache.jdo.tck.pc.company.Company">
         <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
         <constructor-arg index="1" type="java.lang.String"><value>Sun Microsystems, Inc.</value></constructor-arg>
@@ -26,8 +48,8 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp1Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp1Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>10/Jun/1970</value></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>20000</value></constructor-arg>
+        <constructor-arg index="5" type="java.util.Date"><value>1/Jan/1999</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>20000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
     </bean>
     <bean id="emp2" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
@@ -36,8 +58,8 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp2Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp2Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>22/Dec/1975</value></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>10000</value></constructor-arg>
+        <constructor-arg index="5" type="java.util.Date"><value>1/Jul/2003</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>10000</value></constructor-arg>
         <property name="weeklyhours"><value>40</value></property>
     </bean>
     <bean id="emp3" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
@@ -46,8 +68,8 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp3Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp3Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Sep/1972</value></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>15000</value></constructor-arg>
+        <constructor-arg index="5" type="java.util.Date"><value>15/Aug/2002</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>15000</value></constructor-arg>
         <property name="weeklyhours"><value>19</value></property>
     </bean>
     <bean id="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
@@ -56,8 +78,8 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp4Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp4Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>6/Sep/1973</value></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>13000</value></constructor-arg>
+        <constructor-arg index="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
     </bean>
     <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
         <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
@@ -65,8 +87,8 @@
         <constructor-arg index="2" type="java.lang.String"><value>emp5Last</value></constructor-arg>
         <constructor-arg index="3" type="java.lang.String"><value>emp5Middle</value></constructor-arg>
         <constructor-arg index="4" type="java.util.Date"><value>5/Jul/1962</value></constructor-arg>
-        <constructor-arg index="6" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
-        <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
+        <constructor-arg index="5" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>45000</value></constructor-arg>
     </bean>
 
     <bean id="medicalIns1" class="org.apache.jdo.tck.pc.company.MedicalInsurance">



Mime
View raw message