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.35 by jsr166, Mon Nov 28 17:53:59 2016 UTC vs.
Revision 1.41 by jsr166, Mon Dec 12 03:50:15 2016 UTC

#	Line 342 | Line 342 | public class Collection8Test extends JSR
342		}
343
344		/**
345	+	* All elements removed in the middle of CONCURRENT traversal.
346	+	*/
347	+	public void testElementRemovalDuringTraversal() {
348	+	Collection c = impl.emptyCollection();
349	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
350	+	int n = rnd.nextInt(6);
351	+	ArrayList copy = new ArrayList();
352	+	for (int i = 0; i < n; i++) {
353	+	Object x = impl.makeElement(i);
354	+	copy.add(x);
355	+	c.add(x);
356	+	}
357	+	ArrayList iterated = new ArrayList();
358	+	ArrayList spliterated = new ArrayList();
359	+	Spliterator s = c.spliterator();
360	+	Iterator it = c.iterator();
361	+	for (int i = rnd.nextInt(n + 1); --i >= 0; ) {
362	+	assertTrue(s.tryAdvance(spliterated::add));
363	+	if (rnd.nextBoolean()) assertTrue(it.hasNext());
364	+	iterated.add(it.next());
365	+	}
366	+	Consumer alwaysThrows = e -> { throw new AssertionError(); };
367	+	if (s.hasCharacteristics(Spliterator.CONCURRENT)) {
368	+	c.clear();          // TODO: many more removal methods
369	+	if (testImplementationDetails
370	+	&& !(c instanceof java.util.concurrent.ArrayBlockingQueue)) {
371	+	if (rnd.nextBoolean())
372	+	assertFalse(s.tryAdvance(alwaysThrows));
373	+	else
374	+	s.forEachRemaining(alwaysThrows);
375	+	}
376	+	if (it.hasNext()) iterated.add(it.next());
377	+	if (rnd.nextBoolean()) assertIteratorExhausted(it);
378	+	}
379	+	assertTrue(copy.containsAll(iterated));
380	+	assertTrue(copy.containsAll(spliterated));
381	+	}
382	+
383	+	/**
384	+	* Some elements randomly disappear in the middle of traversal.
385	+	*/
386	+	public void testRandomElementRemovalDuringTraversal() {
387	+	Collection c = impl.emptyCollection();
388	+	ThreadLocalRandom rnd = ThreadLocalRandom.current();
389	+	int n = rnd.nextInt(6);
390	+	ArrayList copy = new ArrayList();
391	+	for (int i = 0; i < n; i++) {
392	+	Object x = impl.makeElement(i);
393	+	copy.add(x);
394	+	c.add(x);
395	+	}
396	+	ArrayList iterated = new ArrayList();
397	+	ArrayList spliterated = new ArrayList();
398	+	ArrayList removed = new ArrayList();
399	+	Spliterator s = c.spliterator();
400	+	Iterator it = c.iterator();
401	+	if (! (s.hasCharacteristics(Spliterator.CONCURRENT) ||
402	+	s.hasCharacteristics(Spliterator.IMMUTABLE)))
403	+	return;
404	+	for (int i = rnd.nextInt(n + 1); --i >= 0; ) {
405	+	assertTrue(s.tryAdvance(e -> {}));
406	+	if (rnd.nextBoolean()) assertTrue(it.hasNext());
407	+	it.next();
408	+	}
409	+	Consumer alwaysThrows = e -> { throw new AssertionError(); };
410	+	// TODO: many more removal methods
411	+	if (rnd.nextBoolean()) {
412	+	for (Iterator z = c.iterator(); z.hasNext(); ) {
413	+	Object e = z.next();
414	+	if (rnd.nextBoolean()) {
415	+	try {
416	+	z.remove();
417	+	} catch (UnsupportedOperationException ok) { return; }
418	+	removed.add(e);
419	+	}
420	+	}
421	+	} else {
422	+	Predicate randomlyRemove = e -> {
423	+	if (rnd.nextBoolean()) { removed.add(e); return true; }
424	+	else return false;
425	+	};
426	+	c.removeIf(randomlyRemove);
427	+	}
428	+	s.forEachRemaining(spliterated::add);
429	+	while (it.hasNext())
430	+	iterated.add(it.next());
431	+	assertTrue(copy.containsAll(iterated));
432	+	assertTrue(copy.containsAll(spliterated));
433	+	assertTrue(copy.containsAll(removed));
434	+	if (s.hasCharacteristics(Spliterator.CONCURRENT)) {
435	+	ArrayList iteratedAndRemoved = new ArrayList(iterated);
436	+	ArrayList spliteratedAndRemoved = new ArrayList(spliterated);
437	+	iteratedAndRemoved.retainAll(removed);
438	+	spliteratedAndRemoved.retainAll(removed);
439	+	assertTrue(iteratedAndRemoved.size() <= 1);
440	+	assertTrue(spliteratedAndRemoved.size() <= 1);
441	+	if (testImplementationDetails
442	+	&& !(c instanceof java.util.concurrent.ArrayBlockingQueue))
443	+	assertTrue(spliteratedAndRemoved.isEmpty());
444	+	}
445	+	}
446	+
447	+	/**
448		* Various ways of traversing a collection yield same elements
449		*/
450	<	public void testIteratorEquivalence() {
450	>	public void testTraversalEquivalence() {
451		Collection c = impl.emptyCollection();
452		ThreadLocalRandom rnd = ThreadLocalRandom.current();
453		int n = rnd.nextInt(6);
#	Line 550 | Line 653 | public class Collection8Test extends JSR
653		assertTrue(found.isEmpty());
654		}
655
656	+	/** TODO: promote to a common utility */
657	+	static <T> T chooseOne(T ... ts) {
658	+	return ts[ThreadLocalRandom.current().nextInt(ts.length)];
659	+	}
660	+
661	+	/** TODO: more random adders and removers */
662	+	static <E> Runnable adderRemover(Collection<E> c, E e) {
663	+	return chooseOne(
664	+	() -> {
665	+	assertTrue(c.add(e));
666	+	assertTrue(c.contains(e));
667	+	assertTrue(c.remove(e));
668	+	assertFalse(c.contains(e));
669	+	},
670	+	() -> {
671	+	assertTrue(c.add(e));
672	+	assertTrue(c.contains(e));
673	+	assertTrue(c.removeIf(x -> x == e));
674	+	assertFalse(c.contains(e));
675	+	},
676	+	() -> {
677	+	assertTrue(c.add(e));
678	+	assertTrue(c.contains(e));
679	+	for (Iterator it = c.iterator();; )
680	+	if (it.next() == e) {
681	+	try { it.remove(); }
682	+	catch (UnsupportedOperationException ok) {
683	+	c.remove(e);
684	+	}
685	+	break;
686	+	}
687	+	assertFalse(c.contains(e));
688	+	});
689	+	}
690	+
691		/**
692		* Motley crew of threads concurrently randomly hammer the collection.
693		*/
#	Line 563 | Line 701 | public class Collection8Test extends JSR
701		final Object one = impl.makeElement(1);
702		final Object two = impl.makeElement(2);
703		final Consumer checkSanity = x -> assertTrue(x == one || x == two);
704	+	final Consumer<Object[]> checkArraySanity = array -> {
705	+	// assertTrue(array.length <= 2); // duplicates are permitted
706	+	for (Object x : array) assertTrue(x == one || x == two);
707	+	};
708		final Object[] emptyArray =
709		(Object[]) java.lang.reflect.Array.newInstance(one.getClass(), 0);
710		final List<Future<?>> futures;
#	Line 582 | Line 724 | public class Collection8Test extends JSR
724		do {} while (s.tryAdvance(checkSanity));
725		},
726		() -> { for (Object x : c) checkSanity.accept(x); },
727	<	() -> { for (Object x : c.toArray()) checkSanity.accept(x); },
728	<	() -> { for (Object x : c.toArray(emptyArray)) checkSanity.accept(x); },
727	>	() -> checkArraySanity.accept(c.toArray()),
728	>	() -> checkArraySanity.accept(c.toArray(emptyArray)),
729		() -> {
730	<	assertTrue(c.add(one));
731	<	assertTrue(c.contains(one));
732	<	assertTrue(c.remove(one));
733	<	assertFalse(c.contains(one));
734	<	},
735	<	() -> {
736	<	assertTrue(c.add(two));
737	<	assertTrue(c.contains(two));
738	<	assertTrue(c.remove(two));
739	<	assertFalse(c.contains(two));
740	<	},
730	>	Object[] a = new Object[5];
731	>	Object three = impl.makeElement(3);
732	>	Arrays.fill(a, 0, a.length, three);
733	>	Object[] x = c.toArray(a);
734	>	if (x == a)
735	>	for (int i = 0; i < a.length && a[i] != null; i++)
736	>	checkSanity.accept(a[i]);
737	>	// A careful reading of the spec does not support:
738	>	// for (i++; i < a.length; i++) assertSame(three, a[i]);
739	>	else
740	>	checkArraySanity.accept(x);
741	>	},
742	>	adderRemover(c, one),
743	>	adderRemover(c, two),
744		};
745		final List<Runnable> tasks =
746		Arrays.stream(frobbers)
#	Line 653 | Line 798 | public class Collection8Test extends JSR
798		}
799		}
800
801	+	/**
802	+	* Spliterator.getComparator throws IllegalStateException iff the
803	+	* spliterator does not report SORTED.
804	+	*/
805	+	public void testGetComparator_IllegalStateException() {
806	+	Collection c = impl.emptyCollection();
807	+	Spliterator s = c.spliterator();
808	+	boolean reportsSorted = s.hasCharacteristics(Spliterator.SORTED);
809	+	try {
810	+	s.getComparator();
811	+	assertTrue(reportsSorted);
812	+	} catch (IllegalStateException ex) {
813	+	assertFalse(reportsSorted);
814	+	}
815	+	}
816	+
817		//     public void testCollection8DebugFail() {
818		//         fail(impl.klazz().getSimpleName());
819		//     }

Diff Legend

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