--- jsr166/src/test/tck/TreeMapTest.java	2010/10/09 19:30:35	1.16
+++ jsr166/src/test/tck/TreeMapTest.java	2011/11/26 05:19:17	1.22
@@ -1,13 +1,11 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import junit.framework.*;
 import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
 
 public class TreeMapTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -39,7 +37,7 @@ public class TreeMapTest extends JSR166T
     public void testClear() {
         TreeMap map = map5();
         map.clear();
-        assertEquals(map.size(), 0);
+        assertEquals(0, map.size());
     }
 
     /**
@@ -119,7 +117,6 @@ public class TreeMapTest extends JSR166T
         assertEquals(five, map.lastKey());
     }
 
-
     /**
      * keySet.toArray returns contains all keys
      */
@@ -176,7 +173,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -195,7 +192,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -214,7 +211,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -233,7 +230,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -413,7 +410,6 @@ public class TreeMapTest extends JSR166T
         assertNull(e4);
     }
 
-
     /**
      * lowerKey returns preceding element
      */
@@ -557,7 +553,7 @@ public class TreeMapTest extends JSR166T
         TreeMap 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)));
         }
     }
 
@@ -601,19 +597,14 @@ public class TreeMapTest extends JSR166T
      * A deserialized map equals original
      */
     public void testSerialization() throws Exception {
-        TreeMap 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));
-        TreeMap r = (TreeMap)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);
     }
 
     /**
@@ -780,7 +771,7 @@ public class TreeMapTest extends JSR166T
      * Submaps of submaps subdivide correctly
      */
     public void testRecursiveSubMaps() throws Exception {
-        int mapSize = 1000;
+        int mapSize = expensiveTests ? 1000 : 100;
         Class cl = TreeMap.class;
         NavigableMap<Integer, Integer> map = newMap(cl);
         bs = new BitSet(mapSize);
@@ -800,7 +791,7 @@ public class TreeMapTest extends JSR166T
     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;
     }
@@ -961,7 +952,7 @@ public class TreeMapTest extends JSR166T
      */
     void check(NavigableMap<Integer, Integer> map,
                       final int min, final int max, final boolean ascending) {
-       class ReferenceSet {
+        class ReferenceSet {
             int lower(int key) {
                 return ascending ? lowerAscending(key) : higherAscending(key);
             }