--- jsr166/src/test/tck/ConcurrentSkipListMapTest.java	2011/04/14 22:55:08	1.23
+++ jsr166/src/test/tck/ConcurrentSkipListMapTest.java	2011/11/26 05:19:17	1.27
@@ -6,8 +6,7 @@
 
 import junit.framework.*;
 import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
+import java.util.concurrent.ConcurrentSkipListMap;
 
 public class ConcurrentSkipListMapTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -39,7 +38,7 @@ public class ConcurrentSkipListMapTest e
     public void testClear() {
         ConcurrentSkipListMap map = map5();
         map.clear();
-        assertEquals(map.size(), 0);
+        assertEquals(0, map.size());
     }
 
     /**
@@ -119,7 +118,6 @@ public class ConcurrentSkipListMapTest e
         assertEquals(five, map.lastKey());
     }
 
-
     /**
      * keySet.toArray returns contains all keys
      */
@@ -176,7 +174,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -195,7 +193,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -214,7 +212,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -233,7 +231,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -382,7 +380,6 @@ public class ConcurrentSkipListMapTest e
         assertEquals("Z", map.get(one));
     }
 
-
     /**
      * replace value fails when the given key not mapped to expected value
      */
@@ -403,7 +400,6 @@ public class ConcurrentSkipListMapTest e
         assertEquals("Z", map.get(one));
     }
 
-
     /**
      * remove removes the correct key-value pair from the map
      */
@@ -505,7 +501,7 @@ public class ConcurrentSkipListMapTest e
      * lowerEntry, higherEntry, ceilingEntry, and floorEntry return
      * immutable entries
      */
-    public void testEntryImmutablity() {
+    public void testEntryImmutability() {
         ConcurrentSkipListMap map = map5();
         Map.Entry e = map.lowerEntry(three);
         assertEquals(two, e.getKey());
@@ -533,8 +529,6 @@ public class ConcurrentSkipListMapTest e
         } catch (UnsupportedOperationException success) {}
     }
 
-
-
     /**
      * lowerKey returns preceding element
      */
@@ -678,7 +672,7 @@ public class ConcurrentSkipListMapTest e
         ConcurrentSkipListMap map = map5();
         String s = map.toString();
         for (int i = 1; i <= 5; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }
 
@@ -717,7 +711,6 @@ public class ConcurrentSkipListMapTest e
         } catch (NullPointerException success) {}
     }
 
-
     /**
      * put(null,x) throws NPE
      */
@@ -799,23 +792,16 @@ public class ConcurrentSkipListMapTest e
      * A deserialized map equals original
      */
     public void testSerialization() throws Exception {
-        ConcurrentSkipListMap q = map5();
+        NavigableMap x = map5();
+        NavigableMap y = serialClone(x);
 
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(q);
-        out.close();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-        ConcurrentSkipListMap r = (ConcurrentSkipListMap)in.readObject();
-        assertEquals(q.size(), r.size());
-        assertTrue(q.equals(r));
-        assertTrue(r.equals(q));
+        assertTrue(x != y);
+        assertEquals(x.size(), y.size());
+        assertEquals(x.toString(), y.toString());
+        assertEquals(x, y);
+        assertEquals(y, x);
     }
 
-
-
     /**
      * subMap returns map with keys in requested range
      */
@@ -1000,7 +986,7 @@ public class ConcurrentSkipListMapTest e
     static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
         NavigableMap<Integer, Integer> result =
             (NavigableMap<Integer, Integer>) cl.newInstance();
-        assertEquals(result.size(), 0);
+        assertEquals(0, result.size());
         assertFalse(result.keySet().iterator().hasNext());
         return result;
     }