cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestMap.java TestObject.java
morgand 02/02/26 10:08:58
Modified:collections/src/test/org/apache/commons/collections
TestMap.java TestObject.java
Log:
more generic name for serialized collections
Revision ChangesPath
1.14 +8 -33
jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java
Index: TestMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestMap.java 26 Feb 2002 00:08:07 - 1.13
+++ TestMap.java 26 Feb 2002 18:08:58 - 1.14
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.13 2002/02/26 00:08:07 morgand Exp $
- * $Revision: 1.13 $
- * $Date: 2002/02/26 00:08:07 $
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.14 2002/02/26 18:08:58 morgand Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/02/26 18:08:58 $
*
*
*
@@ -87,7 +87,7 @@
*
* @author Michael Smith
* @author Rodney Waldhoff
- * @version $Id: TestMap.java,v 1.13 2002/02/26 00:08:07 morgand Exp $
+ * @version $Id: TestMap.java,v 1.14 2002/02/26 18:08:58 morgand Exp $
*/
public abstract class TestMap extends TestObject {
@@ -929,31 +929,6 @@
assertEquals(Both maps are same size,map2.size(),getSampleKeys().length);
}
-
-public String getCanonicalEmptyMapName(Map map) {
-StringBuffer retval = new StringBuffer();
-retval.append(data/test/);
-String mapName = map.getClass().getName();
-mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
-retval.append(mapName);
-retval.append(.emptyMap.version);
-retval.append(getCompatibilityVersion());
-retval.append(.obj);
-return retval.toString();
-}
-
-public String getCanonicalFullMapName(Map map) {
-StringBuffer retval = new StringBuffer();
-retval.append(data/test/);
-String mapName = map.getClass().getName();
-mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
-retval.append(mapName);
-retval.append(.fullMap.version);
-retval.append(getCompatibilityVersion());
-retval.append(.obj);
-return retval.toString();
-}
-
/**
* Compare the current serialized form of the Map
* against the canonical version in CVS.
@@ -964,12 +939,12 @@
Map map = makeEmptyMap();
if (!(map instanceof Serializable)) return;
-writeExternalFormToDisk((Serializable) map, getCanonicalEmptyMapName(map));
+writeExternalFormToDisk((Serializable) map,
getCanonicalEmptyCollectionName(map));
*/
// test to make sure the canonical form has been preserved
if (!(makeEmptyMap() instanceof Serializable)) return;
-Map map = (Map)
readExternalFormFromDisk(getCanonicalEmptyMapName(makeEmptyMap()));
+Map map = (Map)
readExternalFormFromDisk(getCanonicalEmptyCollectionName(makeEmptyMap()));
assertTrue(Map is empty,map.isEmpty() == true);
}
@@ -983,12 +958,12 @@
Map map = makeFullMap();
if (!(map instanceof Serializable)) return;
-writeExternalFormToDisk((Serializable) map, getCanonicalFullMapName(map));
+writeExternalFormToDisk((Serializable) map,
getCanonicalFullCollectionName(map));
*/
// test to make sure the canonical form has been preserved
if (!(makeFullMap() instanceof Serializable)) return;
-Map map = (Map)
readExternalFormFromDisk(getCanonicalFullMapName(makeFullMap()));
+Map map = (Map)
readExternalFormFromDisk(getCanonicalFullCollectionName(makeFullMap()));
assertEquals(Map is the right size,map.size(), getSampleKeys().length);
}
1.8 +28 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java
Index: TestObject.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestObject.java 26 Feb 2002 00:08:07 - 1.7
+++ TestObject.java 26 Feb 2002 18:08:58 - 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
1.7 2002/02/26 00:08:07 morgand Exp $
- *
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestMap.java TestObject.java
morgand 02/02/26 12:18:53
Modified:collections/src/test/org/apache/commons/collections Tag:
collections_1_x_branch TestMap.java TestObject.java
Log:
merged with HEAD
Revision ChangesPath
No revision
No revision
1.3.2.4 +8 -33
jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java
Index: TestMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- TestMap.java 26 Feb 2002 06:28:41 - 1.3.2.3
+++ TestMap.java 26 Feb 2002 20:18:53 - 1.3.2.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.3.2.3 2002/02/26 06:28:41 morgand Exp $
- * $Revision: 1.3.2.3 $
- * $Date: 2002/02/26 06:28:41 $
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.3.2.4 2002/02/26 20:18:53 morgand Exp $
+ * $Revision: 1.3.2.4 $
+ * $Date: 2002/02/26 20:18:53 $
*
*
*
@@ -87,7 +87,7 @@
*
* @author Michael Smith
* @author Rodney Waldhoff
- * @version $Id: TestMap.java,v 1.3.2.3 2002/02/26 06:28:41 morgand Exp $
+ * @version $Id: TestMap.java,v 1.3.2.4 2002/02/26 20:18:53 morgand Exp $
*/
public abstract class TestMap extends TestObject {
@@ -929,31 +929,6 @@
assertEquals(Both maps are same size,map2.size(),getSampleKeys().length);
}
-
-public String getCanonicalEmptyMapName(Map map) {
-StringBuffer retval = new StringBuffer();
-retval.append(data/test/);
-String mapName = map.getClass().getName();
-mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
-retval.append(mapName);
-retval.append(.emptyMap.version);
-retval.append(getCompatibilityVersion());
-retval.append(.obj);
-return retval.toString();
-}
-
-public String getCanonicalFullMapName(Map map) {
-StringBuffer retval = new StringBuffer();
-retval.append(data/test/);
-String mapName = map.getClass().getName();
-mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
-retval.append(mapName);
-retval.append(.fullMap.version);
-retval.append(getCompatibilityVersion());
-retval.append(.obj);
-return retval.toString();
-}
-
/**
* Compare the current serialized form of the Map
* against the canonical version in CVS.
@@ -965,12 +940,12 @@
map = makeEmptyMap();
if (!(map instanceof Serializable)) return;
-writeExternalFormToDisk((Serializable) map, getCanonicalEmptyMapName(map));
+writeExternalFormToDisk((Serializable) map,
getCanonicalEmptyCollectionName(map));
*/
// test to make sure the canonical form has been preserved
if (!(makeEmptyMap() instanceof Serializable)) return;
-map = (Map)
readExternalFormFromDisk(getCanonicalEmptyMapName(makeEmptyMap()));
+map = (Map)
readExternalFormFromDisk(getCanonicalEmptyCollectionName(makeEmptyMap()));
assertTrue(Map is empty,map.isEmpty() == true);
}
@@ -986,12 +961,12 @@
map = makeFullMap();
if (!(map instanceof Serializable)) return;
-writeExternalFormToDisk((Serializable) map, getCanonicalFullMapName(map));
+writeExternalFormToDisk((Serializable) map,
getCanonicalFullCollectionName(map));
*/
// test to make sure the canonical form has been preserved
if (!(makeFullMap() instanceof Serializable)) return;
-map = (Map)
readExternalFormFromDisk(getCanonicalFullMapName(makeFullMap()));
+map = (Map)
readExternalFormFromDisk(getCanonicalFullCollectionName(makeFullMap()));
assertEquals(Map is the right size,map.size(), getSampleKeys().length);
}
1.1.2.2 +34 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java
Index: TestObject.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TestObject.java 26 Feb 2002 00:48:14 - 1.1.2.1
+++ TestObject.java 26 Feb 2002 20:18:53 - 1.1.2.2
@@ -1,7 +1,13 @@
/*
- * $Header:
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestMap.java TestObject.java
morgand 02/02/25 12:57:08
Modified:collections/src/test/org/apache/commons/collections
TestMap.java TestObject.java
Log:
changed 'String COLLECTIONS_VERSION' to 'int COLLECTIONS_MAJOR_VERSION',
separated COLLECTIONS_MAJOR_VERSION from COMPATIBILITY_VERSION
Revision ChangesPath
1.12 +8 -8
jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java
Index: TestMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TestMap.java 22 Feb 2002 22:21:50 - 1.11
+++ TestMap.java 25 Feb 2002 20:57:08 - 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.11 2002/02/22 22:21:50 morgand Exp $
- * $Revision: 1.11 $
- * $Date: 2002/02/22 22:21:50 $
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.12 2002/02/25 20:57:08 morgand Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/02/25 20:57:08 $
*
*
*
@@ -87,7 +87,7 @@
*
* @author Michael Smith
* @author Rodney Waldhoff
- * @version $Id: TestMap.java,v 1.11 2002/02/22 22:21:50 morgand Exp $
+ * @version $Id: TestMap.java,v 1.12 2002/02/25 20:57:08 morgand Exp $
*/
public abstract class TestMap extends TestObject {
@@ -936,8 +936,8 @@
String mapName = map.getClass().getName();
mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
retval.append(mapName);
-retval.append(.emptyMap.);
-retval.append(COLLECTIONS_VERSION);
+retval.append(.emptyMap.version);
+retval.append(COMPATIBILITY_VERSION);
retval.append(.obj);
return retval.toString();
}
@@ -948,8 +948,8 @@
String mapName = map.getClass().getName();
mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
retval.append(mapName);
-retval.append(.fullMap.);
-retval.append(COLLECTIONS_VERSION);
+retval.append(.fullMap.version);
+retval.append(COMPATIBILITY_VERSION);
retval.append(.obj);
return retval.toString();
}
1.6 +9 -5
jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java
Index: TestObject.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestObject.java 25 Feb 2002 18:14:57 - 1.5
+++ TestObject.java 25 Feb 2002 20:57:08 - 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
1.5 2002/02/25 18:14:57 morgand Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/25 18:14:57 $
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
1.6 2002/02/25 20:57:08 morgand Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/25 20:57:08 $
*
*
*
@@ -90,18 +90,22 @@
* test case (method) your {@link Object} fails.
*
* @author Rodney Waldhoff
- * @version $Id: TestObject.java,v 1.5 2002/02/25 18:14:57 morgand Exp $
+ * @version $Id: TestObject.java,v 1.6 2002/02/25 20:57:08 morgand Exp $
*/
public abstract class TestObject extends TestCase {
public TestObject(String testName) {
super(testName);
}
+// current major release for Collections
+public static final int COLLECTIONS_MAJOR_VERSION = 2;
// This constant makes it possible for TestMap (and other subclasses,
// if necessary) to automatically check CVS for a versionX copy of a
// Serialized object, so we can make sure that compatibility is maintained.
// See, for example, TestMap.getCanonicalFullMapName(Map map).
-public static final String COLLECTIONS_VERSION = version2;
+// Subclasses can override this variable, indicating compatibility
+// with earlier Collections versions.
+public int COMPATIBILITY_VERSION = COLLECTIONS_MAJOR_VERSION;
/**
* Return a new, empty {@link Object} to used for testing.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections TestMap.java TestObject.java TestSequencedHashMap.java
morgand 02/02/25 16:08:07
Modified:collections/src/test/org/apache/commons/collections
TestMap.java TestObject.java
TestSequencedHashMap.java
Log:
changed compatibility version to a method, and had it default to the
maximum level of compatibility: version 1
Revision ChangesPath
1.13 +6 -6
jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java
Index: TestMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestMap.java 25 Feb 2002 20:57:08 - 1.12
+++ TestMap.java 26 Feb 2002 00:08:07 - 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.12 2002/02/25 20:57:08 morgand Exp $
- * $Revision: 1.12 $
- * $Date: 2002/02/25 20:57:08 $
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestMap.java,v
1.13 2002/02/26 00:08:07 morgand Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/02/26 00:08:07 $
*
*
*
@@ -87,7 +87,7 @@
*
* @author Michael Smith
* @author Rodney Waldhoff
- * @version $Id: TestMap.java,v 1.12 2002/02/25 20:57:08 morgand Exp $
+ * @version $Id: TestMap.java,v 1.13 2002/02/26 00:08:07 morgand Exp $
*/
public abstract class TestMap extends TestObject {
@@ -937,7 +937,7 @@
mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
retval.append(mapName);
retval.append(.emptyMap.version);
-retval.append(COMPATIBILITY_VERSION);
+retval.append(getCompatibilityVersion());
retval.append(.obj);
return retval.toString();
}
@@ -949,7 +949,7 @@
mapName = mapName.substring(mapName.lastIndexOf(.)+1,mapName.length());
retval.append(mapName);
retval.append(.fullMap.version);
-retval.append(COMPATIBILITY_VERSION);
+retval.append(getCompatibilityVersion());
retval.append(.obj);
return retval.toString();
}
1.7 +20 -11
jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java
Index: TestObject.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestObject.java 25 Feb 2002 20:57:08 - 1.6
+++ TestObject.java 26 Feb 2002 00:08:07 - 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
1.6 2002/02/25 20:57:08 morgand Exp $
- * $Revision: 1.6 $
- * $Date: 2002/02/25 20:57:08 $
+ * $Header:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/TestObject.java,v
1.7 2002/02/26 00:08:07 morgand Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/26 00:08:07 $
*
*
*
@@ -90,7 +90,7 @@
* test case (method) your {@link Object} fails.
*
* @author Rodney Waldhoff
- * @version $Id: TestObject.java,v 1.6 2002/02/25 20:57:08 morgand Exp $
+ * @version $Id: TestObject.java,v 1.7 2002/02/26 00:08:07 morgand Exp $
*/
public abstract class TestObject extends TestCase {
public TestObject(String testName) {
@@ -99,13 +99,22 @@
// current major release for Collections
public static final int COLLECTIONS_MAJOR_VERSION = 2;
-// This constant makes it possible for TestMap (and other subclasses,
-// if necessary) to automatically check CVS for a versionX copy of a
-// Serialized object, so we can make sure that compatibility is maintained.
-// See, for example, TestMap.getCanonicalFullMapName(Map map).
-// Subclasses can override this variable, indicating compatibility
-// with earlier Collections versions.
-public int COMPATIBILITY_VERSION = COLLECTIONS_MAJOR_VERSION;
+
+/**
+ * This constant makes it possible for TestMap (and other subclasses,
+ * if necessary) to automatically check CVS for a versionX copy of a
+ * Serialized object, so we can make sure that compatibility is maintained.
+ * See, for example, TestMap.getCanonicalFullMapName(Map map).
+ * Subclasses can override this variable, indicating compatibility
+ * with earlier Collections versions.
+ * Defaults to 1, the earliest Collections version. (Note: some
+ * collections did
