From 60dc88188c76f2f4b7f26585d48cd14c47fe6330 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@apache.org>
Date: Sat, 10 Apr 2004 22:22:57 +0000
Subject: [PATCH] Change TransformedMap test cases to use good Transformer for
 serialization

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/collections/trunk@131659 13f79535-47bb-0310-9956-ffa450edef68
---
 ...ransformedMap.emptyCollection.version3.1.obj | Bin 331 -> 313 bytes
 ...TransformedMap.fullCollection.version3.1.obj | Bin 582 -> 564 bytes
 ...rmedSortedMap.emptyCollection.version3.1.obj | Bin 403 -> 385 bytes
 ...ormedSortedMap.fullCollection.version3.1.obj | Bin 666 -> 648 bytes
 .../collection/TestTransformedCollection.java   |  14 ++++----------
 .../collections/map/TestTransformedMap.java     |   5 +++--
 .../map/TestTransformedSortedMap.java           |   5 +++--
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/data/test/TransformedMap.emptyCollection.version3.1.obj b/data/test/TransformedMap.emptyCollection.version3.1.obj
index e7c56412d8205198c77bd805716c3bb833228a77..881bd7d32f3a8443e58ee8f4b1452470f0783969 100644
GIT binary patch
delta 46
zcmX@jw3BJVLPoQR9P;vMrFqFE`9;Nge*OU=MTvREY57IDsYSALrETq3mCu^^DG~sP
C9ud+2

delta 64
zcmdnVbed_xLPn2?9P)<A`8heM$t9Wjd3qtK#U&v{iFw6o`9-;@Db8>i6~Fxaf@#JJ
NqiT+;icWkG2>=td8A1R6

diff --git a/data/test/TransformedMap.fullCollection.version3.1.obj b/data/test/TransformedMap.fullCollection.version3.1.obj
index efdcfef8c176f5c2bab392f1406788d33854bc8f..be8bb3974f94e16634369422b9878cbd4f78f59e 100644
GIT binary patch
delta 47
zcmX@cvV~>BLPoQR9P;vMrFqFE`9;Nge*OU=MTvREY57IDsYSALrETq3mCxGvDTEOK
DnNJbu

delta 65
zcmdnOa*SodLPn2?9P)<A`8heM$t9Wjd3qtK#U&v{iFw6o`9-;@Db8>i6~Fxaf@#JJ
OqiT+;if()m!UzB>>KRx7

diff --git a/data/test/TransformedSortedMap.emptyCollection.version3.1.obj b/data/test/TransformedSortedMap.emptyCollection.version3.1.obj
index 8683ae81a3f25ff203bca27e31a156e1e31ecc67..e185c429a2e4ee933efeba41a056c20cfac4d1ac 100644
GIT binary patch
delta 47
zcmbQt+{irPIiuM`KY97I(!Au7{Gwt#KmUM`qQt!7wEUvn)FRor(zf=i%4bcsV2lO;
DnU4`W

delta 65
zcmZo<p3FSqIitr!KY7FC{G6QB<dV$%JiU<A;*yY}#Ju9P{G!~{6lb`MieG+y!8GHA
OQ8mX^MJKB<MgssYvKXrX

diff --git a/data/test/TransformedSortedMap.fullCollection.version3.1.obj b/data/test/TransformedSortedMap.fullCollection.version3.1.obj
index 33ea3501c47cebfeb9d049c11f2e76d7c561651b..a52118607d886ec3e404967d038d11b3d4e9c360 100644
GIT binary patch
delta 48
zcmbQm+QB;EIiuM`KY97I(!Au7{Gwt#KmUM`qQt!7wEUvn)FRor(zf=i%4co1U`%2J
E0ItIkbpQYW

delta 66
zcmeBRoy9ugIitr!KY7FC{G6QB<dV$%JiU<A;*yY}#Ju9P{G!~{6lb`MieG+y!8GHA
PQ8mX^MK`N4CNTm4Oqv+w

diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
index cb729cffc..51d62ee1b 100644
--- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
@@ -15,7 +15,6 @@
  */
 package org.apache.commons.collections.collection;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -25,31 +24,26 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.collections.Transformer;
+import org.apache.commons.collections.TransformerUtils;
 
 /**
  * Extension of {@link TestCollection} for exercising the {@link TransformedCollection}
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/02/18 01:20:40 $
+ * @version $Revision: 1.6 $ $Date: 2004/04/10 22:22:57 $
  * 
  * @author Stephen Colebourne
  */
 public class TestTransformedCollection extends AbstractTestCollection {
     
-    private static class Noop implements Transformer, Serializable {
-        public Object transform(Object input) {
-            return input;
-        }
-    }
-    
-    private static class StringToInteger implements Transformer, Serializable {
+    private static class StringToInteger implements Transformer {
         public Object transform(Object input) {
             return new Integer((String) input);
         }
     }
     
-    public static final Transformer NOOP_TRANSFORMER = new Noop();
+    public static final Transformer NOOP_TRANSFORMER = TransformerUtils.nopTransformer();
     public static final Transformer STRING_TO_INTEGER_TRANSFORMER = new StringToInteger();
 
     public TestTransformedCollection(String testName) {
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
index 185d56cfc..063f21552 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.commons.collections.TransformerUtils;
 import org.apache.commons.collections.collection.TestTransformedCollection;
 
 /**
@@ -29,7 +30,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.6 $ $Date: 2004/04/09 09:43:09 $
+ * @version $Revision: 1.7 $ $Date: 2004/04/10 22:22:56 $
  * 
  * @author Stephen Colebourne
  */
@@ -50,7 +51,7 @@ public class TestTransformedMap extends AbstractTestMap {
 
     //-----------------------------------------------------------------------
     public Map makeEmptyMap() {
-        return TransformedMap.decorate(new HashMap(), TestTransformedCollection.NOOP_TRANSFORMER, TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedMap.decorate(new HashMap(), TransformerUtils.nopTransformer(), TransformerUtils.nopTransformer());
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
index c276269f8..4bd7c8539 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
@@ -22,6 +22,7 @@ import java.util.TreeMap;
 import junit.framework.Test;
 
 import org.apache.commons.collections.BulkTest;
+import org.apache.commons.collections.TransformerUtils;
 import org.apache.commons.collections.collection.TestTransformedCollection;
 
 /**
@@ -29,7 +30,7 @@ import org.apache.commons.collections.collection.TestTransformedCollection;
  * implementation.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/09 09:43:09 $
+ * @version $Revision: 1.6 $ $Date: 2004/04/10 22:22:57 $
  * 
  * @author Stephen Colebourne
  */
@@ -50,7 +51,7 @@ public class TestTransformedSortedMap extends AbstractTestSortedMap {
 
     //-----------------------------------------------------------------------
     public Map makeEmptyMap() {
-        return TransformedSortedMap.decorate(new TreeMap(), TestTransformedCollection.NOOP_TRANSFORMER, TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedSortedMap.decorate(new TreeMap(), TransformerUtils.nopTransformer(), TransformerUtils.nopTransformer());
     }
 
     public boolean isSubMapViewsSerializable() {