From b94322904e5274b239889d41d0352f54cfceebb8 Mon Sep 17 00:00:00 2001 From: Morgan James Delagrange Date: Tue, 26 Feb 2002 18:08:58 +0000 Subject: [PATCH] more generic name for serialized collections git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@130602 13f79535-47bb-0310-9956-ffa450edef68 --- ... FastHashMap.emptyCollection.version1.obj} | Bin ...> FastHashMap.fullCollection.version1.obj} | Bin ... FastTreeMap.emptyCollection.version1.obj} | Bin ...> FastTreeMap.fullCollection.version1.obj} | Bin ...bj => LRUMap.emptyCollection.version2.obj} | Bin ...obj => LRUMap.fullCollection.version2.obj} | Bin ...MultiHashMap.emptyCollection.version2.obj} | Bin ... MultiHashMap.fullCollection.version2.obj} | Bin ...encedHashMap.emptyCollection.version2.obj} | Bin ...uencedHashMap.fullCollection.version2.obj} | Bin .../apache/commons/collections/TestMap.java | 41 ++++-------------- .../commons/collections/TestObject.java | 32 ++++++++++++-- 12 files changed, 36 insertions(+), 37 deletions(-) rename data/test/{FastHashMap.emptyMap.version1.obj => FastHashMap.emptyCollection.version1.obj} (100%) rename data/test/{FastHashMap.fullMap.version1.obj => FastHashMap.fullCollection.version1.obj} (100%) rename data/test/{FastTreeMap.emptyMap.version1.obj => FastTreeMap.emptyCollection.version1.obj} (100%) rename data/test/{FastTreeMap.fullMap.version1.obj => FastTreeMap.fullCollection.version1.obj} (100%) rename data/test/{LRUMap.emptyMap.version2.obj => LRUMap.emptyCollection.version2.obj} (100%) rename data/test/{LRUMap.fullMap.version2.obj => LRUMap.fullCollection.version2.obj} (100%) rename data/test/{MultiHashMap.emptyMap.version2.obj => MultiHashMap.emptyCollection.version2.obj} (100%) rename data/test/{MultiHashMap.fullMap.version2.obj => MultiHashMap.fullCollection.version2.obj} (100%) rename data/test/{SequencedHashMap.emptyMap.version2.obj => SequencedHashMap.emptyCollection.version2.obj} (100%) rename data/test/{SequencedHashMap.fullMap.version2.obj => SequencedHashMap.fullCollection.version2.obj} (100%) diff --git a/data/test/FastHashMap.emptyMap.version1.obj b/data/test/FastHashMap.emptyCollection.version1.obj similarity index 100% rename from data/test/FastHashMap.emptyMap.version1.obj rename to data/test/FastHashMap.emptyCollection.version1.obj diff --git a/data/test/FastHashMap.fullMap.version1.obj b/data/test/FastHashMap.fullCollection.version1.obj similarity index 100% rename from data/test/FastHashMap.fullMap.version1.obj rename to data/test/FastHashMap.fullCollection.version1.obj diff --git a/data/test/FastTreeMap.emptyMap.version1.obj b/data/test/FastTreeMap.emptyCollection.version1.obj similarity index 100% rename from data/test/FastTreeMap.emptyMap.version1.obj rename to data/test/FastTreeMap.emptyCollection.version1.obj diff --git a/data/test/FastTreeMap.fullMap.version1.obj b/data/test/FastTreeMap.fullCollection.version1.obj similarity index 100% rename from data/test/FastTreeMap.fullMap.version1.obj rename to data/test/FastTreeMap.fullCollection.version1.obj diff --git a/data/test/LRUMap.emptyMap.version2.obj b/data/test/LRUMap.emptyCollection.version2.obj similarity index 100% rename from data/test/LRUMap.emptyMap.version2.obj rename to data/test/LRUMap.emptyCollection.version2.obj diff --git a/data/test/LRUMap.fullMap.version2.obj b/data/test/LRUMap.fullCollection.version2.obj similarity index 100% rename from data/test/LRUMap.fullMap.version2.obj rename to data/test/LRUMap.fullCollection.version2.obj diff --git a/data/test/MultiHashMap.emptyMap.version2.obj b/data/test/MultiHashMap.emptyCollection.version2.obj similarity index 100% rename from data/test/MultiHashMap.emptyMap.version2.obj rename to data/test/MultiHashMap.emptyCollection.version2.obj diff --git a/data/test/MultiHashMap.fullMap.version2.obj b/data/test/MultiHashMap.fullCollection.version2.obj similarity index 100% rename from data/test/MultiHashMap.fullMap.version2.obj rename to data/test/MultiHashMap.fullCollection.version2.obj diff --git a/data/test/SequencedHashMap.emptyMap.version2.obj b/data/test/SequencedHashMap.emptyCollection.version2.obj similarity index 100% rename from data/test/SequencedHashMap.emptyMap.version2.obj rename to data/test/SequencedHashMap.emptyCollection.version2.obj diff --git a/data/test/SequencedHashMap.fullMap.version2.obj b/data/test/SequencedHashMap.fullCollection.version2.obj similarity index 100% rename from data/test/SequencedHashMap.fullMap.version2.obj rename to data/test/SequencedHashMap.fullCollection.version2.obj diff --git a/src/test/org/apache/commons/collections/TestMap.java b/src/test/org/apache/commons/collections/TestMap.java index 88f75f7f9..ea5831e9c 100644 --- a/src/test/org/apache/commons/collections/TestMap.java +++ b/src/test/org/apache/commons/collections/TestMap.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/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/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/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 @@ import java.util.NoSuchElementException; * * @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 @@ public abstract class TestMap extends TestObject { 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 @@ public abstract class TestMap extends TestObject { 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 @@ public abstract class TestMap extends TestObject { 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); } diff --git a/src/test/org/apache/commons/collections/TestObject.java b/src/test/org/apache/commons/collections/TestObject.java index 3ec6ae091..0b1b7d887 100644 --- a/src/test/org/apache/commons/collections/TestObject.java +++ b/src/test/org/apache/commons/collections/TestObject.java @@ -1,7 +1,7 @@ /* - * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestObject.java,v 1.7 2002/02/26 00:08:07 morgand Exp $ - * $Revision: 1.7 $ - * $Date: 2002/02/26 00:08:07 $ + * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/test/org/apache/commons/collections/Attic/TestObject.java,v 1.8 2002/02/26 18:08:58 morgand Exp $ + * $Revision: 1.8 $ + * $Date: 2002/02/26 18:08:58 $ * * ==================================================================== * @@ -90,7 +90,7 @@ import java.util.NoSuchElementException; * test case (method) your {@link Object} fails. * * @author Rodney Waldhoff - * @version $Id: TestObject.java,v 1.7 2002/02/26 00:08:07 morgand Exp $ + * @version $Id: TestObject.java,v 1.8 2002/02/26 18:08:58 morgand Exp $ */ public abstract class TestObject extends TestCase { public TestObject(String testName) { @@ -235,4 +235,28 @@ public abstract class TestObject extends TestCase { Object p = readExternalFormFromBytes(objekt); } } + + public String getCanonicalEmptyCollectionName(Object object) { + StringBuffer retval = new StringBuffer(); + retval.append("data/test/"); + String colName = object.getClass().getName(); + colName = colName.substring(colName.lastIndexOf(".")+1,colName.length()); + retval.append(colName); + retval.append(".emptyCollection.version"); + retval.append(getCompatibilityVersion()); + retval.append(".obj"); + return retval.toString(); + } + + public String getCanonicalFullCollectionName(Object object) { + StringBuffer retval = new StringBuffer(); + retval.append("data/test/"); + String colName = object.getClass().getName(); + colName = colName.substring(colName.lastIndexOf(".")+1,colName.length()); + retval.append(colName); + retval.append(".fullCollection.version"); + retval.append(getCompatibilityVersion()); + retval.append(".obj"); + return retval.toString(); + } }