db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r312732 [1/5] - in /incubator/jdo/trunk/tck20/test: java/org/apache/jdo/tck/models/fieldtypes/ java/org/apache/jdo/tck/pc/fieldtypes/ jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fiel...
Date Mon, 10 Oct 2005 20:35:15 GMT
Author: mcaisse
Date: Mon Oct 10 13:35:04 2005
New Revision: 312732

URL: http://svn.apache.org/viewcvs?rev=312732&view=rev
Log:
JDO-122 (partial); JDO-144 (fix test of BigDecimal)

Modified:
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java Mon Oct 10 13:35:04 2005
@@ -16,9 +16,9 @@
  
 package org.apache.jdo.tck.models.fieldtypes;
 
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Vector;
-import java.util.Hashtable;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Transaction;
@@ -143,11 +143,27 @@
                 sbuf.append("\nFor element " + i + ", expected size = " +
                         compareWith.size() + ", actual size = " + val.size()
                         + " . ");
-                continue;
             }
-            if (! val.equals(compareWith)) {
-                sbuf.append("\nFor element " + i + ", expected = " +
+            else if (! val.equals(compareWith)) {
+                if (TestUtil.getFieldSpecs(CollectionCollections.fieldSpecs[i]
+                            ).equals("BigDecimal")) {
+                    Vector compareWithV = (Vector)compareWith;
+                    Vector valV = (Vector)val;
+                    for (int j = 0; j < val.size(); ++j) {
+                        BigDecimal bigDecCompareWith =
+                            (BigDecimal)compareWithV.elementAt(j);
+                        Object bigDecVal = valV.elementAt(j);
+                        if ((bigDecCompareWith.compareTo(bigDecVal) != 0)) {
+                            sbuf.append("\nFor element " + i + "(" + j +
+                                    "), expected = " + compareWith +
+                                    ", actual = " + val + " . ");
+                        }
+                    }
+                }
+                else {
+                    sbuf.append("\nFor element " + i + ", expected = " +
                         compareWith + ", actual = " + val + " . ");
+                }
             }
         }
         if (sbuf.length() > 0) {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java Mon Oct 10 13:35:04 2005
@@ -16,9 +16,12 @@
  
 package org.apache.jdo.tck.models.fieldtypes;
 
+import java.math.BigDecimal;
+
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Vector;
+import java.util.Iterator;
+import java.util.TreeSet;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Transaction;
@@ -124,7 +127,8 @@
                     HashSetCollections.fieldSpecs[i]);
             value = (Collection)TestUtil.makeNewVectorInstance(
                     valueType, order);
-            collect.set( i, (HashSet)value);
+            HashSet lvalue = new HashSet(value);
+            collect.set(i, lvalue);
             if (debug)
                 logger.debug("Set " + i + "th value to: " + value.toString());
         }
@@ -139,17 +143,38 @@
                 pm.getObjectById(oid, true);
         int n = pi.getLength();
         for (i = 0; i < n; ++i) {
-            Collection compareWith = expectedValue.get(i);
-            Collection val = pi.get(i);
+            HashSet compareWith = expectedValue.get(i);
+            HashSet val = pi.get(i);
             if (val.size() != compareWith.size()) {
                 sbuf.append("\nFor element " + i + ", expected size = " +
                         compareWith.size() + ", actual size = " + val.size()
                         + " . ");
-                continue;
             }
-            if (! val.equals(compareWith)) {
-                sbuf.append("\nFor element " + i + ", expected = " +
+            else if (! val.equals(compareWith)) {
+                if (TestUtil.getFieldSpecs(HashSetCollections.fieldSpecs[i]
+                            ).equals("BigDecimal")) {
+                    // sort values for comparison
+                    TreeSet compareTS = new TreeSet(compareWith);
+                    TreeSet valTS = new TreeSet(val);
+                    Iterator compareIter = compareTS.iterator();
+                    Iterator valIter = valTS.iterator();
+                    for (int j=0; j < compareTS.size(); j++) {
+                        BigDecimal bigDecCompareWith =
+                                (BigDecimal)(compareIter.next());
+                        BigDecimal bigDecVal = (BigDecimal)(valIter.next());
+                                bigDecVal.setScale(bigDecCompareWith.scale());
+                        if ((bigDecCompareWith.compareTo(bigDecVal)) != 0)  {
+                            sbuf.append("\nFor element " + i + "(" + j +
+                                    "), expected = " + bigDecCompareWith +
+                                    ", actual = " + bigDecVal);
+                        }
+                    }
+                }
+                else {
+                    sbuf.append("\nFor element " + i + ", expected = " +
                         compareWith + ", actual = " + val + " . ");
+                }
+
             }
         }
         if (sbuf.length() > 0) {
@@ -157,6 +182,4 @@
                  "Expected and observed do not match!!" + sbuf.toString());
         }
     }
