scolebourne 2004/06/02 15:05:03
Modified: collections/src/test/org/apache/commons/collections/bag
TestTypedSortedBag.java TestTypedBag.java
TestTransformedSortedBag.java
TestPredicatedBag.java TestTransformedBag.java
TestPredicatedSortedBag.java
Log:
Make decorator classes serializable, bug 18815
Revision Changes Path
1.8 +6 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
Index: TestTypedSortedBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestTypedSortedBag.java 18 Feb 2004 01:20:39 -0000 1.7
+++ TestTypedSortedBag.java 2 Jun 2004 22:05:03 -0000 1.8
@@ -93,4 +93,9 @@
Comparator c = bag.comparator();
assertTrue("natural order, so comparator should be null", c == null);
}
+
+ protected boolean skipSerializedCanonicalTests() {
+ return true;
+ }
+
}
1.7 +6 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTypedBag.java
Index: TestTypedBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTypedBag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestTypedBag.java 18 Feb 2004 01:20:39 -0000 1.6
+++ TestTypedBag.java 2 Jun 2004 22:05:03 -0000 1.7
@@ -115,4 +115,9 @@
// expected
}
}
+
+ protected boolean skipSerializedCanonicalTests() {
+ return true;
+ }
+
}
1.7 +18 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
Index: TestTransformedSortedBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestTransformedSortedBag.java 18 Feb 2004 01:20:39 -0000 1.6
+++ TestTransformedSortedBag.java 2 Jun 2004 22:05:03 -0000 1.7
@@ -62,4 +62,21 @@
assertEquals(true, bag.remove(new Integer((String) els[0])));
}
+
+ public String getCompatibilityVersion() {
+ return "3.1";
+ }
+
+// public void testCreate() throws Exception {
+// Bag bag = makeBag();
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/TransformedSortedBag.emptyCollection.version3.1.obj");
+// bag = makeBag();
+// bag.add("A");
+// bag.add("A");
+// bag.add("B");
+// bag.add("B");
+// bag.add("C");
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/TransformedSortedBag.fullCollection.version3.1.obj");
+// }
+
}
1.7 +18 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
Index: TestPredicatedBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestPredicatedBag.java 18 Feb 2004 01:20:39 -0000 1.6
+++ TestPredicatedBag.java 2 Jun 2004 22:05:03 -0000 1.7
@@ -123,4 +123,21 @@
// expected
}
}
+
+ public String getCompatibilityVersion() {
+ return "3.1";
+ }
+
+// public void testCreate() throws Exception {
+// Bag bag = makeBag();
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/PredicatedBag.emptyCollection.version3.1.obj");
+// bag = makeBag();
+// bag.add("A");
+// bag.add("A");
+// bag.add("B");
+// bag.add("B");
+// bag.add("C");
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/PredicatedBag.fullCollection.version3.1.obj");
+// }
+
}
1.7 +18 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
Index: TestTransformedBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestTransformedBag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestTransformedBag.java 18 Feb 2004 01:20:39 -0000 1.6
+++ TestTransformedBag.java 2 Jun 2004 22:05:03 -0000 1.7
@@ -64,4 +64,21 @@
assertEquals(true, bag.remove(new Integer((String) els[0])));
}
+
+ public String getCompatibilityVersion() {
+ return "3.1";
+ }
+
+// public void testCreate() throws Exception {
+// Bag bag = makeBag();
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/TransformedBag.emptyCollection.version3.1.obj");
+// bag = makeBag();
+// bag.add("A");
+// bag.add("A");
+// bag.add("B");
+// bag.add("B");
+// bag.add("C");
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/TransformedBag.fullCollection.version3.1.obj");
+// }
+
}
1.8 +18 -1
jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
Index: TestPredicatedSortedBag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestPredicatedSortedBag.java 18 Feb 2004 01:20:39 -0000 1.7
+++ TestPredicatedSortedBag.java 2 Jun 2004 22:05:03 -0000 1.8
@@ -103,4 +103,21 @@
Comparator c = bag.comparator();
assertTrue("natural order, so comparator should be null", c == null);
}
+
+ public String getCompatibilityVersion() {
+ return "3.1";
+ }
+
+// public void testCreate() throws Exception {
+// Bag bag = makeBag();
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/PredicatedSortedBag.emptyCollection.version3.1.obj");
+// bag = makeBag();
+// bag.add("A");
+// bag.add("A");
+// bag.add("B");
+// bag.add("B");
+// bag.add("C");
+// writeExternalFormToDisk((java.io.Serializable) bag,
"D:/dev/collections/data/test/PredicatedSortedBag.fullCollection.version3.1.obj");
+// }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
