Author: mcaisse
Date: Thu Nov 10 12:58:35 2005
New Revision: 332369
URL: http://svn.apache.org/viewcvs?rev=332369&view=rev
Log:
JDO-209
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/TestHashMapStringKeyCollections.java
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
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=332369&r1=332368&r2=332369&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
Thu Nov 10 12:58:35 2005
@@ -153,9 +153,9 @@
if (debug) {
logger.debug("Field is " + i + " Class name is "
+ actual.getClass().getName()
- + " isInstance of Vector is "
- + actual.getClass().isInstance((Object)new Vector()));
- }
+ + " isInstance of Vector is "
+ + actual.getClass().isInstance((Object)new Vector()));
+ }
List expectedL = (List)expected;
List actualL = (List)actual;
for (int j = 0; j < actualL.size(); ++j) {
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java?rev=332369&r1=332368&r2=332369&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
Thu Nov 10 12:58:35 2005
@@ -16,8 +16,12 @@
package org.apache.jdo.tck.models.fieldtypes;
+import java.math.BigDecimal;
+
import java.util.HashMap;
import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Set;
import java.util.Vector;
import javax.jdo.PersistenceManager;
@@ -161,12 +165,32 @@
sbuf.append("\nFor element " + i + ", expected size = " +
expected.size() + ", actual size = " + actual.size()
+ " . ");
- continue;
}
- if (! expected.equals(actual)) {
+ else if (! expected.equals(actual)) {
+ if (TestUtil.getFieldSpecsForMap(
+ HashMapStringKeyCollections.fieldSpecs[i]
+ ).get(1).equals("BigDecimal")) {
+ Set keys = expected.keySet();
+ Iterator iter = keys.iterator();
+ while (iter.hasNext()) {
+ Object nextKey = iter.next();
+ BigDecimal expectedMapValue =
+ (BigDecimal)expected.get(nextKey);
+ BigDecimal actualMapValue =
+ (BigDecimal)actual.get(nextKey);
+ if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
+ sbuf.append("\nFor element " + i + "("
+ + (String)nextKey +
+ "), expected = " + expectedMapValue +
+ ", actual = " + actualMapValue + " . ");
+ }
+ }
+ }
+ else {
sbuf.append("\nFor element " + i + ", expected = " +
- expected + ", actual = " + actual + " . ");
+ expected + ", actual = " + actual + " . ");
}
+ }
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java?rev=332369&r1=332368&r2=332369&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
Thu Nov 10 12:58:35 2005
@@ -16,7 +16,12 @@
package org.apache.jdo.tck.models.fieldtypes;
+import java.math.BigDecimal;
+
import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import java.util.Vector;
import javax.jdo.PersistenceManager;
@@ -162,12 +167,32 @@
sbuf.append("\nFor element " + i + ", expected size = " +
expected.size() + ", actual size = " + actual.size()
+ " . ");
- continue;
}
- if (! expected.equals(actual)) {
+ else if (! expected.equals(actual)) {
+ if (TestUtil.getFieldSpecsForMap(
+ HashtableStringKeyCollections.fieldSpecs[i]
+ ).get(1).equals("BigDecimal")) {
+ Set keys = expected.keySet();
+ Iterator iter = keys.iterator();
+ while (iter.hasNext()) {
+ Object nextKey = iter.next();
+ BigDecimal expectedMapValue =
+ (BigDecimal)expected.get(nextKey);
+ BigDecimal actualMapValue =
+ (BigDecimal)actual.get(nextKey);
+ if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
+ sbuf.append("\nFor element " + i + "("
+ + (String)nextKey +
+ "), expected = " + expectedMapValue +
+ ", actual = " + actualMapValue + " . ");
+ }
+ }
+ }
+ else {
sbuf.append("\nFor element " + i + ", expected = " +
- expected + ", actual = " + actual + " . ");
+ expected + ", actual = " + actual + " . ");
}
+ }
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java?rev=332369&r1=332368&r2=332369&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
Thu Nov 10 12:58:35 2005
@@ -16,7 +16,11 @@
package org.apache.jdo.tck.models.fieldtypes;
+import java.math.BigDecimal;
+
import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
import java.util.Map;
import java.util.Vector;
@@ -162,12 +166,32 @@
sbuf.append("\nFor element " + i + ", expected size = " +
expected.size() + ", actual size = " + actual.size()
+ " . ");
- continue;
}
- if (! expected.equals(actual)) {
+ else if (! expected.equals(actual)) {
+ if (TestUtil.getFieldSpecsForMap(
+ MapStringKeyCollections.fieldSpecs[i]
+ ).get(1).equals("BigDecimal")) {
+ Set keys = expected.keySet();
+ Iterator iter = keys.iterator();
+ while (iter.hasNext()) {
+ Object nextKey = iter.next();
+ BigDecimal expectedMapValue =
+ (BigDecimal)expected.get(nextKey);
+ BigDecimal actualMapValue =
+ (BigDecimal)actual.get(nextKey);
+ if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
+ sbuf.append("\nFor element " + i + "("
+ + (String)nextKey +
+ "), expected = " + expectedMapValue +
+ ", actual = " + actualMapValue + " . ");
+ }
+ }
+ }
+ else {
sbuf.append("\nFor element " + i + ", expected = " +
- expected + ", actual = " + actual + " . ");
+ expected + ", actual = " + actual + " . ");
}
+ }
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java?rev=332369&r1=332368&r2=332369&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
Thu Nov 10 12:58:35 2005
@@ -16,6 +16,11 @@
package org.apache.jdo.tck.models.fieldtypes;
+import java.math.BigDecimal;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import java.util.TreeMap;
import java.util.Vector;
@@ -159,12 +164,32 @@
sbuf.append("\nFor element " + i + ", expected size = " +
expected.size() + ", actual size = " + actual.size()
+ " . ");
- continue;
}
- if (! expected.equals(actual)) {
+ else if (! expected.equals(actual)) {
+ if (TestUtil.getFieldSpecsForMap(
+ TreeMapStringKeyCollections.fieldSpecs[i]
+ ).get(1).equals("BigDecimal")) {
+ Set keys = expected.keySet();
+ Iterator iter = keys.iterator();
+ while (iter.hasNext()) {
+ Object nextKey = iter.next();
+ BigDecimal expectedMapValue =
+ (BigDecimal)expected.get(nextKey);
+ BigDecimal actualMapValue =
+ (BigDecimal)actual.get(nextKey);
+ if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
+ sbuf.append("\nFor element " + i + "("
+ + (String)nextKey +
+ "), expected = " + expectedMapValue +
+ ", actual = " + actualMapValue + " . ");
+ }
+ }
+ }
+ else {
sbuf.append("\nFor element " + i + ", expected = " +
- expected + ", actual = " + actual + " . ");
+ expected + ", actual = " + actual + " . ");
}
+ }
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
|