-
-
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java Mon Oct 10 13:35:04 2005
@@ -16,8 +16,10 @@
  
 package org.apache.jdo.tck.models.fieldtypes;
 
+import java.math.BigDecimal;
+
 import java.util.Collection;
-import java.util.Vector;
+import java.util.ListIterator;
 import java.util.LinkedList;
 
 import javax.jdo.PersistenceManager;
@@ -131,7 +133,8 @@
                     LinkedListCollections.fieldSpecs[i]);
             value = (Collection)TestUtil.makeNewVectorInstance(
                     valueType, order);
-            collect.set( i, (LinkedList)value);
+            LinkedList lvalue = new LinkedList(value);
+            collect.set(i, lvalue);
             if (debug)
                 logger.debug("Set " + i + "th value to: " + value.toString());
         }
@@ -146,19 +149,37 @@
                 pm.getObjectById(oid, true);
         int n = pi.getLength();
         for (i = 0; i < n; ++i) {
-            Collection compareWith = expectedValue.get(i);
-            Collection val = pi.get(i);
+            LinkedList compareWith = expectedValue.get(i);
+            LinkedList val = pi.get(i);
             if (val.size() != compareWith.size()) {
                 sbuf.append("\nFor element " + i + ", expected size = " +
                         compareWith.size() + ", actual size = " + val.size()
                         + " . ");
-                continue;
             }
-            if (! val.equals(compareWith)) {
-                sbuf.append("\nFor element " + i + ", expected = " +
+            else if (! val.equals(compareWith)) {
+                if (TestUtil.getFieldSpecs(LinkedListCollections.fieldSpecs[i]
+                            ).equals("BigDecimal")) {
+                    ListIterator compareWithIt = compareWith.listIterator();
+                    ListIterator valIt = val.listIterator();
+                    int index = 0;
+                    while (compareWithIt.hasNext()) {
+                        BigDecimal bigDecCompareWith =
+                                (BigDecimal)(compareWithIt.next());
+                        BigDecimal bigDecVal = (BigDecimal)(valIt.next());
+                        if ((bigDecCompareWith.compareTo(bigDecVal)) != 0)  {
+                            sbuf.append("\nFor element " + i + "(" + index +
+                                    "), expected = " + bigDecCompareWith +
+                                    ", actual = " + bigDecVal);
+                        }
+                        index++;
+                    }
+                }
+                else {
+                    sbuf.append("\nFor element " + i + ", expected = " +
                         compareWith + ", actual = " + val + " . ");
-            }
-        }
+                }
+
+            }        }
         if (sbuf.length() > 0) {
             fail(ASSERTION_FAILED,
                  "Expected and observed do not match!!" + sbuf.toString());

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java Mon Oct 10 13:35:04 2005
@@ -16,10 +16,12 @@
  
 package org.apache.jdo.tck.models.fieldtypes;
 
+import java.math.BigDecimal;
+
 import java.util.Collection;
 import java.util.Vector;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.ListIterator;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Transaction;
@@ -152,17 +154,36 @@
                 pm.getObjectById(oid, true);
         int n = pi.getLength();
         for (i = 0; i < n; ++i) {
-            Collection compareWith = expectedValue.get(i);
-            Collection val = pi.get(i);
+            List compareWith = expectedValue.get(i);
+            List val = pi.get(i);
             if (val.size() != compareWith.size()) {
                 sbuf.append("\nFor element " + i + ", expected size = " +
                         compareWith.size() + ", actual size = " + val.size()
                         + " . ");
-                continue;
             }
-            if (! val.equals(compareWith)) {
-                sbuf.append("\nFor element " + i + ", expected = " +
+            else if (! val.equals(compareWith)) {
+                if (TestUtil.getFieldSpecs(ListCollections.fieldSpecs[i]
+                            ).equals("BigDecimal")) {
+                    ListIterator compareWithIt = compareWith.listIterator();
+                    ListIterator valIt = val.listIterator();
+                    int index = 0;
+                    while (compareWithIt.hasNext()) {
+                        BigDecimal bigDecCompareWith =
+                                (BigDecimal)(compareWithIt.next());
+                        BigDecimal bigDecVal = (BigDecimal)(valIt.next());
+                        if ((bigDecCompareWith.compareTo(bigDecVal)) != 0)  {
+                            sbuf.append("\nFor element " + i + "(" + index +
+                                    "), expected = " + bigDecCompareWith +
+                                    ", actual = " + bigDecVal);
+                        }
+                        index++;
+                    }
+                }
+                else {
+                    sbuf.append("\nFor element " + i + ", expected = " +
                         compareWith + ", actual = " + val + " . ");
+                }
+
             }
         }
         if (sbuf.length() > 0) {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java Mon Oct 10 13:35:04 2005
@@ -16,10 +16,13 @@
  
 package org.apache.jdo.tck.models.fieldtypes;
 
+import java.math.BigDecimal;
+
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
-import java.util.Vector;
+import java.util.TreeSet;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Transaction;
@@ -122,7 +125,8 @@
                     SetCollections.fieldSpecs[i]);
             value = (Collection)TestUtil.makeNewVectorInstance(
                     valueType, order);
-            collect.set(i, (Set)value);
+            Set lvalue = new HashSet(value);
+            collect.set(i, lvalue);
             if (debug)
                 logger.debug("Set " + i + "th value to: " + value.toString());
         }
@@ -137,24 +141,43 @@
                 pm.getObjectById(oid, true);
         int n = pi.getLength();
         for (i = 0; i < n; ++i) {
-            Collection compareWith = expectedValue.get(i);
-            Collection val = pi.get(i);
+            Set compareWith = expectedValue.get(i);
+            Set val = pi.get(i);
             if (val.size() != compareWith.size()) {
                 sbuf.append("\nFor element " + i + ", expected size = " +
                         compareWith.size() + ", actual size = " + val.size()
                         + " . ");
-                continue;
             }
-            if (! val.equals(compareWith)) {
-                sbuf.append("\nFor element " + i + ", expected = " +
+            else if (! val.equals(compareWith)) {
+                if (TestUtil.getFieldSpecs(SetCollections.fieldSpecs[i]
+                            ).equals("BigDecimal")) {
+                    // sort values for comparison
+                    TreeSet compareTS = new TreeSet(compareWith);
+                    TreeSet valTS = new TreeSet(val);
+                    Iterator compareIter = compareTS.iterator();
+                    Iterator valIter = valTS.iterator();
+                    for (int j=0; j < compareTS.size(); j++) {
+                        BigDecimal bigDecCompareWith =
+                                (BigDecimal)(compareIter.next());
+                        BigDecimal bigDecVal = (BigDecimal)(valIter.next());
+                                bigDecVal.setScale(bigDecCompareWith.scale());
+                        if ((bigDecCompareWith.compareTo(bigDecVal)) != 0)  {
+                            sbuf.append("\nFor element " + i + "(" + j +
+                                    "), expected = " + bigDecCompareWith +
+                                    ", actual = " + bigDecVal);
+                        }
+                    }
+                }
+                else {
+                    sbuf.append("\nFor element " + i + ", expected = " +
                         compareWith + ", actual = " + val + " . ");
+                }
+
             }
         }
         if (sbuf.length() > 0) {
             fail(ASSERTION_FAILED,
                  "Expected and observed do not match!!" + sbuf.toString());
         }
-    }
-
-
+  }
 }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java Mon Oct 10 13:35:04 2005
@@ -16,6 +16,8 @@
  
 package org.apache.jdo.tck.models.fieldtypes;
 
+import java.math.BigDecimal;
+
 import java.util.Collection;
 import java.util.Vector;
 
@@ -142,19 +144,39 @@
         VectorCollections pi = (VectorCollections)
                 pm.getObjectById(oid, true);
         int n = pi.getLength();
-        for (int i = 0; i < n; ++i) {
-            Collection compareWith = expectedValue.get(i);
-            Collection val = pi.get(i);
+        for (int i = 0; i < n; i++) {
+            Vector compareWith = expectedValue.get(i);
+            Vector val = pi.get(i);
             if (val.size() != compareWith.size()) {
                 sbuf.append("\nFor element " + i + ", expected size = " +
                         compareWith.size() + ", actual size = " + val.size()
                         + " . ");
-                continue;
             }
-            if (! val.equals(compareWith)) {
-                sbuf.append("\nFor element " + i + ", expected = " +
+            else if (! val.equals(compareWith)) {
+                if (debug) {
+                    logger.debug("Field number is " + i);
+                    logger.debug("Persisted vector is " + val);
+                    logger.debug("Expected vector is " + compareWith);
+                }
+                if (TestUtil.getFieldSpecs(VectorCollections.fieldSpecs[i]
+                            ).equals("BigDecimal")) {
+                    for (int j = 0; j < val.size(); j++) {
+                        BigDecimal bigDecVal = (BigDecimal)val.elementAt(j);
+                        BigDecimal bigDecCompareWith =
+                            (BigDecimal)compareWith.elementAt(j);
+                        if ((bigDecCompareWith.compareTo(bigDecVal) != 0)) {
+                            sbuf.append("\nFor element " + i + "(" + j +
+                                    "), expected = " + compareWith +
+                                    ", actual = " + val + " . ");
+                        }
+                    }
+                }
+                else {
+                    sbuf.append("\nFor element " + i + ", expected = " +
                         compareWith + ", actual = " + val + " . ");
+                }
             }
+
         }
         if (sbuf.length() > 0) {
             fail(ASSERTION_FAILED,

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java Mon Oct 10 13:35:04 2005
@@ -108,7 +108,7 @@
   "public Collection CollectionOfShort39",
   "embedded-element=true public Collection CollectionOfShort40",
   "embedded-element=false public Collection CollectionOfShort41",
-  "serialized-element=true public Collection CollectionOfSimpleClass42"
+  "serialized=true public Collection CollectionOfSimpleClass42"
   };
   public int getLength()
   {

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java Mon Oct 10 13:35:04 2005
@@ -63,6 +63,7 @@
   public HashSet HashSetOfShort39;
   public HashSet HashSetOfShort40;
   public HashSet HashSetOfShort41;
+  public HashSet HashSetOfSimpleClass42;
 
   public static final String [] fieldSpecs = { 
   "public HashSet HashSetOfObject0",
@@ -106,7 +107,8 @@
   "embedded-element=false public HashSet HashSetOfLong38",
   "public HashSet HashSetOfShort39",
   "embedded-element=true public HashSet HashSetOfShort40",
-  "embedded-element=false public HashSet HashSetOfShort41"
+  "embedded-element=false public HashSet HashSetOfShort41",
+  "serialized=true public HashSet HashSetOfSimpleClass42"
   };
   public int getLength()
   {
@@ -200,6 +202,8 @@
         return HashSetOfShort40;
       case(41):
         return HashSetOfShort41;
+      case(42):
+        return HashSetOfSimpleClass42;
       default:
         throw new IndexOutOfBoundsException();
     }
@@ -335,6 +339,9 @@
          break;
       case(41):
         HashSetOfShort41= value;
+         break;
+      case(42):
+        HashSetOfSimpleClass42= value;
          break;
       default:
         throw new IndexOutOfBoundsException();

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java Mon Oct 10 13:35:04 2005
@@ -63,6 +63,7 @@
   public LinkedList LinkedListOfShort39;
   public LinkedList LinkedListOfShort40;
   public LinkedList LinkedListOfShort41;
+  public LinkedList LinkedListOfSimpleClass42;
 
   public static final String [] fieldSpecs = { 
   "public LinkedList LinkedListOfObject0",
@@ -106,7 +107,8 @@
   "embedded-element=false public LinkedList LinkedListOfLong38",
   "public LinkedList LinkedListOfShort39",
   "embedded-element=true public LinkedList LinkedListOfShort40",
-  "embedded-element=false public LinkedList LinkedListOfShort41"
+  "embedded-element=false public LinkedList LinkedListOfShort41",
+  "serialized=true public LinkedList LinkedListOfSimpleClass42"
   };
   public int getLength()
   {
@@ -200,6 +202,8 @@
         return LinkedListOfShort40;
       case(41):
         return LinkedListOfShort41;
+      case(42):
+        return LinkedListOfSimpleClass42;
       default:
         throw new IndexOutOfBoundsException();
     }
@@ -335,6 +339,9 @@
          break;
       case(41):
         LinkedListOfShort41= value;
+         break;
+      case(42):
+        LinkedListOfSimpleClass42= value;
          break;
       default:
         throw new IndexOutOfBoundsException();

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java Mon Oct 10 13:35:04 2005
@@ -63,6 +63,7 @@
   public List ListOfShort39;
   public List ListOfShort40;
   public List ListOfShort41;
+  public List ListOfSimpleClass42;
 
   public static final String [] fieldSpecs = { 
   "public List ListOfObject0",
@@ -106,7 +107,8 @@
   "embedded-element=false public List ListOfLong38",
   "public List ListOfShort39",
   "embedded-element=true public List ListOfShort40",
-  "embedded-element=false public List ListOfShort41"
+  "embedded-element=false public List ListOfShort41",
+  "serialized=true public List ListOfSimpleClass42"
   };
   public int getLength()
   {
@@ -200,11 +202,13 @@
         return ListOfShort40;
       case(41):
         return ListOfShort41;
+      case(42):
+        return ListOfSimpleClass42;
       default:
         throw new IndexOutOfBoundsException();
     }
   }
-  public boolean set(int index,List value)
+  public boolean set(int index, List value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
@@ -335,6 +339,9 @@
          break;
       case(41):
         ListOfShort41= value;
+         break;
+      case(42):
+        ListOfSimpleClass42= value;
          break;
       default:
         throw new IndexOutOfBoundsException();

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java Mon Oct 10 13:35:04 2005
@@ -63,6 +63,7 @@
   public Set SetOfShort39;
   public Set SetOfShort40;
   public Set SetOfShort41;
+  public Set SetOfSimpleClass42;
 
   public static final String [] fieldSpecs = { 
   "public Set SetOfObject0",
@@ -106,7 +107,8 @@
   "embedded-element=false public Set SetOfLong38",
   "public Set SetOfShort39",
   "embedded-element=true public Set SetOfShort40",
-  "embedded-element=false public Set SetOfShort41"
+  "embedded-element=false public Set SetOfShort41",
+  "serialized=true public Set SetOfSimpleClass42"
   };
   public int getLength()
   {
@@ -200,6 +202,8 @@
         return SetOfShort40;
       case(41):
         return SetOfShort41;
+      case(42):
+        return SetOfSimpleClass42;
       default:
         throw new IndexOutOfBoundsException();
     }
@@ -335,6 +339,9 @@
          break;
       case(41):
         SetOfShort41= value;
+         break;
+      case(42):
+        SetOfSimpleClass42= value;
          break;
       default:
         throw new IndexOutOfBoundsException();

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java Mon Oct 10 13:35:04 2005
@@ -63,6 +63,7 @@
   public Vector VectorOfShort39;
   public Vector VectorOfShort40;
   public Vector VectorOfShort41;
+  public Vector VectorOfSimpleClass42;
 
   public static final String [] fieldSpecs = { 
   "public Vector VectorOfObject0",
@@ -106,7 +107,8 @@
   "embedded-element=false public Vector VectorOfLong38",
   "public Vector VectorOfShort39",
   "embedded-element=true public Vector VectorOfShort40",
-  "embedded-element=false public Vector VectorOfShort41"
+  "embedded-element=false public Vector VectorOfShort41",
+  "serialized=true public Vector VectorOfSimpleClass42"
   };
   public int getLength()
   {
@@ -200,6 +202,8 @@
         return VectorOfShort40;
       case(41):
         return VectorOfShort41;
+      case(42):
+        return VectorOfSimpleClass42;
       default:
         throw new IndexOutOfBoundsException();
     }
@@ -336,6 +340,9 @@
       case(41):
         VectorOfShort41= value;
          break;
+      case(42):
+        VectorOfSimpleClass42= value;
+         break;
       default:
         throw new IndexOutOfBoundsException();
     }
@@ -350,7 +357,8 @@
 
         public Oid(String s) { identifier = Integer.parseInt(justTheId(s)); }
 
-        public String toString() { return this.getClass().getName() + ": "  + identifier;}
+        public String toString() { return this.getClass().getName() +
+                ": "  + identifier;}
 
         public int hashCode() { return (int)identifier ; }
 

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo Mon Oct 10 13:35:04 2005
@@ -6,16 +6,16 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashSetCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="HashSetOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="HashSetOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="HashSetOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="HashSetOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -26,20 +26,25 @@
 </collection>
 </field>
 <field name="HashSetOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="HashSetOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="HashSetOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="HashSetOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="HashSetOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="HashSetOfString9" >
 <collection element-type="java.lang.String">
@@ -49,7 +54,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfString11" >
+<field name="HashSetOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -61,7 +66,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfDate14" >
+<field name="HashSetOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -73,7 +78,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfLocale17" >
+<field name="HashSetOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -85,7 +90,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfBigDecimal20" >
+<field name="HashSetOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -97,7 +102,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfBigInteger23" >
+<field name="HashSetOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -109,7 +114,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfByte26" >
+<field name="HashSetOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -121,7 +126,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfDouble29" >
+<field name="HashSetOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -133,7 +138,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfFloat32" >
+<field name="HashSetOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -145,7 +150,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfInteger35" >
+<field name="HashSetOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -157,7 +162,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfLong38" >
+<field name="HashSetOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -169,7 +174,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfShort41" >
+<field name="HashSetOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo Mon Oct 10 13:35:04 2005
@@ -6,16 +6,16 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.LinkedListCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="LinkedListOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="LinkedListOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="LinkedListOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="LinkedListOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -26,20 +26,25 @@
 </collection>
 </field>
 <field name="LinkedListOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="LinkedListOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="LinkedListOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="LinkedListOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="LinkedListOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="LinkedListOfString9" >
 <collection element-type="java.lang.String">
@@ -49,7 +54,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfString11" >
+<field name="LinkedListOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -61,7 +66,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfDate14" >
+<field name="LinkedListOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -73,7 +78,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfLocale17" >
+<field name="LinkedListOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -85,7 +90,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfBigDecimal20" >
+<field name="LinkedListOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -97,7 +102,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfBigInteger23" >
+<field name="LinkedListOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -109,7 +114,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfByte26" >
+<field name="LinkedListOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -121,7 +126,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfDouble29" >
+<field name="LinkedListOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -133,7 +138,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfFloat32" >
+<field name="LinkedListOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -145,7 +150,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfInteger35" >
+<field name="LinkedListOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -157,7 +162,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfLong38" >
+<field name="LinkedListOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -169,7 +174,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfShort41" >
+<field name="LinkedListOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo Mon Oct 10 13:35:04 2005
@@ -6,16 +6,16 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.ListCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="ListOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="ListOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="ListOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="ListOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -26,20 +26,25 @@
 </collection>
 </field>
 <field name="ListOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="ListOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="ListOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="ListOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="ListOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="ListOfString9" >
 <collection element-type="java.lang.String">
@@ -49,7 +54,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfString11" >
+<field name="ListOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -61,7 +66,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfDate14" >
+<field name="ListOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -73,7 +78,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfLocale17" >
+<field name="ListOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -85,7 +90,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfBigDecimal20" >
+<field name="ListOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -97,7 +102,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfBigInteger23" >
+<field name="ListOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -109,7 +114,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfByte26" >
+<field name="ListOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -121,7 +126,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfDouble29" >
+<field name="ListOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -133,7 +138,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfFloat32" >
+<field name="ListOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -145,7 +150,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfInteger35" >
+<field name="ListOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -157,7 +162,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfLong38" >
+<field name="ListOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -169,7 +174,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfShort41" >
+<field name="ListOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo Mon Oct 10 13:35:04 2005
@@ -6,16 +6,16 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.SetCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="SetOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="SetOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="SetOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="SetOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -26,20 +26,25 @@
 </collection>
 </field>
 <field name="SetOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="SetOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="SetOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="SetOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="SetOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="SetOfString9" >
 <collection element-type="java.lang.String">
@@ -49,7 +54,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfString11" >
+<field name="SetOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -61,7 +66,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfDate14" >
+<field name="SetOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -73,7 +78,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfLocale17" >
+<field name="SetOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -85,7 +90,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfBigDecimal20" >
+<field name="SetOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -97,7 +102,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfBigInteger23" >
+<field name="SetOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -109,7 +114,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfByte26" >
+<field name="SetOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -121,7 +126,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfDouble29" >
+<field name="SetOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -133,7 +138,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfFloat32" >
+<field name="SetOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -145,7 +150,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfInteger35" >
+<field name="SetOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -157,7 +162,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfLong38" >
+<field name="SetOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -169,7 +174,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfShort41" >
+<field name="SetOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo Mon Oct 10 13:35:04 2005
@@ -6,16 +6,16 @@
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.VectorCollections$Oid">
 <field name="identifier" primary-key="true"/>
 <field name="VectorOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="VectorOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="VectorOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="VectorOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -26,20 +26,25 @@
 </collection>
 </field>
 <field name="VectorOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="VectorOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="VectorOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="VectorOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="VectorOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="VectorOfString9" >
 <collection element-type="java.lang.String">
@@ -49,7 +54,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfString11" >
+<field name="VectorOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -61,7 +66,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfDate14" >
+<field name="VectorOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -73,7 +78,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfLocale17" >
+<field name="VectorOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -85,7 +90,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfBigDecimal20" >
+<field name="VectorOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -97,7 +102,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfBigInteger23" >
+<field name="VectorOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -109,7 +114,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfByte26" >
+<field name="VectorOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -121,7 +126,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfDouble29" >
+<field name="VectorOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -133,7 +138,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfFloat32" >
+<field name="VectorOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -145,7 +150,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfInteger35" >
+<field name="VectorOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -157,7 +162,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfLong38" >
+<field name="VectorOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -169,7 +174,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="VectorOfShort41" >
+<field name="VectorOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo Mon Oct 10 13:35:04 2005
@@ -4,16 +4,16 @@
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="datastore">
 <field name="HashSetOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="HashSetOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="HashSetOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="HashSetOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -24,20 +24,25 @@
 </collection>
 </field>
 <field name="HashSetOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="HashSetOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="HashSetOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="HashSetOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="HashSetOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="HashSetOfString9" >
 <collection element-type="java.lang.String">
@@ -47,7 +52,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfString11" >
+<field name="HashSetOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -59,7 +64,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfDate14" >
+<field name="HashSetOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -71,7 +76,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfLocale17" >
+<field name="HashSetOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -83,7 +88,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfBigDecimal20" >
+<field name="HashSetOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -95,7 +100,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfBigInteger23" >
+<field name="HashSetOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -107,7 +112,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfByte26" >
+<field name="HashSetOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -119,7 +124,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfDouble29" >
+<field name="HashSetOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -131,7 +136,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfFloat32" >
+<field name="HashSetOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -143,7 +148,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfInteger35" >
+<field name="HashSetOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -155,7 +160,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfLong38" >
+<field name="HashSetOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -167,7 +172,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="HashSetOfShort41" >
+<field name="HashSetOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo Mon Oct 10 13:35:04 2005
@@ -4,16 +4,16 @@
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="datastore">
 <field name="LinkedListOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="LinkedListOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="LinkedListOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="LinkedListOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -24,20 +24,25 @@
 </collection>
 </field>
 <field name="LinkedListOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="LinkedListOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="LinkedListOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="LinkedListOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="LinkedListOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="LinkedListOfString9" >
 <collection element-type="java.lang.String">
@@ -47,7 +52,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfString11" >
+<field name="LinkedListOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -59,7 +64,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfDate14" >
+<field name="LinkedListOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -71,7 +76,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfLocale17" >
+<field name="LinkedListOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -83,7 +88,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfBigDecimal20" >
+<field name="LinkedListOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -95,7 +100,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfBigInteger23" >
+<field name="LinkedListOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -107,7 +112,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfByte26" >
+<field name="LinkedListOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -119,7 +124,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfDouble29" >
+<field name="LinkedListOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -131,7 +136,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfFloat32" >
+<field name="LinkedListOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -143,7 +148,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfInteger35" >
+<field name="LinkedListOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -155,7 +160,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfLong38" >
+<field name="LinkedListOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -167,7 +172,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="LinkedListOfShort41" >
+<field name="LinkedListOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo Mon Oct 10 13:35:04 2005
@@ -4,16 +4,16 @@
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="datastore">
 <field name="ListOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="ListOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="ListOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="ListOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -24,20 +24,25 @@
 </collection>
 </field>
 <field name="ListOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="ListOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="ListOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="ListOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="ListOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="ListOfString9" >
 <collection element-type="java.lang.String">
@@ -47,7 +52,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfString11" >
+<field name="ListOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -59,7 +64,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfDate14" >
+<field name="ListOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -71,7 +76,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfLocale17" >
+<field name="ListOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -83,7 +88,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfBigDecimal20" >
+<field name="ListOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -95,7 +100,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfBigInteger23" >
+<field name="ListOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -107,7 +112,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfByte26" >
+<field name="ListOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -119,7 +124,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfDouble29" >
+<field name="ListOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -131,7 +136,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfFloat32" >
+<field name="ListOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -143,7 +148,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfInteger35" >
+<field name="ListOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -155,7 +160,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfLong38" >
+<field name="ListOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -167,7 +172,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="ListOfShort41" >
+<field name="ListOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo Mon Oct 10 13:35:04 2005
@@ -4,16 +4,16 @@
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="datastore">
 <field name="SetOfObject0" >
-<collection element-type="java.lang.Object">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="SetOfObject1" >
-<collection element-type="java.lang.Object" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
 <field name="SetOfObject2" >
-<collection element-type="java.lang.Object" embedded-element="false">
-</collection>
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
 </field>
 <field name="SetOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -24,20 +24,25 @@
 </collection>
 </field>
 <field name="SetOfSimpleClass5" >
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+  </collection>
+</field>
+<field name="SetOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
 </collection>
 </field>
 <field name="SetOfSimpleInterface6" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
 </collection>
 </field>
 <field name="SetOfSimpleInterface7" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="true">
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfSimpleInterface8" >
-<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleInterface" embedded-element="false">
-</collection>
+<field name="SetOfSimpleInterface8">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
+              serialized-element="true">
+  </collection>
 </field>
 <field name="SetOfString9" >
 <collection element-type="java.lang.String">
@@ -47,7 +52,7 @@
 <collection element-type="java.lang.String" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfString11" >
+<field name="SetOfString11" serialized="true">
 <collection element-type="java.lang.String" embedded-element="false">
 </collection>
 </field>
@@ -59,7 +64,7 @@
 <collection element-type="java.util.Date" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfDate14" >
+<field name="SetOfDate14" serialized="true">
 <collection element-type="java.util.Date" embedded-element="false">
 </collection>
 </field>
@@ -71,7 +76,7 @@
 <collection element-type="java.util.Locale" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfLocale17" >
+<field name="SetOfLocale17" serialized="true">
 <collection element-type="java.util.Locale" embedded-element="false">
 </collection>
 </field>
@@ -83,7 +88,7 @@
 <collection element-type="java.math.BigDecimal" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfBigDecimal20" >
+<field name="SetOfBigDecimal20" serialized="true">
 <collection element-type="java.math.BigDecimal" embedded-element="false">
 </collection>
 </field>
@@ -95,7 +100,7 @@
 <collection element-type="java.math.BigInteger" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfBigInteger23" >
+<field name="SetOfBigInteger23" serialized="true">
 <collection element-type="java.math.BigInteger" embedded-element="false">
 </collection>
 </field>
@@ -107,7 +112,7 @@
 <collection element-type="java.lang.Byte" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfByte26" >
+<field name="SetOfByte26" serialized="true">
 <collection element-type="java.lang.Byte" embedded-element="false">
 </collection>
 </field>
@@ -119,7 +124,7 @@
 <collection element-type="java.lang.Double" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfDouble29" >
+<field name="SetOfDouble29" serialized="true">
 <collection element-type="java.lang.Double" embedded-element="false">
 </collection>
 </field>
@@ -131,7 +136,7 @@
 <collection element-type="java.lang.Float" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfFloat32" >
+<field name="SetOfFloat32" serialized="true">
 <collection element-type="java.lang.Float" embedded-element="false">
 </collection>
 </field>
@@ -143,7 +148,7 @@
 <collection element-type="java.lang.Integer" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfInteger35" >
+<field name="SetOfInteger35" serialized="true">
 <collection element-type="java.lang.Integer" embedded-element="false">
 </collection>
 </field>
@@ -155,7 +160,7 @@
 <collection element-type="java.lang.Long" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfLong38" >
+<field name="SetOfLong38" serialized="true">
 <collection element-type="java.lang.Long" embedded-element="false">
 </collection>
 </field>
@@ -167,7 +172,7 @@
 <collection element-type="java.lang.Short" embedded-element="true">
 </collection>
 </field>
-<field name="SetOfShort41" >
+<field name="SetOfShort41" serialized="true">
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>



Mime
View raw message