--- jsr166/src/test/tck/ConcurrentHashMap8Test.java	2013/04/11 19:54:13	1.7
+++ jsr166/src/test/tck/ConcurrentHashMap8Test.java	2013/04/11 20:03:44	1.8
@@ -34,105 +34,6 @@ public class ConcurrentHashMap8Test exte
         return map;
     }
 
-    // classes for testing Comparable fallbacks
-    static class BI implements Comparable<BI> {
-        private final int value;
-        BI(int value) { this.value = value; }
-        public int compareTo(BI other) {
-            return Integer.compare(value, other.value);
-        }
-        public boolean equals(Object x) {
-            return (x instanceof BI) && ((BI)x).value == value;
-        }
-        public int hashCode() { return 42; }
-    }
-    static class CI extends BI { CI(int value) { super(value); } }
-    static class DI extends BI { DI(int value) { super(value); } }
-
-    static class BS implements Comparable<BS> {
-        private final String value;
-        BS(String value) { this.value = value; }
-        public int compareTo(BS other) {
-            return value.compareTo(other.value);
-        }
-        public boolean equals(Object x) {
-            return (x instanceof BS) && value.equals(((BS)x).value);
-        }
-        public int hashCode() { return 42; }
-    }
-
-    static class LexicographicList<E extends Comparable<E>> extends ArrayList<E>
-        implements Comparable<LexicographicList<E>> {
-        LexicographicList(Collection<E> c) { super(c); }
-        LexicographicList(E e) { super(Collections.singleton(e)); }
-        public int compareTo(LexicographicList<E> other) {
-            int common = Math.min(size(), other.size());
-            int r = 0;
-            for (int i = 0; i < common; i++) {
-                if ((r = get(i).compareTo(other.get(i))) != 0)
-                    break;
-            }
-            if (r == 0)
-                r = Integer.compare(size(), other.size());
-            return r;
-        }
-        private static final long serialVersionUID = 0;
-    }
-
-    /**
-     * Inserted elements that are subclasses of the same Comparable
-     * class are found.
-     */
-    public void testComparableFamily() {
-        ConcurrentHashMap<BI, Boolean> m = new ConcurrentHashMap<>();
-        for (int i = 0; i < 1000; i++) {
-            assertTrue(m.put(new CI(i), true) == null);
-        }
-        for (int i = 0; i < 1000; i++) {
-            assertTrue(m.containsKey(new CI(i)));
-            assertTrue(m.containsKey(new DI(i)));
-        }
-    }
-
-    /**
-     * Elements of classes with erased generic type parameters based
-     * on Comparable can be inserted and found.
-     */
-    public void testGenericComparable() {
-        ConcurrentHashMap<Object, Boolean> m = new ConcurrentHashMap<>();
-        for (int i = 0; i < 1000; i++) {
-            BI bi = new BI(i);
-            BS bs = new BS(String.valueOf(i));
-            LexicographicList<BI> bis = new LexicographicList<BI>(bi);
-            LexicographicList<BS> bss = new LexicographicList<BS>(bs);
-            assertTrue(m.putIfAbsent(bis, true) == null);
-            assertTrue(m.containsKey(bis));
-            if (m.putIfAbsent(bss, true) == null)
-                assertTrue(m.containsKey(bss));
-            assertTrue(m.containsKey(bis));
-        }
-        for (int i = 0; i < 1000; i++) {
-            assertTrue(m.containsKey(new ArrayList(Collections.singleton(new BI(i)))));
-        }
-    }
-
-    /**
-     * Elements of non-comparable classes equal to those of classes
-     * with erased generic type parameters based on Comparable can be
-     * inserted and found.
-     */
-    public void testGenericComparable2() {
-        ConcurrentHashMap<Object, Boolean> m = new ConcurrentHashMap<>();
-        for (int i = 0; i < 1000; i++) {
-            m.put(new ArrayList(Collections.singleton(new BI(i))), true);
-        }
-
-        for (int i = 0; i < 1000; i++) {
-            LexicographicList<BI> bis = new LexicographicList<BI>(new BI(i));
-            assertTrue(m.containsKey(bis));
-        }
-    }
-
     /**
      * getOrDefault returns value if present, else default
      */