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.25 by jsr166, Tue Nov 15 00:08:25 2016 UTC vs.
Revision 1.42 by jsr166, Mon Dec 12 20:49:34 2016 UTC

# Line 12 | Line 12 | import java.util.ArrayList;
12   import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.Collections;
15 + import java.util.ConcurrentModificationException;
16   import java.util.Deque;
17   import java.util.HashSet;
18   import java.util.Iterator;
# Line 21 | Line 22 | import java.util.Queue;
22   import java.util.Spliterator;
23   import java.util.concurrent.BlockingDeque;
24   import java.util.concurrent.BlockingQueue;
25 + import java.util.concurrent.ConcurrentLinkedQueue;
26   import java.util.concurrent.CountDownLatch;
27   import java.util.concurrent.Executors;
28   import java.util.concurrent.ExecutorService;
29   import java.util.concurrent.Future;
30 + import java.util.concurrent.Phaser;
31   import java.util.concurrent.ThreadLocalRandom;
32   import java.util.concurrent.atomic.AtomicBoolean;
33   import java.util.concurrent.atomic.AtomicLong;
34   import java.util.concurrent.atomic.AtomicReference;
35   import java.util.function.Consumer;
36   import java.util.function.Predicate;
37 + import java.util.stream.Collectors;
38  
39   import junit.framework.Test;
40  
# Line 302 | Line 306 | public class Collection8Test extends JSR
306              switch (rnd.nextInt(4)) {
307              case 0: survivors.addAll(c); break;
308              case 1: survivors.addAll(Arrays.asList(c.toArray())); break;
309 <            case 2: c.forEach(e -> survivors.add(e)); break;
309 >            case 2: c.forEach(survivors::add); break;
310              case 3: for (Object e : c) survivors.add(e); break;
311              }
312              assertTrue(orig.containsAll(accepts));
# Line 339 | Line 343 | public class Collection8Test extends JSR
343      }
344  
345      /**
346 +     * All elements removed in the middle of CONCURRENT traversal.
347 +     */
348 +    public void testElementRemovalDuringTraversal() {
349 +        Collection c = impl.emptyCollection();
350 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
351 +        int n = rnd.nextInt(6);
352 +        ArrayList copy = new ArrayList();
353 +        for (int i = 0; i < n; i++) {
354 +            Object x = impl.makeElement(i);
355 +            copy.add(x);
356 +            c.add(x);
357 +        }
358 +        ArrayList iterated = new ArrayList();
359 +        ArrayList spliterated = new ArrayList();
360 +        Spliterator s = c.spliterator();
361 +        Iterator it = c.iterator();
362 +        for (int i = rnd.nextInt(n + 1); --i >= 0; ) {
363 +            assertTrue(s.tryAdvance(spliterated::add));
364 +            if (rnd.nextBoolean()) assertTrue(it.hasNext());
365 +            iterated.add(it.next());
366 +        }
367 +        Consumer alwaysThrows = e -> { throw new AssertionError(); };
368 +        if (s.hasCharacteristics(Spliterator.CONCURRENT)) {
369 +            c.clear();          // TODO: many more removal methods
370 +            if (testImplementationDetails
371 +                && !(c instanceof java.util.concurrent.ArrayBlockingQueue)) {
372 +                if (rnd.nextBoolean())
373 +                    assertFalse(s.tryAdvance(alwaysThrows));
374 +                else
375 +                    s.forEachRemaining(alwaysThrows);
376 +            }
377 +            if (it.hasNext()) iterated.add(it.next());
378 +            if (rnd.nextBoolean()) assertIteratorExhausted(it);
379 +        }
380 +        assertTrue(copy.containsAll(iterated));
381 +        assertTrue(copy.containsAll(spliterated));
382 +    }
383 +
384 +    /**
385 +     * Some elements randomly disappear in the middle of traversal.
386 +     */
387 +    public void testRandomElementRemovalDuringTraversal() {
388 +        Collection c = impl.emptyCollection();
389 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
390 +        int n = rnd.nextInt(6);
391 +        ArrayList copy = new ArrayList();
392 +        for (int i = 0; i < n; i++) {
393 +            Object x = impl.makeElement(i);
394 +            copy.add(x);
395 +            c.add(x);
396 +        }
397 +        ArrayList iterated = new ArrayList();
398 +        ArrayList spliterated = new ArrayList();
399 +        ArrayList removed = new ArrayList();
400 +        Spliterator s = c.spliterator();
401 +        Iterator it = c.iterator();
402 +        if (! (s.hasCharacteristics(Spliterator.CONCURRENT) ||
403 +               s.hasCharacteristics(Spliterator.IMMUTABLE)))
404 +            return;
405 +        for (int i = rnd.nextInt(n + 1); --i >= 0; ) {
406 +            assertTrue(s.tryAdvance(e -> {}));
407 +            if (rnd.nextBoolean()) assertTrue(it.hasNext());
408 +            it.next();
409 +        }
410 +        Consumer alwaysThrows = e -> { throw new AssertionError(); };
411 +        // TODO: many more removal methods
412 +        if (rnd.nextBoolean()) {
413 +            for (Iterator z = c.iterator(); z.hasNext(); ) {
414 +                Object e = z.next();
415 +                if (rnd.nextBoolean()) {
416 +                    try {
417 +                        z.remove();
418 +                    } catch (UnsupportedOperationException ok) { return; }
419 +                    removed.add(e);
420 +                }
421 +            }
422 +        } else {
423 +            Predicate randomlyRemove = e -> {
424 +                if (rnd.nextBoolean()) { removed.add(e); return true; }
425 +                else return false;
426 +            };
427 +            c.removeIf(randomlyRemove);
428 +        }
429 +        s.forEachRemaining(spliterated::add);
430 +        while (it.hasNext())
431 +            iterated.add(it.next());
432 +        assertTrue(copy.containsAll(iterated));
433 +        assertTrue(copy.containsAll(spliterated));
434 +        assertTrue(copy.containsAll(removed));
435 +        if (s.hasCharacteristics(Spliterator.CONCURRENT)) {
436 +            ArrayList iteratedAndRemoved = new ArrayList(iterated);
437 +            ArrayList spliteratedAndRemoved = new ArrayList(spliterated);
438 +            iteratedAndRemoved.retainAll(removed);
439 +            spliteratedAndRemoved.retainAll(removed);
440 +            assertTrue(iteratedAndRemoved.size() <= 1);
441 +            assertTrue(spliteratedAndRemoved.size() <= 1);
442 +            if (testImplementationDetails
443 +                && !(c instanceof java.util.concurrent.ArrayBlockingQueue))
444 +                assertTrue(spliteratedAndRemoved.isEmpty());
445 +        }
446 +    }
447 +
448 +    /**
449       * Various ways of traversing a collection yield same elements
450       */
451 <    public void testIteratorEquivalence() {
451 >    public void testTraversalEquivalence() {
452          Collection c = impl.emptyCollection();
453          ThreadLocalRandom rnd = ThreadLocalRandom.current();
454          int n = rnd.nextInt(6);
# Line 350 | Line 457 | public class Collection8Test extends JSR
457          ArrayList iteratedForEachRemaining = new ArrayList();
458          ArrayList tryAdvanced = new ArrayList();
459          ArrayList spliterated = new ArrayList();
460 +        ArrayList splitonced = new ArrayList();
461          ArrayList forEached = new ArrayList();
462 +        ArrayList streamForEached = new ArrayList();
463 +        ConcurrentLinkedQueue parallelStreamForEached = new ConcurrentLinkedQueue();
464          ArrayList removeIfed = new ArrayList();
465          for (Object x : c) iterated.add(x);
466 <        c.iterator().forEachRemaining(e -> iteratedForEachRemaining.add(e));
466 >        c.iterator().forEachRemaining(iteratedForEachRemaining::add);
467          for (Spliterator s = c.spliterator();
468 <             s.tryAdvance(e -> tryAdvanced.add(e)); ) {}
469 <        c.spliterator().forEachRemaining(e -> spliterated.add(e));
470 <        c.forEach(e -> forEached.add(e));
468 >             s.tryAdvance(tryAdvanced::add); ) {}
469 >        c.spliterator().forEachRemaining(spliterated::add);
470 >        {                       // trySplit returns "strict prefix"
471 >            Spliterator s1 = c.spliterator(), s2 = s1.trySplit();
472 >            if (s2 != null) s2.forEachRemaining(splitonced::add);
473 >            s1.forEachRemaining(splitonced::add);
474 >        }
475 >        c.forEach(forEached::add);
476 >        c.stream().forEach(streamForEached::add);
477 >        c.parallelStream().forEach(parallelStreamForEached::add);
478          c.removeIf(e -> { removeIfed.add(e); return false; });
479          boolean ordered =
480              c.spliterator().hasCharacteristics(Spliterator.ORDERED);
481          if (c instanceof List || c instanceof Deque)
482              assertTrue(ordered);
483 +        HashSet cset = new HashSet(c);
484 +        assertEquals(cset, new HashSet(parallelStreamForEached));
485          if (ordered) {
486              assertEquals(iterated, iteratedForEachRemaining);
487              assertEquals(iterated, tryAdvanced);
488              assertEquals(iterated, spliterated);
489 +            assertEquals(iterated, splitonced);
490              assertEquals(iterated, forEached);
491 +            assertEquals(iterated, streamForEached);
492              assertEquals(iterated, removeIfed);
493          } else {
373            HashSet cset = new HashSet(c);
494              assertEquals(cset, new HashSet(iterated));
495              assertEquals(cset, new HashSet(iteratedForEachRemaining));
496              assertEquals(cset, new HashSet(tryAdvanced));
497              assertEquals(cset, new HashSet(spliterated));
498 +            assertEquals(cset, new HashSet(splitonced));
499              assertEquals(cset, new HashSet(forEached));
500 +            assertEquals(cset, new HashSet(streamForEached));
501              assertEquals(cset, new HashSet(removeIfed));
502          }
503          if (c instanceof Deque) {
# Line 394 | Line 516 | public class Collection8Test extends JSR
516      }
517  
518      /**
519 +     * Iterator.forEachRemaining has same behavior as Iterator's
520 +     * default implementation.
521 +     */
522 +    public void testForEachRemainingConsistentWithDefaultImplementation() {
523 +        Collection c = impl.emptyCollection();
524 +        if (!testImplementationDetails
525 +            || c.getClass() == java.util.LinkedList.class)
526 +            return;
527 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
528 +        int n = 1 + rnd.nextInt(3);
529 +        for (int i = 0; i < n; i++) c.add(impl.makeElement(i));
530 +        ArrayList iterated = new ArrayList();
531 +        ArrayList iteratedForEachRemaining = new ArrayList();
532 +        Iterator it1 = c.iterator();
533 +        Iterator it2 = c.iterator();
534 +        assertTrue(it1.hasNext());
535 +        assertTrue(it2.hasNext());
536 +        c.clear();
537 +        Object r1, r2;
538 +        try {
539 +            while (it1.hasNext()) iterated.add(it1.next());
540 +            r1 = iterated;
541 +        } catch (ConcurrentModificationException ex) {
542 +            r1 = ConcurrentModificationException.class;
543 +            assertFalse(impl.isConcurrent());
544 +        } catch (UnsupportedOperationException ex) {
545 +            r1 = UnsupportedOperationException.class;
546 +        }
547 +        try {
548 +            it2.forEachRemaining(iteratedForEachRemaining::add);
549 +            r2 = iteratedForEachRemaining;
550 +        } catch (ConcurrentModificationException ex) {
551 +            r2 = ConcurrentModificationException.class;
552 +        } catch (UnsupportedOperationException ex) {
553 +            r2 = UnsupportedOperationException.class;
554 +        }
555 +        if (!r1.equals(r2)) System.err.println(impl.klazz());
556 +        assertEquals(r1, r2);
557 +    }
558 +
559 +    /**
560       * Calling Iterator#remove() after Iterator#forEachRemaining
561       * should (maybe) remove last element
562       */
# Line 532 | Line 695 | public class Collection8Test extends JSR
695          assertTrue(found.isEmpty());
696      }
697  
698 <    public void testForEachConcurrentStressTest() throws Throwable {
698 >    /** TODO: promote to a common utility */
699 >    static <T> T chooseOne(T ... ts) {
700 >        return ts[ThreadLocalRandom.current().nextInt(ts.length)];
701 >    }
702 >
703 >    /** TODO: more random adders and removers */
704 >    static <E> Runnable adderRemover(Collection<E> c, E e) {
705 >        return chooseOne(
706 >            () -> {
707 >                assertTrue(c.add(e));
708 >                assertTrue(c.contains(e));
709 >                assertTrue(c.remove(e));
710 >                assertFalse(c.contains(e));
711 >            },
712 >            () -> {
713 >                assertTrue(c.add(e));
714 >                assertTrue(c.contains(e));
715 >                assertTrue(c.removeIf(x -> x == e));
716 >                assertFalse(c.contains(e));
717 >            },
718 >            () -> {
719 >                assertTrue(c.add(e));
720 >                assertTrue(c.contains(e));
721 >                for (Iterator it = c.iterator();; )
722 >                    if (it.next() == e) {
723 >                        try { it.remove(); }
724 >                        catch (UnsupportedOperationException ok) {
725 >                            c.remove(e);
726 >                        }
727 >                        break;
728 >                    }
729 >                assertFalse(c.contains(e));
730 >            });
731 >    }
732 >
733 >    /**
734 >     * Motley crew of threads concurrently randomly hammer the collection.
735 >     */
736 >    public void testDetectRaces() throws Throwable {
737          if (!impl.isConcurrent()) return;
738 +        final ThreadLocalRandom rnd = ThreadLocalRandom.current();
739          final Collection c = impl.emptyCollection();
740 <        final long testDurationMillis = timeoutMillis();
740 >        final long testDurationMillis
741 >            = expensiveTests ? LONG_DELAY_MS : timeoutMillis();
742          final AtomicBoolean done = new AtomicBoolean(false);
743 <        final Object elt = impl.makeElement(1);
744 <        final Future<?> f1, f2;
743 >        final Object one = impl.makeElement(1);
744 >        final Object two = impl.makeElement(2);
745 >        final Consumer checkSanity = x -> assertTrue(x == one || x == two);
746 >        final Consumer<Object[]> checkArraySanity = array -> {
747 >            // assertTrue(array.length <= 2); // duplicates are permitted
748 >            for (Object x : array) assertTrue(x == one || x == two);
749 >        };
750 >        final Object[] emptyArray =
751 >            (Object[]) java.lang.reflect.Array.newInstance(one.getClass(), 0);
752 >        final List<Future<?>> futures;
753 >        final Phaser threadsStarted = new Phaser(1); // register this thread
754 >        final Runnable[] frobbers = {
755 >            () -> c.forEach(checkSanity),
756 >            () -> c.stream().forEach(checkSanity),
757 >            () -> c.parallelStream().forEach(checkSanity),
758 >            () -> c.spliterator().trySplit(),
759 >            () -> {
760 >                Spliterator s = c.spliterator();
761 >                s.tryAdvance(checkSanity);
762 >                s.trySplit();
763 >            },
764 >            () -> {
765 >                Spliterator s = c.spliterator();
766 >                do {} while (s.tryAdvance(checkSanity));
767 >            },
768 >            () -> { for (Object x : c) checkSanity.accept(x); },
769 >            () -> checkArraySanity.accept(c.toArray()),
770 >            () -> checkArraySanity.accept(c.toArray(emptyArray)),
771 >            () -> {
772 >                Object[] a = new Object[5];
773 >                Object three = impl.makeElement(3);
774 >                Arrays.fill(a, 0, a.length, three);
775 >                Object[] x = c.toArray(a);
776 >                if (x == a)
777 >                    for (int i = 0; i < a.length && a[i] != null; i++)
778 >                        checkSanity.accept(a[i]);
779 >                    // A careful reading of the spec does not support:
780 >                    // for (i++; i < a.length; i++) assertSame(three, a[i]);
781 >                else
782 >                    checkArraySanity.accept(x);
783 >                },
784 >            adderRemover(c, one),
785 >            adderRemover(c, two),
786 >        };
787 >        final List<Runnable> tasks =
788 >            Arrays.stream(frobbers)
789 >            .filter(task -> rnd.nextBoolean()) // random subset
790 >            .map(task -> (Runnable) () -> {
791 >                     threadsStarted.arriveAndAwaitAdvance();
792 >                     while (!done.get())
793 >                         task.run();
794 >                 })
795 >            .collect(Collectors.toList());
796          final ExecutorService pool = Executors.newCachedThreadPool();
797          try (PoolCleaner cleaner = cleaner(pool, done)) {
798 <            final CountDownLatch threadsStarted = new CountDownLatch(2);
799 <            Runnable checkElt = () -> {
800 <                threadsStarted.countDown();
801 <                while (!done.get())
802 <                    c.forEach(x -> assertSame(x, elt)); };
549 <            Runnable addRemove = () -> {
550 <                threadsStarted.countDown();
551 <                while (!done.get()) {
552 <                    assertTrue(c.add(elt));
553 <                    assertTrue(c.remove(elt));
554 <                }};
555 <            f1 = pool.submit(checkElt);
556 <            f2 = pool.submit(addRemove);
798 >            threadsStarted.bulkRegister(tasks.size());
799 >            futures = tasks.stream()
800 >                .map(pool::submit)
801 >                .collect(Collectors.toList());
802 >            threadsStarted.arriveAndDeregister();
803              Thread.sleep(testDurationMillis);
804          }
805 <        assertNull(f1.get(0L, MILLISECONDS));
806 <        assertNull(f2.get(0L, MILLISECONDS));
805 >        for (Future future : futures)
806 >            assertNull(future.get(0L, MILLISECONDS));
807 >    }
808 >
809 >    /**
810 >     * Spliterators are either IMMUTABLE or truly late-binding or, if
811 >     * concurrent, use the same "late-binding style" of returning
812 >     * elements added between creation and first use.
813 >     */
814 >    public void testLateBindingStyle() {
815 >        if (!testImplementationDetails) return;
816 >        if (impl.klazz() == ArrayList.class) return; // for jdk8
817 >        // Immutable (snapshot) spliterators are exempt
818 >        if (impl.emptyCollection().spliterator()
819 >            .hasCharacteristics(Spliterator.IMMUTABLE))
820 >            return;
821 >        final Object one = impl.makeElement(1);
822 >        {
823 >            final Collection c = impl.emptyCollection();
824 >            final Spliterator split = c.spliterator();
825 >            c.add(one);
826 >            assertTrue(split.tryAdvance(e -> { assertSame(e, one); }));
827 >            assertFalse(split.tryAdvance(e -> { throw new AssertionError(); }));
828 >            assertTrue(c.contains(one));
829 >        }
830 >        {
831 >            final AtomicLong count = new AtomicLong(0);
832 >            final Collection c = impl.emptyCollection();
833 >            final Spliterator split = c.spliterator();
834 >            c.add(one);
835 >            split.forEachRemaining(
836 >                e -> { assertSame(e, one); count.getAndIncrement(); });
837 >            assertEquals(1L, count.get());
838 >            assertFalse(split.tryAdvance(e -> { throw new AssertionError(); }));
839 >            assertTrue(c.contains(one));
840 >        }
841 >    }
842 >
843 >    /**
844 >     * Spliterator.getComparator throws IllegalStateException iff the
845 >     * spliterator does not report SORTED.
846 >     */
847 >    public void testGetComparator_IllegalStateException() {
848 >        Collection c = impl.emptyCollection();
849 >        Spliterator s = c.spliterator();
850 >        boolean reportsSorted = s.hasCharacteristics(Spliterator.SORTED);
851 >        try {
852 >            s.getComparator();
853 >            assertTrue(reportsSorted);
854 >        } catch (IllegalStateException ex) {
855 >            assertFalse(reportsSorted);
856 >        }
857      }
858  
859   //     public void testCollection8DebugFail() {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines