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.26 by jsr166, Tue Nov 15 22:59:09 2016 UTC vs.
Revision 1.28 by jsr166, Fri Nov 18 17:23:29 2016 UTC

# Line 304 | Line 304 | public class Collection8Test extends JSR
304              switch (rnd.nextInt(4)) {
305              case 0: survivors.addAll(c); break;
306              case 1: survivors.addAll(Arrays.asList(c.toArray())); break;
307 <            case 2: c.forEach(e -> survivors.add(e)); break;
307 >            case 2: c.forEach(survivors::add); break;
308              case 3: for (Object e : c) survivors.add(e); break;
309              }
310              assertTrue(orig.containsAll(accepts));
# Line 355 | Line 355 | public class Collection8Test extends JSR
355          ArrayList forEached = new ArrayList();
356          ArrayList removeIfed = new ArrayList();
357          for (Object x : c) iterated.add(x);
358 <        c.iterator().forEachRemaining(e -> iteratedForEachRemaining.add(e));
358 >        c.iterator().forEachRemaining(iteratedForEachRemaining::add);
359          for (Spliterator s = c.spliterator();
360 <             s.tryAdvance(e -> tryAdvanced.add(e)); ) {}
361 <        c.spliterator().forEachRemaining(e -> spliterated.add(e));
362 <        c.forEach(e -> forEached.add(e));
360 >             s.tryAdvance(tryAdvanced::add); ) {}
361 >        c.spliterator().forEachRemaining(spliterated::add);
362 >        c.forEach(forEached::add);
363          c.removeIf(e -> { removeIfed.add(e); return false; });
364          boolean ordered =
365              c.spliterator().hasCharacteristics(Spliterator.ORDERED);
# Line 547 | Line 547 | public class Collection8Test extends JSR
547          final Object two = impl.makeElement(2);
548          final List<Future<?>> futures;
549          final Phaser threadsStarted = new Phaser(1); // register this thread
550 <        final List<Runnable> tasks = List.<Runnable>of(
550 >        final Runnable[] frobbers = {
551              () -> c.forEach(x -> assertTrue(x == one || x == two)),
552              () -> c.stream().forEach(x -> assertTrue(x == one || x == two)),
553              () -> c.spliterator().trySplit(),
# Line 574 | Line 574 | public class Collection8Test extends JSR
574                  assertTrue(c.contains(two));
575                  assertTrue(c.remove(two));
576                  assertFalse(c.contains(two));
577 <            })
578 <            .stream()
577 >            },
578 >        };
579 >        final List<Runnable> tasks =
580 >            Arrays.stream(frobbers)
581              .filter(task -> rnd.nextBoolean()) // random subset
582              .map(task -> (Runnable) () -> {
583                       threadsStarted.arriveAndAwaitAdvance();
# Line 587 | Line 589 | public class Collection8Test extends JSR
589          try (PoolCleaner cleaner = cleaner(pool, done)) {
590              threadsStarted.bulkRegister(tasks.size());
591              futures = tasks.stream()
592 <                .map(task -> pool.submit(task))
592 >                .map(pool::submit)
593                  .collect(Collectors.toList());
594              threadsStarted.arriveAndDeregister();
595              Thread.sleep(testDurationMillis);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines