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.32 by jsr166, Mon Nov 28 03:30:28 2016 UTC

# Line 21 | Line 21 | import java.util.Queue;
21   import java.util.Spliterator;
22   import java.util.concurrent.BlockingDeque;
23   import java.util.concurrent.BlockingQueue;
24 + import java.util.concurrent.ConcurrentLinkedQueue;
25   import java.util.concurrent.CountDownLatch;
26   import java.util.concurrent.Executors;
27   import java.util.concurrent.ExecutorService;
# Line 304 | Line 305 | public class Collection8Test extends JSR
305              switch (rnd.nextInt(4)) {
306              case 0: survivors.addAll(c); break;
307              case 1: survivors.addAll(Arrays.asList(c.toArray())); break;
308 <            case 2: c.forEach(e -> survivors.add(e)); break;
308 >            case 2: c.forEach(survivors::add); break;
309              case 3: for (Object e : c) survivors.add(e); break;
310              }
311              assertTrue(orig.containsAll(accepts));
# Line 353 | Line 354 | public class Collection8Test extends JSR
354          ArrayList tryAdvanced = new ArrayList();
355          ArrayList spliterated = new ArrayList();
356          ArrayList forEached = new ArrayList();
357 +        ArrayList streamForEached = new ArrayList();
358 +        ConcurrentLinkedQueue parallelStreamForEached = new ConcurrentLinkedQueue();
359          ArrayList removeIfed = new ArrayList();
360          for (Object x : c) iterated.add(x);
361 <        c.iterator().forEachRemaining(e -> iteratedForEachRemaining.add(e));
361 >        c.iterator().forEachRemaining(iteratedForEachRemaining::add);
362          for (Spliterator s = c.spliterator();
363 <             s.tryAdvance(e -> tryAdvanced.add(e)); ) {}
364 <        c.spliterator().forEachRemaining(e -> spliterated.add(e));
365 <        c.forEach(e -> forEached.add(e));
363 >             s.tryAdvance(tryAdvanced::add); ) {}
364 >        c.spliterator().forEachRemaining(spliterated::add);
365 >        c.forEach(forEached::add);
366 >        c.stream().forEach(streamForEached::add);
367 >        c.parallelStream().forEach(parallelStreamForEached::add);
368          c.removeIf(e -> { removeIfed.add(e); return false; });
369          boolean ordered =
370              c.spliterator().hasCharacteristics(Spliterator.ORDERED);
371          if (c instanceof List || c instanceof Deque)
372              assertTrue(ordered);
373 +        HashSet cset = new HashSet(c);
374 +        assertEquals(cset, new HashSet(parallelStreamForEached));
375          if (ordered) {
376              assertEquals(iterated, iteratedForEachRemaining);
377              assertEquals(iterated, tryAdvanced);
378              assertEquals(iterated, spliterated);
379              assertEquals(iterated, forEached);
380 +            assertEquals(iterated, streamForEached);
381              assertEquals(iterated, removeIfed);
382          } else {
375            HashSet cset = new HashSet(c);
383              assertEquals(cset, new HashSet(iterated));
384              assertEquals(cset, new HashSet(iteratedForEachRemaining));
385              assertEquals(cset, new HashSet(tryAdvanced));
386              assertEquals(cset, new HashSet(spliterated));
387              assertEquals(cset, new HashSet(forEached));
388 +            assertEquals(cset, new HashSet(streamForEached));
389              assertEquals(cset, new HashSet(removeIfed));
390          }
391          if (c instanceof Deque) {
# Line 545 | Line 553 | public class Collection8Test extends JSR
553          final AtomicBoolean done = new AtomicBoolean(false);
554          final Object one = impl.makeElement(1);
555          final Object two = impl.makeElement(2);
556 +        final Object[] emptyArray =
557 +            (Object[]) java.lang.reflect.Array.newInstance(one.getClass(), 0);
558          final List<Future<?>> futures;
559          final Phaser threadsStarted = new Phaser(1); // register this thread
560 <        final List<Runnable> tasks = List.<Runnable>of(
561 <            () -> c.forEach(x -> assertTrue(x == one || x == two)),
562 <            () -> c.stream().forEach(x -> assertTrue(x == one || x == two)),
560 >        final Consumer checkSanity = x -> assertTrue(x == one || x == two);
561 >        final Runnable[] frobbers = {
562 >            () -> c.forEach(checkSanity),
563 >            () -> c.stream().forEach(checkSanity),
564 >            () -> c.parallelStream().forEach(checkSanity),
565              () -> c.spliterator().trySplit(),
566              () -> {
567                  Spliterator s = c.spliterator();
568 <                s.tryAdvance(x -> assertTrue(x == one || x == two));
568 >                s.tryAdvance(checkSanity);
569                  s.trySplit();
570              },
571              () -> {
572                  Spliterator s = c.spliterator();
573 <                do {} while (s.tryAdvance(x -> assertTrue(x == one || x == two)));
562 <            },
563 <            () -> {
564 <                for (Object x : c) assertTrue(x == one || x == two);
573 >                do {} while (s.tryAdvance(checkSanity));
574              },
575 +            () -> { for (Object x : c) checkSanity.accept(x); },
576 +            () -> { for (Object x : c.toArray()) checkSanity.accept(x); },
577 +            () -> { for (Object x : c.toArray(emptyArray)) checkSanity.accept(x); },
578              () -> {
579                  assertTrue(c.add(one));
580                  assertTrue(c.contains(one));
# Line 574 | Line 586 | public class Collection8Test extends JSR
586                  assertTrue(c.contains(two));
587                  assertTrue(c.remove(two));
588                  assertFalse(c.contains(two));
589 <            })
590 <            .stream()
589 >            },
590 >        };
591 >        final List<Runnable> tasks =
592 >            Arrays.stream(frobbers)
593              .filter(task -> rnd.nextBoolean()) // random subset
594              .map(task -> (Runnable) () -> {
595                       threadsStarted.arriveAndAwaitAdvance();
# Line 587 | Line 601 | public class Collection8Test extends JSR
601          try (PoolCleaner cleaner = cleaner(pool, done)) {
602              threadsStarted.bulkRegister(tasks.size());
603              futures = tasks.stream()
604 <                .map(task -> pool.submit(task))
604 >                .map(pool::submit)
605                  .collect(Collectors.toList());
606              threadsStarted.arriveAndDeregister();
607              Thread.sleep(testDurationMillis);
# Line 596 | Line 610 | public class Collection8Test extends JSR
610              assertNull(future.get(0L, MILLISECONDS));
611      }
612  
613 +    /**
614 +     * Spliterators are either IMMUTABLE or truly late-binding or, if
615 +     * concurrent, use the same "late-binding style" of returning
616 +     * elements added between creation and first use.
617 +     */
618 +    public void testLateBindingStyle() {
619 +        if (!testImplementationDetails) return;
620 +        if (impl.klazz() == ArrayList.class) return; // for jdk8
621 +        // Immutable (snapshot) spliterators are exempt
622 +        if (impl.emptyCollection().spliterator()
623 +            .hasCharacteristics(Spliterator.IMMUTABLE))
624 +            return;
625 +        final Object one = impl.makeElement(1);
626 +        {
627 +            final Collection c = impl.emptyCollection();
628 +            final Spliterator split = c.spliterator();
629 +            c.add(one);
630 +            assertTrue(split.tryAdvance(e -> { assertSame(e, one); }));
631 +            assertFalse(split.tryAdvance(e -> { throw new AssertionError(); }));
632 +            assertTrue(c.contains(one));
633 +        }
634 +        {
635 +            final AtomicLong count = new AtomicLong(0);
636 +            final Collection c = impl.emptyCollection();
637 +            final Spliterator split = c.spliterator();
638 +            c.add(one);
639 +            split.forEachRemaining(
640 +                e -> { assertSame(e, one); count.getAndIncrement(); });
641 +            assertEquals(1L, count.get());
642 +            assertFalse(split.tryAdvance(e -> { throw new AssertionError(); }));
643 +            assertTrue(c.contains(one));
644 +        }
645 +    }
646 +
647   //     public void testCollection8DebugFail() {
648   //         fail(impl.klazz().getSimpleName());
649   //     }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines