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

Comparing jsr166/src/test/tck/Collection8Test.java (file contents):
Revision 1.17 by jsr166, Sun Nov 6 18:51:53 2016 UTC vs.
Revision 1.18 by jsr166, Sun Nov 6 20:53:53 2016 UTC

# Line 9 | Line 9 | import static java.util.concurrent.TimeU
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10  
11   import java.util.ArrayList;
12 + import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.Collections;
15   import java.util.Deque;
# Line 244 | Line 245 | public class Collection8Test extends JSR
245          int n = rnd.nextInt(6);
246          for (int i = 0; i < n; i++) c.add(impl.makeElement(i));
247          AtomicReference threwAt = new AtomicReference(null);
248 <        ArrayList survivors = new ArrayList(c);
248 >        List orig = rnd.nextBoolean()
249 >            ? new ArrayList(c)
250 >            : Arrays.asList(c.toArray());
251 >
252 >        // Merely creating an iterator can change ArrayBlockingQueue behavior
253 >        Iterator it = rnd.nextBoolean() ? c.iterator() : null;
254 >
255 >        ArrayList survivors = new ArrayList();
256          ArrayList accepts = new ArrayList();
257          ArrayList rejects = new ArrayList();
258 +
259          Predicate randomPredicate = (e) -> {
260              assertNull(threwAt.get());
261              switch (rnd.nextInt(3)) {
# Line 259 | Line 268 | public class Collection8Test extends JSR
268          try {
269              try {
270                  boolean modified = c.removeIf(randomPredicate);
271 <                if (!modified) {
272 <                    assertNull(threwAt.get());
273 <                    assertEquals(n, rejects.size());
274 <                    assertEquals(0, accepts.size());
275 <                }
276 <            } catch (ArithmeticException ok) {}
277 <            survivors.removeAll(accepts);
278 <            assertEquals(n - accepts.size(), c.size());
271 >                assertNull(threwAt.get());
272 >                assertEquals(modified, accepts.size() > 0);
273 >                assertEquals(modified, rejects.size() != n);
274 >                assertEquals(accepts.size() + rejects.size(), n);
275 >                assertEquals(rejects, Arrays.asList(c.toArray()));
276 >            } catch (ArithmeticException ok) {
277 >                assertNotNull(threwAt.get());
278 >                assertTrue(c.contains(threwAt.get()));
279 >            }
280 >            if (it != null && impl.isConcurrent())
281 >                // check for weakly consistent iterator
282 >                while (it.hasNext()) assertTrue(orig.contains(it.next()));
283 >            switch (rnd.nextInt(4)) {
284 >            case 0: survivors.addAll(c); break;
285 >            case 1: survivors.addAll(Arrays.asList(c.toArray())); break;
286 >            case 2: c.forEach(e -> survivors.add(e)); break;
287 >            case 3: for (Object e : c) survivors.add(e); break;
288 >            }
289 >            assertTrue(orig.containsAll(accepts));
290 >            assertTrue(orig.containsAll(rejects));
291 >            assertTrue(orig.containsAll(survivors));
292 >            assertTrue(orig.containsAll(c));
293 >            assertTrue(c.containsAll(rejects));
294              assertTrue(c.containsAll(survivors));
295              assertTrue(survivors.containsAll(rejects));
296 +            assertEquals(n - accepts.size(), c.size());
297              for (Object x : accepts) assertFalse(c.contains(x));
273            if (threwAt.get() == null)
274                assertEquals(accepts.size() + rejects.size(), n);
298          } catch (Throwable ex) {
299              System.err.println(impl.klazz());
300              System.err.printf("c=%s%n", c);
301              System.err.printf("n=%d%n", n);
302 +            System.err.printf("orig=%s%n", orig);
303              System.err.printf("accepts=%s%n", accepts);
304              System.err.printf("rejects=%s%n", rejects);
305              System.err.printf("survivors=%s%n", survivors);
306 <            System.err.printf("threw=%s%n", threwAt.get());
306 >            System.err.printf("threwAt=%s%n", threwAt.get());
307              throw ex;
308          }
309      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines