db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r230702 - in /incubator/jdo/trunk/tck20/test: conf/ java/org/apache/jdo/tck/mapping/ sql/derby/applicationidentity/ sql/derby/datastoreidentity/ testdata/org/apache/jdo/tck/pc/company/
Date Sun, 07 Aug 2005 21:08:58 GMT
Author: clr
Date: Sun Aug  7 14:08:53 2005
New Revision: 230702

URL: http://svn.apache.org/viewcvs?rev=230702&view=rev
Log:
Added relationship tests to CompletenessTest. Patch provided by Michael Watzek

Added:
    incubator/jdo/trunk/tck20/test/conf/company1-1Relationships.conf
    incubator/jdo/trunk/tck20/test/conf/company1-MRelationships.conf
    incubator/jdo/trunk/tck20/test/conf/companyAllRelationships.conf
    incubator/jdo/trunk/tck20/test/conf/companyEmbedded.conf
    incubator/jdo/trunk/tck20/test/conf/companyM-MRelationships.conf
    incubator/jdo/trunk/tck20/test/conf/companyNoRelationships.conf
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
Removed:
    incubator/jdo/trunk/tck20/test/conf/cfg2.conf
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company.xml
Modified:
    incubator/jdo/trunk/tck20/test/conf/configurations.list
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/mapping/CompletenessTest.java
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
    incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml

Added: incubator/jdo/trunk/tck20/test/conf/company1-1Relationships.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/company1-1Relationships.conf?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/company1-1Relationships.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/company1-1Relationships.conf Sun Aug  7 14:08:53 2005
@@ -0,0 +1,4 @@
+jdo.tck.description = Completeness test with standard mapping, basic testdata with 1-1 relationships. 
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/company1-1Relationships.xml
+jdo.tck.mapping = 0

Added: incubator/jdo/trunk/tck20/test/conf/company1-MRelationships.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/company1-MRelationships.conf?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/company1-MRelationships.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/company1-MRelationships.conf Sun Aug  7 14:08:53 2005
@@ -0,0 +1,4 @@
+jdo.tck.description = Completeness test with standard mapping, basic testdata with 1-M relationships. 
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/company1-MRelationships.xml
+jdo.tck.mapping = 0

Added: incubator/jdo/trunk/tck20/test/conf/companyAllRelationships.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/companyAllRelationships.conf?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/companyAllRelationships.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/companyAllRelationships.conf Sun Aug  7 14:08:53 2005
@@ -0,0 +1,5 @@
+jdo.tck.description = Completeness test with standard mapping, basic testdata with all relationships \
+and embedded objects. 
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyAllRelationships.xml
+jdo.tck.mapping = 0

Added: incubator/jdo/trunk/tck20/test/conf/companyEmbedded.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/companyEmbedded.conf?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/companyEmbedded.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/companyEmbedded.conf Sun Aug  7 14:08:53 2005
@@ -0,0 +1,5 @@
+jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships \
+and embedded objects. 
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyEmbedded.xml
+jdo.tck.mapping = 0

Added: incubator/jdo/trunk/tck20/test/conf/companyM-MRelationships.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/companyM-MRelationships.conf?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/companyM-MRelationships.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/companyM-MRelationships.conf Sun Aug  7 14:08:53 2005
@@ -0,0 +1,4 @@
+jdo.tck.description = Completeness test with standard mapping, basic testdata with M-M relationships. 
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
+jdo.tck.mapping = 0

Added: incubator/jdo/trunk/tck20/test/conf/companyNoRelationships.conf
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/companyNoRelationships.conf?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/companyNoRelationships.conf (added)
+++ incubator/jdo/trunk/tck20/test/conf/companyNoRelationships.conf Sun Aug  7 14:08:53 2005
@@ -0,0 +1,4 @@
+jdo.tck.description = Completeness test with standard mapping, basic testdata with no relationships. 
+jdo.tck.classes = org.apache.jdo.tck.mapping.CompletenessTest
+jdo.tck.testdata = org/apache/jdo/tck/pc/company/companyNoRelationships.xml
+jdo.tck.mapping = 0

Modified: incubator/jdo/trunk/tck20/test/conf/configurations.list
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/conf/configurations.list?rev=230702&r1=230701&r2=230702&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/conf/configurations.list (original)
+++ incubator/jdo/trunk/tck20/test/conf/configurations.list Sun Aug  7 14:08:53 2005
@@ -1,3 +1,9 @@
 jdo.tck.cfglist = \
                  alltests.conf \
-                 cfg2.conf
+                 companyNoRelationships.conf \
+                 companyEmbedded.conf \
+                 company1-1Relationships.conf \
+                 company1-MRelationships.conf \
+                 companyM-MRelationships.conf \
+                 companyAllRelationships.conf
+

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=230702&r1=230701&r2=230702&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 Sun Aug  7 14:08:53 2005
@@ -21,7 +21,6 @@
 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;
@@ -48,8 +47,7 @@
     /** */
     protected List rootOids;
     
-        // todo: get filename from property
-    protected String inputFilename = "org/apache/jdo/tck/pc/company/companyNoRelationships.xml";
+    protected String inputFilename = System.getProperty("jdo.tck.testdata");
     
     /**
      * The <code>main</code> is called when the class

Modified: incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=230702&r1=230701&r2=230702&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Sun Aug  7 14:08:53 2005
@@ -187,7 +187,7 @@
 CREATE TABLE insuranceplans (
     INSID INTEGER NOT NULL,
     CARRIER VARCHAR(64) NOT NULL,
-    LIFETIME_ORTHO_BENEFIT DECIMAL,
+    LIFETIME_ORTHO_BENEFIT DECIMAL(22,3),
     PLANTYPE VARCHAR(8),
     DISCRIMINATOR varchar(64) NOT NULL,
     EMPLOYEE INTEGER REFERENCES persons,

Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=230702&r1=230701&r2=230702&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Sun Aug  7 14:08:53 2005
@@ -134,7 +134,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     INSID INTEGER,
     CARRIER VARCHAR(64) NOT NULL,
-    LIFETIME_ORTHO_BENEFIT DECIMAL,
+    LIFETIME_ORTHO_BENEFIT DECIMAL(22,3),
     PLANTYPE VARCHAR(8),
     DISCRIMINATOR varchar(64) NOT NULL,
     EMPLOYEE INTEGER REFERENCES persons,

Added: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml (added)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-1Relationships.xml Sun Aug  7 14:08:53 2005
@@ -0,0 +1,220 @@
+<?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 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="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>
+        <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
+    </bean>
+
+    <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>
+    </bean>
+
+    <bean id="dept2" class="org.apache.jdo.tck.pc.company.Department">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
+    </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="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>
+        <property name="medicalInsurance"><ref bean="medicalIns1"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns1"/></property>
+        <property name="mentor"><ref bean="emp2"/></property>
+        <property name="protege"><ref bean="emp5"/></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="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>
+        <property name="medicalInsurance"><ref bean="medicalIns2"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns2"/></property>
+        <property name="mentor"><ref bean="emp3"/></property>
+        <property name="protege"><ref bean="emp1"/></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="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>
+        <property name="medicalInsurance"><ref bean="medicalIns3"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns3"/></property>
+        <property name="mentor"><ref bean="emp4"/></property>
+        <property name="protege"><ref bean="emp2"/></property>
+    </bean>
+    <bean id="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
+        <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="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
+        <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns4"/></property>
+        <property name="mentor"><ref bean="emp5"/></property>
+        <property name="protege"><ref bean="emp3"/></property>
+    </bean>
+    <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
+        <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="5" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>45000</value></constructor-arg>
+        <property name="medicalInsurance"><ref bean="medicalIns5"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns5"/></property>
+        <property name="mentor"><ref bean="emp1"/></property>
+        <property name="protege"><ref bean="emp4"/></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>NY</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>CA</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>
+
+    <bean id="medicalIns2" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp2"/></property>
+    </bean>
+
+    <bean id="medicalIns3" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier3</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp3"/></property>
+    </bean>
+
+    <bean id="medicalIns4" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier4</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp4"/></property>
+    </bean>
+
+    <bean id="medicalIns5" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier5</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp5"/></property>
+    </bean>
+
+    <bean id="dentalIns1" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>11</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier1</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp1"/></property>
+    </bean>
+
+    <bean id="dentalIns2" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>12</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp2"/></property>
+    </bean>
+
+    <bean id="dentalIns3" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>13</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier3</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp3"/></property>
+    </bean>
+
+    <bean id="dentalIns4" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>14</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier4</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp4"/></property>
+    </bean>
+
+    <bean id="dentalIns5" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>15</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier5</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp5"/></property>
+    </bean>
+
+    <bean id="proj1" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
+    </bean>
+    <bean id="proj2" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
+    </bean>
+    <bean id="proj3" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
+    </bean>
+</beans>

Added: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml (added)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/company1-MRelationships.xml Sun Aug  7 14:08:53 2005
@@ -0,0 +1,204 @@
+<?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 CompletenessTest</description>
+
+    <bean id="root" class="java.util.ArrayList">
+        <constructor-arg index="0">
+            <list>
+                <ref local="company1"/>
+                <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>
+        <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
+        <property name="departments">
+            <set>
+                <ref local="dept1"/>
+                <ref local="dept2"/>
+            </set>
+        </property>
+    </bean>
+
+    <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="dept2" class="org.apache.jdo.tck.pc.company.Department">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
+        <property name="employees">
+            <set>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </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="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>
+        <property name="department"><ref bean="dept1"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></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="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>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept1"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="team">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp3"/>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </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="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>
+        <property name="department"><ref bean="dept1"/></property>
+        <property name="fundingDept"><ref bean="dept1"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+    </bean>
+    <bean id="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
+        <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="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+    </bean>
+    <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
+        <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="5" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>45000</value></constructor-arg>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="hradvisees">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+                <ref local="emp4"/>
+            </set>
+        </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>NY</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>CA</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>
+    </bean>
+
+    <bean id="medicalIns2" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+    </bean>
+
+    <bean id="medicalIns3" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+    </bean>
+
+    <bean id="dentalIns1" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+    </bean>
+
+    <bean id="proj1" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
+    </bean>
+    <bean id="proj2" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
+    </bean>
+    <bean id="proj3" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
+    </bean>
+</beans>

Added: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml (added)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyAllRelationships.xml Sun Aug  7 14:08:53 2005
@@ -0,0 +1,375 @@
+<?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 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>
+        <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.Address"><ref local="addr1"/></constructor-arg>
+        <property name="departments">
+            <set>
+                <ref local="dept1"/>
+                <ref local="dept2"/>
+            </set>
+        </property>
+    </bean>
+
+    <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="dept2" class="org.apache.jdo.tck.pc.company.Department">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
+        <property name="employees">
+            <set>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </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="weeklyhours"><value>40</value></property>
+        <property name="medicalInsurance"><ref bean="medicalIns1"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns1"/></property>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>1111</value></entry>
+                <entry key="work"><value>123456-1</value></entry>
+            </map>
+	    </property>
+        <property name="department"><ref bean="dept1"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp2"/></property>
+        <property name="protege"><ref bean="emp5"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+            </set>
+        </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="weeklyhours"><value>40</value></property>
+        <property name="medicalInsurance"><ref bean="medicalIns2"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns2"/></property>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>2222</value></entry>
+                <entry key="work"><value>123456-2</value></entry>
+            </map>
+	    </property>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept1"/></property>
+        <property name="mentor"><ref bean="emp3"/></property>
+        <property name="protege"><ref bean="emp1"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+                <ref local="proj2"/>
+            </set>
+        </property>
+        <property name="team">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp3"/>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </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="weeklyhours"><value>19</value></property>
+        <property name="medicalInsurance"><ref bean="medicalIns3"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns3"/></property>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>3333</value></entry>
+                <entry key="work"><value>123456-3</value></entry>
+            </map>
+	    </property>
+        <property name="department"><ref bean="dept1"/></property>
+        <property name="fundingDept"><ref bean="dept1"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp4"/></property>
+        <property name="protege"><ref bean="emp2"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+                <ref local="proj2"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
+        <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="5" type="org.apache.jdo.tck.pc.company.Address"><ref local="addr3"/></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>
+        <property name="medicalInsurance"><ref bean="medicalIns4"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns4"/></property>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>3343</value></entry>
+                <entry key="work"><value>124456-3</value></entry>
+            </map>
+	    </property>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp5"/></property>
+        <property name="protege"><ref bean="emp3"/></property>
+        <property name="hradvisor"><ref bean="emp5"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj2"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
+        <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="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/1998</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
+        <property name="medicalInsurance"><ref bean="medicalIns5"/></property>
+        <property name="dentalInsurance"><ref bean="dentalIns5"/></property>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>3363</value></entry>
+                <entry key="work"><value>126456-3</value></entry>
+            </map>
+	    </property>
+        <property name="department"><ref bean="dept2"/></property>
+        <property name="fundingDept"><ref bean="dept2"/></property>
+        <property name="manager"><ref bean="emp2"/></property>
+        <property name="mentor"><ref bean="emp1"/></property>
+        <property name="protege"><ref bean="emp4"/></property>
+        <property name="projects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj2"/>
+            </set>
+        </property>
+        <property name="hradvisees">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+                <ref local="emp4"/>
+            </set>
+        </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>NY</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>CA</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>
+
+    <bean id="medicalIns2" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp2"/></property>
+    </bean>
+
+    <bean id="medicalIns3" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier3</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp3"/></property>
+    </bean>
+
+    <bean id="medicalIns4" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier4</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp4"/></property>
+    </bean>
+
+    <bean id="medicalIns5" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier5</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+        <property name="employee"><ref bean="emp5"/></property>
+    </bean>
+
+    <bean id="dentalIns1" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>11</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier1</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp1"/></property>
+    </bean>
+
+    <bean id="dentalIns2" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>12</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp2"/></property>
+    </bean>
+
+    <bean id="dentalIns3" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>13</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier3</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp3"/></property>
+    </bean>
+
+    <bean id="dentalIns4" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>14</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier4</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp4"/></property>
+    </bean>
+
+    <bean id="dentalIns5" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>15</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier5</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+        <property name="employee"><ref bean="emp5"/></property>
+    </bean>
+
+    <bean id="proj1" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp5"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="proj2" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp4"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="proj3" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp1"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
+    </bean>
+</beans>

Added: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml (added)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyEmbedded.xml Sun Aug  7 14:08:53 2005
@@ -0,0 +1,194 @@
+<?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 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>
+        <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
+        <constructor-arg index="3" type="org.apache.jdo.tck.pc.company.Address"><ref local="addr1"/></constructor-arg>
+    </bean>
+
+    <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>
+    </bean>
+
+    <bean id="dept2" class="org.apache.jdo.tck.pc.company.Department">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
+    </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="weeklyhours"><value>40</value></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="weeklyhours"><value>40</value></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="weeklyhours"><value>19</value></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="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
+        <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="5" type="org.apache.jdo.tck.pc.company.Address"><ref local="addr3"/></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>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>3343</value></entry>
+                <entry key="work"><value>124456-3</value></entry>
+            </map>
+	    </property>
+    </bean>
+    <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
+        <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="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/1998</value></constructor-arg>
+        <constructor-arg index="7" type="double"><value>45000</value></constructor-arg>
+        <property name="phoneNumbers">
+	        <map>
+                <entry key="home"><value>3363</value></entry>
+                <entry key="work"><value>126456-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>NY</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>CA</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>
+    </bean>
+
+    <bean id="medicalIns2" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+    </bean>
+
+    <bean id="medicalIns3" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+    </bean>
+
+    <bean id="dentalIns1" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+    </bean>
+
+    <bean id="proj1" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
+    </bean>
+    <bean id="proj2" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
+    </bean>
+    <bean id="proj3" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
+    </bean>
+</beans>

Modified: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml?rev=230702&r1=230701&r2=230702&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml (original)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml Sun Aug  7 14:08:53 2005
@@ -81,7 +81,7 @@
         <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="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>
@@ -89,7 +89,7 @@
         <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="3" type="java.lang.String"><value>NY</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>
@@ -97,7 +97,7 @@
         <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="3" type="java.lang.String"><value>CA</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>

Added: incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml?rev=230702&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml (added)
+++ incubator/jdo/trunk/tck20/test/testdata/org/apache/jdo/tck/pc/company/companyM-MRelationships.xml Sun Aug  7 14:08:53 2005
@@ -0,0 +1,231 @@
+<?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 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"/>
+            </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>
+        <constructor-arg index="2" type="java.util.Date"><value>11/Apr/1952</value></constructor-arg>
+    </bean>
+
+    <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>
+    </bean>
+
+    <bean id="dept2" class="org.apache.jdo.tck.pc.company.Department">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String" ><value>Human Resources</value></constructor-arg>
+    </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="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>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+            </set>
+        </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="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>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+                <ref local="proj2"/>
+            </set>
+        </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="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>
+        <property name="projects">
+            <set>
+                <ref local="proj1"/>
+                <ref local="proj2"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="emp4" class="org.apache.jdo.tck.pc.company.PartTimeEmployee">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp4First</value></constructor-arg>
+        <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="5" type="java.util.Date"><value>15/Apr/2001</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>13000</value></constructor-arg>
+        <property name="projects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj2"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="emp5" class="org.apache.jdo.tck.pc.company.FullTimeEmployee">
+        <constructor-arg index="0" type="long"><value>5</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>emp5First</value></constructor-arg>
+        <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="5" type="java.util.Date"><value>15/Aug/1998</value></constructor-arg>
+        <constructor-arg index="6" type="double"><value>45000</value></constructor-arg>
+        <property name="projects">
+            <set>
+                <ref local="proj3"/>
+            </set>
+        </property>
+        <property name="reviewedProjects">
+            <set>
+                <ref local="proj2"/>
+            </set>
+        </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>NY</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>CA</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>
+    </bean>
+
+    <bean id="medicalIns2" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+    </bean>
+
+    <bean id="medicalIns3" class="org.apache.jdo.tck.pc.company.MedicalInsurance">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.lang.String"><value>HMO</value></constructor-arg>
+    </bean>
+
+    <bean id="dentalIns1" class="org.apache.jdo.tck.pc.company.DentalInsurance">
+        <constructor-arg index="0" type="long"><value>4</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>Carrier2</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>99.999</value></constructor-arg>
+    </bean>
+
+    <bean id="proj1" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>1</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>orange</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2500000.99</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp5"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp1"/>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="proj2" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>2</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>blue</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>50000.00</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp4"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp2"/>
+                <ref local="emp3"/>
+            </set>
+        </property>
+    </bean>
+    <bean id="proj3" class="org.apache.jdo.tck.pc.company.Project">
+        <constructor-arg index="0" type="long"><value>3</value></constructor-arg>
+        <constructor-arg index="1" type="java.lang.String"><value>green</value></constructor-arg>
+        <constructor-arg index="2" type="java.math.BigDecimal"><value>2000.99</value></constructor-arg>
+        <property name="reviewers">
+            <set>
+                <ref local="emp1"/>
+            </set>
+        </property>
+        <property name="members">
+            <set>
+                <ref local="emp4"/>
+                <ref local="emp5"/>
+            </set>
+        </property>
+    </bean>
+</beans>



Mime
View raw message