--- jsr166/src/test/tck/ConcurrentHashMapTest.java	2013/05/30 03:28:55	1.31
+++ jsr166/src/test/tck/ConcurrentHashMapTest.java	2013/07/14 21:41:06	1.33
@@ -34,12 +34,15 @@ public class ConcurrentHashMapTest exten
         return map;
     }
 
+    /** Re-implement Integer.compare for old java versions */
+    static int compare(int x, int y) { return x < y ? -1 : x > y ? 1 : 0; }
+
     // 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);
+            return compare(value, other.value);
         }
         public boolean equals(Object x) {
             return (x instanceof BI) && ((BI)x).value == value;
@@ -73,7 +76,7 @@ public class ConcurrentHashMapTest exten
                     break;
             }
             if (r == 0)
-                r = Integer.compare(size(), other.size());
+                r = compare(size(), other.size());
             return r;
         }
         private static final long serialVersionUID = 0;
@@ -84,7 +87,8 @@ public class ConcurrentHashMapTest exten
      * class are found.
      */
     public void testComparableFamily() {
-        ConcurrentHashMap<BI, Boolean> m = new ConcurrentHashMap<>();
+        ConcurrentHashMap<BI, Boolean> m =
+            new ConcurrentHashMap<BI, Boolean>();
         for (int i = 0; i < 1000; i++) {
             assertTrue(m.put(new CI(i), true) == null);
         }
@@ -99,7 +103,8 @@ public class ConcurrentHashMapTest exten
      * on Comparable can be inserted and found.
      */
     public void testGenericComparable() {
-        ConcurrentHashMap<Object, Boolean> m = new ConcurrentHashMap<>();
+        ConcurrentHashMap<Object, Boolean> m =
+            new ConcurrentHashMap<Object, Boolean>();
         for (int i = 0; i < 1000; i++) {
             BI bi = new BI(i);
             BS bs = new BS(String.valueOf(i));
@@ -122,7 +127,8 @@ public class ConcurrentHashMapTest exten
      * inserted and found.
      */
     public void testGenericComparable2() {
-        ConcurrentHashMap<Object, Boolean> m = new ConcurrentHashMap<>();
+        ConcurrentHashMap<Object, Boolean> m =
+            new ConcurrentHashMap<Object, Boolean>();
         for (int i = 0; i < 1000; i++) {
             m.put(new ArrayList(Collections.singleton(new BI(i))), true);
         }