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.29 by jsr166, Tue Nov 22 01:08:14 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 545 | Line 545 | public class Collection8Test extends JSR
545		final AtomicBoolean done = new AtomicBoolean(false);
546		final Object one = impl.makeElement(1);
547		final Object two = impl.makeElement(2);
548	+	final Object[] emptyArray =
549	+	(Object[]) java.lang.reflect.Array.newInstance(one.getClass(), 0);
550		final List<Future<?>> futures;
551		final Phaser threadsStarted = new Phaser(1); // register this thread
552	<	final List<Runnable> tasks = List.<Runnable>of(
552	>	final Runnable[] frobbers = {
553		() -> c.forEach(x -> assertTrue(x == one || x == two)),
554		() -> c.stream().forEach(x -> assertTrue(x == one || x == two)),
555		() -> c.spliterator().trySplit(),
#	Line 564 | Line 566 | public class Collection8Test extends JSR
566		for (Object x : c) assertTrue(x == one || x == two);
567		},
568		() -> {
569	+	for (Object x : c.toArray()) assertTrue(x == one || x == two);
570	+	},
571	+	() -> {
572	+	for (Object x : c.toArray(emptyArray)) assertTrue(x == one || x == two);
573	+	},
574	+	() -> {
575		assertTrue(c.add(one));
576		assertTrue(c.contains(one));
577		assertTrue(c.remove(one));
#	Line 574 | Line 582 | public class Collection8Test extends JSR
582		assertTrue(c.contains(two));
583		assertTrue(c.remove(two));
584		assertFalse(c.contains(two));
585	<	})
586	<	.stream()
585	>	},
586	>	};
587	>	final List<Runnable> tasks =
588	>	Arrays.stream(frobbers)
589		.filter(task -> rnd.nextBoolean()) // random subset
590		.map(task -> (Runnable) () -> {
591		threadsStarted.arriveAndAwaitAdvance();
#	Line 587 | Line 597 | public class Collection8Test extends JSR
597		try (PoolCleaner cleaner = cleaner(pool, done)) {
598		threadsStarted.bulkRegister(tasks.size());
599		futures = tasks.stream()
600	<	.map(task -> pool.submit(task))
600	>	.map(pool::submit)
601		.collect(Collectors.toList());
602		threadsStarted.arriveAndDeregister();
603		Thread.sleep(testDurationMillis);

Diff Legend

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