--- jsr166/src/test/tck/TreeMapTest.java	2015/04/25 04:55:31	1.31
+++ jsr166/src/test/tck/TreeMapTest.java	2017/08/23 05:33:00	1.34
@@ -17,14 +17,25 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import junit.framework.Test;
-import junit.framework.TestSuite;
 
 public class TreeMapTest extends JSR166TestCase {
     public static void main(String[] args) {
         main(suite(), args);
     }
     public static Test suite() {
-        return new TestSuite(TreeMapTest.class);
+        class Implementation implements MapImplementation {
+            public Class<?> klazz() { return TreeMap.class; }
+            public Map emptyMap() { return new TreeMap(); }
+            public Object makeKey(int i) { return i; }
+            public Object makeValue(int i) { return i; }
+            public boolean isConcurrent() { return false; }
+            public boolean permitsNullKeys() { return false; }
+            public boolean permitsNullValues() { return true; }
+            public boolean supportsSetValue() { return true; }
+        }
+        return newTestSuite(
+            TreeMapTest.class,
+            MapTest.testSuite(new Implementation()));
     }
 
     /**
@@ -606,7 +617,7 @@ public class TreeMapTest extends JSR166T
     }
 
     /**
-     * A deserialized map equals original
+     * A deserialized/reserialized map equals original
      */
     public void testSerialization() throws Exception {
         NavigableMap x = map5();
@@ -802,7 +813,7 @@ public class TreeMapTest extends JSR166T
 
     static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
         NavigableMap<Integer, Integer> result
-            = (NavigableMap<Integer, Integer>) cl.newInstance();
+            = (NavigableMap<Integer, Integer>) cl.getConstructor().newInstance();
         assertEquals(0, result.size());
         assertFalse(result.keySet().iterator().hasNext());
         return result;