ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/Collection8Test.java

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.47 by jsr166, Mon Aug 21 20:12:36 2017 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;
#	Line 57 | Line 59 | public class Collection8Test extends JSR
59
60		Object bomb() {
61		return new Object() {
62	<	public boolean equals(Object x) { throw new AssertionError(); }
63	<	public int hashCode() { throw new AssertionError(); }
64	<	};
62	>	public boolean equals(Object x) { throw new AssertionError(); }
63	>	public int hashCode() { throw new AssertionError(); }
64	>	};
65		}
66
67		/** Checks properties of empty collections. */
#	Line 138 | Line 140 | public class Collection8Test extends JSR
140		}
141		if (c instanceof BlockingQueue) {
142		BlockingQueue q = (BlockingQueue) c;
143	<	assertNull(q.poll(0L, MILLISECONDS));
143	>	assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
144		}
145		if (c instanceof BlockingDeque) {
146		BlockingDeque q = (BlockingDeque) c;
147	<	assertNull(q.pollFirst(0L, MILLISECONDS));
148	<	assertNull(q.pollLast(0L, MILLISECONDS));
147	>	assertNull(q.pollFirst(randomExpiredTimeout(), randomTimeUnit()));
148	>	assertNull(q.pollLast(randomExpiredTimeout(), randomTimeUnit()));
149		}
150		}
151
#	Line 304 | 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 341 | 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 352 | 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 {
375	–	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 396 | 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	+	}
545	+	try {
546	+	it2.forEachRemaining(iteratedForEachRemaining::add);
547	+	r2 = iteratedForEachRemaining;
548	+	} catch (ConcurrentModificationException ex) {
549	+	r2 = ConcurrentModificationException.class;
550	+	assertFalse(impl.isConcurrent());
551	+	}
552	+	assertEquals(r1, r2);
553	+	}
554	+
555	+	/**
556		* Calling Iterator#remove() after Iterator#forEachRemaining
557		* should (maybe) remove last element
558		*/
#	Line 534 | Line 691 | public class Collection8Test extends JSR
691		assertTrue(found.isEmpty());
692		}
693
694	+	/** TODO: promote to a common utility */
695	+	static <T> T chooseOne(T ... ts) {
696	+	return ts[ThreadLocalRandom.current().nextInt(ts.length)];
697	+	}
698	+
699	+	/** TODO: more random adders and removers */
700	+	static <E> Runnable adderRemover(Collection<E> c, E e) {
701	+	return chooseOne(
702	+	() -> {
703	+	assertTrue(c.add(e));
704	+	assertTrue(c.contains(e));
705	+	assertTrue(c.remove(e));
706	+	assertFalse(c.contains(e));
707	+	},
708	+	() -> {
709	+	assertTrue(c.add(e));
710	+	assertTrue(c.contains(e));
711	+	assertTrue(c.removeIf(x -> x == e));
712	+	assertFalse(c.contains(e));
713	+	},
714	+	() -> {
715	+	assertTrue(c.add(e));
716	+	assertTrue(c.contains(e));
717	+	for (Iterator it = c.iterator();; )
718	+	if (it.next() == e) {
719	+	try { it.remove(); }
720	+	catch (UnsupportedOperationException ok) {
721	+	c.remove(e);
722	+	}
723	+	break;
724	+	}
725	+	assertFalse(c.contains(e));
726	+	});
727	+	}
728	+
729	+	/**
730	+	* Concurrent Spliterators, once exhausted, stay exhausted.
731	+	*/
732	+	public void testStickySpliteratorExhaustion() throws Throwable {
733	+	if (!impl.isConcurrent()) return;
734	+	if (!testImplementationDetails) return;
735	+	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
736	+	final Consumer alwaysThrows = e -> { throw new AssertionError(); };
737	+	final Collection c = impl.emptyCollection();
738	+	final Spliterator s = c.spliterator();
739	+	if (rnd.nextBoolean()) {
740	+	assertFalse(s.tryAdvance(alwaysThrows));
741	+	} else {
742	+	s.forEachRemaining(alwaysThrows);
743	+	}
744	+	final Object one = impl.makeElement(1);
745	+	// Spliterator should not notice added element
746	+	c.add(one);
747	+	if (rnd.nextBoolean()) {
748	+	assertFalse(s.tryAdvance(alwaysThrows));
749	+	} else {
750	+	s.forEachRemaining(alwaysThrows);
751	+	}
752	+	}
753	+
754		/**
755		* Motley crew of threads concurrently randomly hammer the collection.
756		*/
#	Line 541 | Line 758 | public class Collection8Test extends JSR
758		if (!impl.isConcurrent()) return;
759		final ThreadLocalRandom rnd = ThreadLocalRandom.current();
760		final Collection c = impl.emptyCollection();
761	<	final long testDurationMillis = timeoutMillis();
761	>	final long testDurationMillis
762	>	= expensiveTests ? LONG_DELAY_MS : timeoutMillis();
763		final AtomicBoolean done = new AtomicBoolean(false);
764		final Object one = impl.makeElement(1);
765		final Object two = impl.makeElement(2);
766	+	final Consumer checkSanity = x -> assertTrue(x == one || x == two);
767	+	final Consumer<Object[]> checkArraySanity = array -> {
768	+	// assertTrue(array.length <= 2); // duplicates are permitted
769	+	for (Object x : array) assertTrue(x == one || x == two);
770	+	};
771	+	final Object[] emptyArray =
772	+	(Object[]) java.lang.reflect.Array.newInstance(one.getClass(), 0);
773		final List<Future<?>> futures;
774		final Phaser threadsStarted = new Phaser(1); // register this thread
775	<	final List<Runnable> tasks = List.<Runnable>of(
776	<	() -> c.forEach(x -> assertTrue(x == one || x == two)),
777	<	() -> c.stream().forEach(x -> assertTrue(x == one || x == two)),
775	>	final Runnable[] frobbers = {
776	>	() -> c.forEach(checkSanity),
777	>	() -> c.stream().forEach(checkSanity),
778	>	() -> c.parallelStream().forEach(checkSanity),
779		() -> c.spliterator().trySplit(),
780		() -> {
781		Spliterator s = c.spliterator();
782	<	s.tryAdvance(x -> assertTrue(x == one || x == two));
782	>	s.tryAdvance(checkSanity);
783		s.trySplit();
784		},
785		() -> {
786		Spliterator s = c.spliterator();
787	<	do {} while (s.tryAdvance(x -> assertTrue(x == one || x == two)));
562	<	},
563	<	() -> {
564	<	for (Object x : c) assertTrue(x == one || x == two);
565	<	},
566	<	() -> {
567	<	assertTrue(c.add(one));
568	<	assertTrue(c.contains(one));
569	<	assertTrue(c.remove(one));
570	<	assertFalse(c.contains(one));
787	>	do {} while (s.tryAdvance(checkSanity));
788		},
789	+	() -> { for (Object x : c) checkSanity.accept(x); },
790	+	() -> checkArraySanity.accept(c.toArray()),
791	+	() -> checkArraySanity.accept(c.toArray(emptyArray)),
792		() -> {
793	<	assertTrue(c.add(two));
794	<	assertTrue(c.contains(two));
795	<	assertTrue(c.remove(two));
796	<	assertFalse(c.contains(two));
797	<	})
798	<	.stream()
793	>	Object[] a = new Object[5];
794	>	Object three = impl.makeElement(3);
795	>	Arrays.fill(a, 0, a.length, three);
796	>	Object[] x = c.toArray(a);
797	>	if (x == a)
798	>	for (int i = 0; i < a.length && a[i] != null; i++)
799	>	checkSanity.accept(a[i]);
800	>	// A careful reading of the spec does not support:
801	>	// for (i++; i < a.length; i++) assertSame(three, a[i]);
802	>	else
803	>	checkArraySanity.accept(x);
804	>	},
805	>	adderRemover(c, one),
806	>	adderRemover(c, two),
807	>	};
808	>	final List<Runnable> tasks =
809	>	Arrays.stream(frobbers)
810		.filter(task -> rnd.nextBoolean()) // random subset
811		.map(task -> (Runnable) () -> {
812		threadsStarted.arriveAndAwaitAdvance();
#	Line 587 | Line 818 | public class Collection8Test extends JSR
818		try (PoolCleaner cleaner = cleaner(pool, done)) {
819		threadsStarted.bulkRegister(tasks.size());
820		futures = tasks.stream()
821	<	.map(task -> pool.submit(task))
821	>	.map(pool::submit)
822		.collect(Collectors.toList());
823		threadsStarted.arriveAndDeregister();
824		Thread.sleep(testDurationMillis);
#	Line 596 | Line 827 | public class Collection8Test extends JSR
827		assertNull(future.get(0L, MILLISECONDS));
828		}
829
830	+	/**
831	+	* Spliterators are either IMMUTABLE or truly late-binding or, if
832	+	* concurrent, use the same "late-binding style" of returning
833	+	* elements added between creation and first use.
834	+	*/
835	+	public void testLateBindingStyle() {
836	+	if (!testImplementationDetails) return;
837	+	if (impl.klazz() == ArrayList.class) return; // for jdk8
838	+	// Immutable (snapshot) spliterators are exempt
839	+	if (impl.emptyCollection().spliterator()
840	+	.hasCharacteristics(Spliterator.IMMUTABLE))
841	+	return;
842	+	final Object one = impl.makeElement(1);
843	+	{
844	+	final Collection c = impl.emptyCollection();
845	+	final Spliterator split = c.spliterator();
846	+	c.add(one);
847	+	assertTrue(split.tryAdvance(e -> { assertSame(e, one); }));
848	+	assertFalse(split.tryAdvance(e -> { throw new AssertionError(); }));
849	+	assertTrue(c.contains(one));
850	+	}
851	+	{
852	+	final AtomicLong count = new AtomicLong(0);
853	+	final Collection c = impl.emptyCollection();
854	+	final Spliterator split = c.spliterator();
855	+	c.add(one);
856	+	split.forEachRemaining(
857	+	e -> { assertSame(e, one); count.getAndIncrement(); });
858	+	assertEquals(1L, count.get());
859	+	assertFalse(split.tryAdvance(e -> { throw new AssertionError(); }));
860	+	assertTrue(c.contains(one));
861	+	}
862	+	}
863	+
864	+	/**
865	+	* Spliterator.getComparator throws IllegalStateException iff the
866	+	* spliterator does not report SORTED.
867	+	*/
868	+	public void testGetComparator_IllegalStateException() {
869	+	Collection c = impl.emptyCollection();
870	+	Spliterator s = c.spliterator();
871	+	boolean reportsSorted = s.hasCharacteristics(Spliterator.SORTED);
872	+	try {
873	+	s.getComparator();
874	+	assertTrue(reportsSorted);
875	+	} catch (IllegalStateException ex) {
876	+	assertFalse(reportsSorted);
877	+	}
878	+	}
879	+
880		//     public void testCollection8DebugFail() {
881		//         fail(impl.klazz().getSimpleName());
882		//     }

Diff Legend

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