--- jsr166/src/test/tck/MapTest.java	2019/10/07 21:06:02	1.10
+++ jsr166/src/test/tck/MapTest.java	2021/01/26 13:33:06	1.11
@@ -20,6 +20,7 @@ import junit.framework.Test;
 /**
  * Contains tests applicable to all Map implementations.
  */
+@SuppressWarnings("unchecked")
 public class MapTest extends JSR166TestCase {
     final MapImplementation impl;
 
@@ -41,12 +42,12 @@ public class MapTest extends JSR166TestC
         {
             Map m = impl.emptyMap();
             assertTrue(m.isEmpty());
-            assertEquals(0, m.size());
+            mustEqual(0, m.size());
             Object k = impl.makeKey(rnd.nextInt());
             Object v = impl.makeValue(rnd.nextInt());
             m.put(k, v);
             assertFalse(m.isEmpty());
-            assertEquals(1, m.size());
+            mustEqual(1, m.size());
             assertTrue(m.containsKey(k));
             assertTrue(m.containsValue(v));
         }
@@ -141,7 +142,7 @@ public class MapTest extends JSR166TestC
         assertFalse(m.containsValue(v1));
         assertTrue(m.containsValue(v2));
         assertTrue(m.containsKey(keyToFrob));
-        assertEquals(1, m.size());
+        mustEqual(1, m.size());
     }
 
     /**
@@ -172,10 +173,10 @@ public class MapTest extends JSR166TestC
         m1.putAll(m2);
 
         for (Object elt : m2.keySet())
-            assertEquals(m2.get(elt), m1.get(elt));
+            mustEqual(m2.get(elt), m1.get(elt));
         for (Object elt : m1Copy.keySet())
             assertSame(m1Copy.get(elt), m1.get(elt));
-        assertEquals(size1 + size2, m1.size());
+        mustEqual(size1 + size2, m1.size());
     }
 
     /**
@@ -190,17 +191,17 @@ public class MapTest extends JSR166TestC
         final Map clone = cloneableClone(map);
         if (clone == null) return;      // not cloneable?
 
-        assertEquals(size, map.size());
-        assertEquals(size, clone.size());
-        assertEquals(map.isEmpty(), clone.isEmpty());
+        mustEqual(size, map.size());
+        mustEqual(size, clone.size());
+        mustEqual(map.isEmpty(), clone.isEmpty());
 
         clone.put(impl.makeKey(-1), impl.makeValue(-1));
-        assertEquals(size, map.size());
-        assertEquals(size + 1, clone.size());
+        mustEqual(size, map.size());
+        mustEqual(size + 1, clone.size());
 
         clone.clear();
-        assertEquals(size, map.size());
-        assertEquals(0, clone.size());
+        mustEqual(size, map.size());
+        mustEqual(0, clone.size());
         assertTrue(clone.isEmpty());
     }
 
@@ -234,7 +235,7 @@ public class MapTest extends JSR166TestC
                     map.compute(key, incValue);
                 }
                 if (remappingFunctionCalledAtMostOnce)
-                    assertEquals(invocations[0], invocations[1]);
+                    mustEqual(invocations[0], invocations[1]);
                 expectedSum.getAndAdd(invocations[0]);
             },
             // repeatedly increment values using computeIfPresent()
@@ -252,7 +253,7 @@ public class MapTest extends JSR166TestC
                         invocations[0]++;
                 }
                 if (remappingFunctionCalledAtMostOnce)
-                    assertEquals(invocations[0], invocations[1]);
+                    mustEqual(invocations[0], invocations[1]);
                 expectedSum.getAndAdd(invocations[0]);
             },
         };
@@ -266,7 +267,7 @@ public class MapTest extends JSR166TestC
             checkTimedGet(future, null);
 
         long sum = map.values().stream().mapToLong(x -> (int) x).sum();
-        assertEquals(expectedSum.get(), sum);
+        mustEqual(expectedSum.get(), sum);
     }
 
 //     public void testFailsIntentionallyForDebugging() {