ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/MapTest.java
(Generate patch)

Comparing jsr166/src/test/tck/MapTest.java (file contents):
Revision 1.10 by jsr166, Mon Oct 7 21:06:02 2019 UTC vs.
Revision 1.11 by dl, Tue Jan 26 13:33:06 2021 UTC

# Line 20 | Line 20 | import junit.framework.Test;
20   /**
21   * Contains tests applicable to all Map implementations.
22   */
23 + @SuppressWarnings("unchecked")
24   public class MapTest extends JSR166TestCase {
25      final MapImplementation impl;
26  
# Line 41 | Line 42 | public class MapTest extends JSR166TestC
42          {
43              Map m = impl.emptyMap();
44              assertTrue(m.isEmpty());
45 <            assertEquals(0, m.size());
45 >            mustEqual(0, m.size());
46              Object k = impl.makeKey(rnd.nextInt());
47              Object v = impl.makeValue(rnd.nextInt());
48              m.put(k, v);
49              assertFalse(m.isEmpty());
50 <            assertEquals(1, m.size());
50 >            mustEqual(1, m.size());
51              assertTrue(m.containsKey(k));
52              assertTrue(m.containsValue(v));
53          }
# Line 141 | Line 142 | public class MapTest extends JSR166TestC
142          assertFalse(m.containsValue(v1));
143          assertTrue(m.containsValue(v2));
144          assertTrue(m.containsKey(keyToFrob));
145 <        assertEquals(1, m.size());
145 >        mustEqual(1, m.size());
146      }
147  
148      /**
# Line 172 | Line 173 | public class MapTest extends JSR166TestC
173          m1.putAll(m2);
174  
175          for (Object elt : m2.keySet())
176 <            assertEquals(m2.get(elt), m1.get(elt));
176 >            mustEqual(m2.get(elt), m1.get(elt));
177          for (Object elt : m1Copy.keySet())
178              assertSame(m1Copy.get(elt), m1.get(elt));
179 <        assertEquals(size1 + size2, m1.size());
179 >        mustEqual(size1 + size2, m1.size());
180      }
181  
182      /**
# Line 190 | Line 191 | public class MapTest extends JSR166TestC
191          final Map clone = cloneableClone(map);
192          if (clone == null) return;      // not cloneable?
193  
194 <        assertEquals(size, map.size());
195 <        assertEquals(size, clone.size());
196 <        assertEquals(map.isEmpty(), clone.isEmpty());
194 >        mustEqual(size, map.size());
195 >        mustEqual(size, clone.size());
196 >        mustEqual(map.isEmpty(), clone.isEmpty());
197  
198          clone.put(impl.makeKey(-1), impl.makeValue(-1));
199 <        assertEquals(size, map.size());
200 <        assertEquals(size + 1, clone.size());
199 >        mustEqual(size, map.size());
200 >        mustEqual(size + 1, clone.size());
201  
202          clone.clear();
203 <        assertEquals(size, map.size());
204 <        assertEquals(0, clone.size());
203 >        mustEqual(size, map.size());
204 >        mustEqual(0, clone.size());
205          assertTrue(clone.isEmpty());
206      }
207  
# Line 234 | Line 235 | public class MapTest extends JSR166TestC
235                      map.compute(key, incValue);
236                  }
237                  if (remappingFunctionCalledAtMostOnce)
238 <                    assertEquals(invocations[0], invocations[1]);
238 >                    mustEqual(invocations[0], invocations[1]);
239                  expectedSum.getAndAdd(invocations[0]);
240              },
241              // repeatedly increment values using computeIfPresent()
# Line 252 | Line 253 | public class MapTest extends JSR166TestC
253                          invocations[0]++;
254                  }
255                  if (remappingFunctionCalledAtMostOnce)
256 <                    assertEquals(invocations[0], invocations[1]);
256 >                    mustEqual(invocations[0], invocations[1]);
257                  expectedSum.getAndAdd(invocations[0]);
258              },
259          };
# Line 266 | Line 267 | public class MapTest extends JSR166TestC
267              checkTimedGet(future, null);
268  
269          long sum = map.values().stream().mapToLong(x -> (int) x).sum();
270 <        assertEquals(expectedSum.get(), sum);
270 >        mustEqual(expectedSum.get(), sum);
271      }
272  
273   //     public void testFailsIntentionallyForDebugging() {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines