ViewVC Help

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

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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.64 by jsr166, Sat Feb 28 19:59:23 2015 UTC vs.
Revision 1.74 by jsr166, Sun Oct 30 21:07:27 2016 UTC

#	Line 19 | Line 19 | import java.util.concurrent.BlockingQueu
19		import java.util.concurrent.CountDownLatch;
20		import java.util.concurrent.Executors;
21		import java.util.concurrent.ExecutorService;
22	+	import java.util.concurrent.ThreadLocalRandom;
23
24		import junit.framework.Test;
25
#	Line 37 | Line 38 | public class ArrayBlockingQueueTest exte
38		}
39
40		public static void main(String[] args) {
41	<	junit.textui.TestRunner.run(suite());
41	>	main(suite(), args);
42		}
43
44		public static Test suite() {
45	+	class Implementation implements CollectionImplementation {
46	+	public Class<?> klazz() { return ArrayBlockingQueue.class; }
47	+	public Collection emptyCollection() { return new ArrayBlockingQueue(SIZE, false); }
48	+	public Object makeElement(int i) { return i; }
49	+	public boolean isConcurrent() { return true; }
50	+	public boolean permitsNulls() { return false; }
51	+	}
52		return newTestSuite(ArrayBlockingQueueTest.class,
53		new Fair().testSuite(),
54	<	new NonFair().testSuite());
54	>	new NonFair().testSuite(),
55	>	CollectionTest.testSuite(new Implementation()));
56		}
57
58		/**
59		* Returns a new queue of given size containing consecutive
60	<	* Integers 0 ... n.
60	>	* Integers 0 ... n - 1.
61		*/
62		private ArrayBlockingQueue<Integer> populatedQueue(int n) {
63		ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
#	Line 58 | Line 67 | public class ArrayBlockingQueueTest exte
67		assertFalse(q.isEmpty());
68		assertEquals(0, q.remainingCapacity());
69		assertEquals(n, q.size());
70	+	assertEquals((Integer) 0, q.peek());
71		return q;
72		}
73
#	Line 104 | Line 114 | public class ArrayBlockingQueueTest exte
114		*/
115		public void testConstructor5() {
116		Integer[] ints = new Integer[SIZE];
117	<	for (int i = 0; i < SIZE-1; ++i)
117	>	for (int i = 0; i < SIZE - 1; ++i)
118		ints[i] = i;
119		Collection<Integer> elements = Arrays.asList(ints);
120		try {
#	Line 166 | Line 176 | public class ArrayBlockingQueueTest exte
176		assertEquals(i, q.remove());
177		}
178		for (int i = 0; i < SIZE; ++i) {
179	<	assertEquals(SIZE-i, q.remainingCapacity());
179	>	assertEquals(SIZE - i, q.remainingCapacity());
180		assertEquals(SIZE, q.size() + q.remainingCapacity());
181		assertTrue(q.add(i));
182		}
#	Line 214 | Line 224 | public class ArrayBlockingQueueTest exte
224		public void testAddAll3() {
225		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
226		Integer[] ints = new Integer[SIZE];
227	<	for (int i = 0; i < SIZE-1; ++i)
227	>	for (int i = 0; i < SIZE - 1; ++i)
228		ints[i] = new Integer(i);
229		try {
230		q.addAll(Arrays.asList(ints));
#	Line 451 | Line 461 | public class ArrayBlockingQueueTest exte
461		final CountDownLatch aboutToWait = new CountDownLatch(1);
462		Thread t = newStartedThread(new CheckedRunnable() {
463		public void realRun() throws InterruptedException {
464	+	long startTime = System.nanoTime();
465		for (int i = 0; i < SIZE; ++i) {
455	–	long t0 = System.nanoTime();
466		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
457	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
467		}
459	–	long t0 = System.nanoTime();
468		aboutToWait.countDown();
469		try {
470	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
470	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
471		shouldThrow();
472		} catch (InterruptedException success) {
473	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
473	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
474		}
475		}});
476
477	<	aboutToWait.await();
478	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
477	>	await(aboutToWait);
478	>	waitForThreadToEnterWaitState(t);
479		t.interrupt();
480	<	awaitTermination(t, MEDIUM_DELAY_MS);
480	>	awaitTermination(t);
481		checkEmpty(q);
482		}
483
#	Line 572 | Line 580 | public class ArrayBlockingQueueTest exte
580		assertTrue(changed);
581
582		assertTrue(q.containsAll(p));
583	<	assertEquals(SIZE-i, q.size());
583	>	assertEquals(SIZE - i, q.size());
584		p.remove();
585		}
586		}
#	Line 585 | Line 593 | public class ArrayBlockingQueueTest exte
593		ArrayBlockingQueue q = populatedQueue(SIZE);
594		ArrayBlockingQueue p = populatedQueue(i);
595		assertTrue(q.removeAll(p));
596	<	assertEquals(SIZE-i, q.size());
596	>	assertEquals(SIZE - i, q.size());
597		for (int j = 0; j < i; ++j) {
598		Integer x = (Integer)(p.remove());
599		assertFalse(q.contains(x));
#	Line 593 | Line 601 | public class ArrayBlockingQueueTest exte
601		}
602		}
603
604	<	void checkToArray(ArrayBlockingQueue q) {
604	>	void checkToArray(ArrayBlockingQueue<Integer> q) {
605		int size = q.size();
606	<	Object[] o = q.toArray();
607	<	assertEquals(size, o.length);
606	>	Object[] a1 = q.toArray();
607	>	assertEquals(size, a1.length);
608	>	Integer[] a2 = q.toArray(new Integer[0]);
609	>	assertEquals(size, a2.length);
610	>	Integer[] a3 = q.toArray(new Integer[Math.max(0, size - 1)]);
611	>	assertEquals(size, a3.length);
612	>	Integer[] a4 = new Integer[size];
613	>	assertSame(a4, q.toArray(a4));
614	>	Integer[] a5 = new Integer[size + 1];
615	>	Arrays.fill(a5, 42);
616	>	assertSame(a5, q.toArray(a5));
617	>	Integer[] a6 = new Integer[size + 2];
618	>	Arrays.fill(a6, 42);
619	>	assertSame(a6, q.toArray(a6));
620	>	Object[][] as = { a1, a2, a3, a4, a5, a6 };
621	>	for (Object[] a : as) {
622	>	if (a.length > size) assertNull(a[size]);
623	>	if (a.length > size + 1) assertEquals(42, a[size + 1]);
624	>	}
625		Iterator it = q.iterator();
626	+	Integer s = q.peek();
627		for (int i = 0; i < size; i++) {
628		Integer x = (Integer) it.next();
629	<	assertEquals((Integer)o[0] + i, (int) x);
630	<	assertSame(o[i], x);
629	>	assertEquals(s + i, (int) x);
630	>	for (Object[] a : as)
631	>	assertSame(a1[i], x);
632		}
633		}
634
635		/**
636	<	* toArray() contains all elements in FIFO order
636	>	* toArray() and toArray(a) contain all elements in FIFO order
637		*/
638		public void testToArray() {
639	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
640	<	for (int i = 0; i < SIZE; i++) {
639	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
640	>	final int size = rnd.nextInt(6);
641	>	final int capacity = Math.max(1, size + rnd.nextInt(size + 1));
642	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
643	>	for (int i = 0; i < size; i++) {
644		checkToArray(q);
645		q.add(i);
646		}
647		// Provoke wraparound
648	<	for (int i = 0; i < SIZE; i++) {
648	>	int added = size * 2;
649	>	for (int i = 0; i < added; i++) {
650		checkToArray(q);
651	<	assertEquals(i, q.poll());
652	<	checkToArray(q);
622	<	q.add(SIZE+i);
623	<	}
624	<	for (int i = 0; i < SIZE; i++) {
625	<	checkToArray(q);
626	<	assertEquals(SIZE+i, q.poll());
651	>	assertEquals((Integer) i, q.poll());
652	>	q.add(size + i);
653		}
628	–	}
629	–
630	–	void checkToArray2(ArrayBlockingQueue q) {
631	–	int size = q.size();
632	–	Integer[] a1 = size == 0 ? null : new Integer[size-1];
633	–	Integer[] a2 = new Integer[size];
634	–	Integer[] a3 = new Integer[size+2];
635	–	if (size > 0) Arrays.fill(a1, 42);
636	–	Arrays.fill(a2, 42);
637	–	Arrays.fill(a3, 42);
638	–	Integer[] b1 = size == 0 ? null : (Integer[]) q.toArray(a1);
639	–	Integer[] b2 = (Integer[]) q.toArray(a2);
640	–	Integer[] b3 = (Integer[]) q.toArray(a3);
641	–	assertSame(a2, b2);
642	–	assertSame(a3, b3);
643	–	Iterator it = q.iterator();
654		for (int i = 0; i < size; i++) {
655	<	Integer x = (Integer) it.next();
656	<	assertSame(b1[i], x);
647	<	assertEquals(b1[0] + i, (int) x);
648	<	assertSame(b2[i], x);
649	<	assertSame(b3[i], x);
650	<	}
651	<	assertNull(a3[size]);
652	<	assertEquals(42, (int) a3[size+1]);
653	<	if (size > 0) {
654	<	assertNotSame(a1, b1);
655	<	assertEquals(size, b1.length);
656	<	for (int i = 0; i < a1.length; i++) {
657	<	assertEquals(42, (int) a1[i]);
658	<	}
659	<	}
660	<	}
661	<
662	<	/**
663	<	* toArray(a) contains all elements in FIFO order
664	<	*/
665	<	public void testToArray2() {
666	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
667	<	for (int i = 0; i < SIZE; i++) {
668	<	checkToArray2(q);
669	<	q.add(i);
670	<	}
671	<	// Provoke wraparound
672	<	for (int i = 0; i < SIZE; i++) {
673	<	checkToArray2(q);
674	<	assertEquals(i, q.poll());
675	<	checkToArray2(q);
676	<	q.add(SIZE+i);
677	<	}
678	<	for (int i = 0; i < SIZE; i++) {
679	<	checkToArray2(q);
680	<	assertEquals(SIZE+i, q.poll());
655	>	checkToArray(q);
656	>	assertEquals((Integer) (added + i), q.poll());
657		}
658		}
659
660		/**
661		* toArray(incompatible array type) throws ArrayStoreException
662		*/
663	<	public void testToArray1_BadArg() {
663	>	public void testToArray_incompatibleArrayType() {
664		ArrayBlockingQueue q = populatedQueue(SIZE);
665		try {
666		q.toArray(new String[10]);
667		shouldThrow();
668		} catch (ArrayStoreException success) {}
669	+	try {
670	+	q.toArray(new String[0]);
671	+	shouldThrow();
672	+	} catch (ArrayStoreException success) {}
673		}
674
675		/**
#	Line 788 | Line 768 | public class ArrayBlockingQueueTest exte
768		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
769		q.add(one);
770		q.add(two);
791	–	ExecutorService executor = Executors.newFixedThreadPool(2);
771		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
772	<	executor.execute(new CheckedRunnable() {
773	<	public void realRun() throws InterruptedException {
774	<	assertFalse(q.offer(three));
775	<	threadsStarted.await();
776	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
777	<	assertEquals(0, q.remainingCapacity());
778	<	}});
779	<
780	<	executor.execute(new CheckedRunnable() {
781	<	public void realRun() throws InterruptedException {
782	<	threadsStarted.await();
783	<	assertEquals(0, q.remainingCapacity());
784	<	assertSame(one, q.take());
785	<	}});
786	<
787	<	joinPool(executor);
772	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
773	>	try (PoolCleaner cleaner = cleaner(executor)) {
774	>	executor.execute(new CheckedRunnable() {
775	>	public void realRun() throws InterruptedException {
776	>	assertFalse(q.offer(three));
777	>	threadsStarted.await();
778	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
779	>	assertEquals(0, q.remainingCapacity());
780	>	}});
781	>
782	>	executor.execute(new CheckedRunnable() {
783	>	public void realRun() throws InterruptedException {
784	>	threadsStarted.await();
785	>	assertEquals(0, q.remainingCapacity());
786	>	assertSame(one, q.take());
787	>	}});
788	>	}
789		}
790
791		/**
#	Line 814 | Line 794 | public class ArrayBlockingQueueTest exte
794		public void testPollInExecutor() {
795		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
796		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
797	<	ExecutorService executor = Executors.newFixedThreadPool(2);
798	<	executor.execute(new CheckedRunnable() {
799	<	public void realRun() throws InterruptedException {
800	<	assertNull(q.poll());
801	<	threadsStarted.await();
802	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
803	<	checkEmpty(q);
804	<	}});
805	<
806	<	executor.execute(new CheckedRunnable() {
807	<	public void realRun() throws InterruptedException {
808	<	threadsStarted.await();
809	<	q.put(one);
810	<	}});
811	<
812	<	joinPool(executor);
797	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
798	>	try (PoolCleaner cleaner = cleaner(executor)) {
799	>	executor.execute(new CheckedRunnable() {
800	>	public void realRun() throws InterruptedException {
801	>	assertNull(q.poll());
802	>	threadsStarted.await();
803	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
804	>	checkEmpty(q);
805	>	}});
806	>
807	>	executor.execute(new CheckedRunnable() {
808	>	public void realRun() throws InterruptedException {
809	>	threadsStarted.await();
810	>	q.put(one);
811	>	}});
812	>	}
813		}
814
815		/**
#	Line 881 | Line 861 | public class ArrayBlockingQueueTest exte
861		final ArrayBlockingQueue q = populatedQueue(SIZE);
862		Thread t = new Thread(new CheckedRunnable() {
863		public void realRun() throws InterruptedException {
864	<	q.put(new Integer(SIZE+1));
864	>	q.put(new Integer(SIZE + 1));
865		}});
866
867		t.start();
#	Line 898 | Line 878 | public class ArrayBlockingQueueTest exte
878		* drainTo(c, n) empties first min(n, size) elements of queue into c
879		*/
880		public void testDrainToN() {
881	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
881	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE * 2);
882		for (int i = 0; i < SIZE + 2; ++i) {
883		for (int j = 0; j < SIZE; j++)
884		assertTrue(q.offer(new Integer(j)));
#	Line 906 | Line 886 | public class ArrayBlockingQueueTest exte
886		q.drainTo(l, i);
887		int k = (i < SIZE) ? i : SIZE;
888		assertEquals(k, l.size());
889	<	assertEquals(SIZE-k, q.size());
889	>	assertEquals(SIZE - k, q.size());
890		for (int j = 0; j < k; ++j)
891		assertEquals(l.get(j), new Integer(j));
892		do {} while (q.poll() != null);

Diff Legend

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