ViewVC Help

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

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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.46 by jsr166, Tue May 31 16:16:24 2011 UTC vs.
Revision 1.70 by jsr166, Tue Nov 22 16:48:36 2016 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
10	<	import java.util.Arrays;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>
11		import java.util.ArrayList;
12	+	import java.util.Arrays;
13		import java.util.Collection;
14		import java.util.Comparator;
15		import java.util.Iterator;
16		import java.util.NoSuchElementException;
17		import java.util.Queue;
17	–	import java.util.concurrent.PriorityBlockingQueue;
18		import java.util.concurrent.BlockingQueue;
19		import java.util.concurrent.CountDownLatch;
20		import java.util.concurrent.Executors;
21		import java.util.concurrent.ExecutorService;
22	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
22	>	import java.util.concurrent.PriorityBlockingQueue;
23	>
24	>	import junit.framework.Test;
25
26		public class PriorityBlockingQueueTest extends JSR166TestCase {
27
#	Line 31 | Line 33 | public class PriorityBlockingQueueTest e
33
34		public static class InitialCapacity extends BlockingQueueTest {
35		protected BlockingQueue emptyCollection() {
36	<	return new PriorityBlockingQueue(20);
36	>	return new PriorityBlockingQueue(SIZE);
37		}
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 PriorityBlockingQueue.class; }
47	+	public Collection emptyCollection() { return new PriorityBlockingQueue(); }
48	+	public Object makeElement(int i) { return i; }
49	+	public boolean isConcurrent() { return true; }
50	+	public boolean permitsNulls() { return false; }
51	+	}
52		return newTestSuite(PriorityBlockingQueueTest.class,
53		new Generic().testSuite(),
54	<	new InitialCapacity().testSuite());
54	>	new InitialCapacity().testSuite(),
55	>	CollectionTest.testSuite(new Implementation()));
56		}
57
48	–	private static final int NOCAP = Integer.MAX_VALUE;
49	–
58		/** Sample Comparator */
59		static class MyReverseComparator implements Comparator {
60		public int compare(Object x, Object y) {
#	Line 55 | Line 63 | public class PriorityBlockingQueueTest e
63		}
64
65		/**
66	<	* Create a queue of given size containing consecutive
67	<	* Integers 0 ... n.
66	>	* Returns a new queue of given size containing consecutive
67	>	* Integers 0 ... n - 1.
68		*/
69		private PriorityBlockingQueue<Integer> populatedQueue(int n) {
70		PriorityBlockingQueue<Integer> q =
71		new PriorityBlockingQueue<Integer>(n);
72		assertTrue(q.isEmpty());
73	<	for (int i = n-1; i >= 0; i-=2)
73	>	for (int i = n - 1; i >= 0; i -= 2)
74		assertTrue(q.offer(new Integer(i)));
75	<	for (int i = (n & 1); i < n; i+=2)
75	>	for (int i = (n & 1); i < n; i += 2)
76		assertTrue(q.offer(new Integer(i)));
77		assertFalse(q.isEmpty());
78	<	assertEquals(NOCAP, q.remainingCapacity());
78	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
79		assertEquals(n, q.size());
80	+	assertEquals((Integer) 0, q.peek());
81		return q;
82		}
83
#	Line 76 | Line 85 | public class PriorityBlockingQueueTest e
85		* A new queue has unbounded capacity
86		*/
87		public void testConstructor1() {
88	<	assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
88	>	assertEquals(Integer.MAX_VALUE,
89	>	new PriorityBlockingQueue(SIZE).remainingCapacity());
90		}
91
92		/**
#	Line 115 | Line 125 | public class PriorityBlockingQueueTest e
125		*/
126		public void testConstructor5() {
127		Integer[] ints = new Integer[SIZE];
128	<	for (int i = 0; i < SIZE-1; ++i)
128	>	for (int i = 0; i < SIZE - 1; ++i)
129		ints[i] = i;
130		Collection<Integer> elements = Arrays.asList(ints);
131		try {
#	Line 147 | Line 157 | public class PriorityBlockingQueueTest e
157		for (int i = 0; i < SIZE; ++i)
158		ints[i] = new Integer(i);
159		q.addAll(Arrays.asList(ints));
160	<	for (int i = SIZE-1; i >= 0; --i)
160	>	for (int i = SIZE - 1; i >= 0; --i)
161		assertEquals(ints[i], q.poll());
162		}
163
#	Line 157 | Line 167 | public class PriorityBlockingQueueTest e
167		public void testEmpty() {
168		PriorityBlockingQueue q = new PriorityBlockingQueue(2);
169		assertTrue(q.isEmpty());
170	<	assertEquals(NOCAP, q.remainingCapacity());
170	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
171		q.add(one);
172		assertFalse(q.isEmpty());
173		q.add(two);
#	Line 167 | Line 177 | public class PriorityBlockingQueueTest e
177		}
178
179		/**
180	<	* remainingCapacity does not change when elements added or removed,
171	<	* but size does
180	>	* remainingCapacity() always returns Integer.MAX_VALUE
181		*/
182		public void testRemainingCapacity() {
183	<	PriorityBlockingQueue q = populatedQueue(SIZE);
183	>	BlockingQueue q = populatedQueue(SIZE);
184		for (int i = 0; i < SIZE; ++i) {
185	<	assertEquals(NOCAP, q.remainingCapacity());
186	<	assertEquals(SIZE-i, q.size());
187	<	q.remove();
185	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
186	>	assertEquals(SIZE - i, q.size());
187	>	assertEquals(i, q.remove());
188		}
189		for (int i = 0; i < SIZE; ++i) {
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191		assertEquals(i, q.size());
192	<	q.add(new Integer(i));
192	>	assertTrue(q.add(i));
193		}
194		}
195
#	Line 197 | Line 206 | public class PriorityBlockingQueueTest e
206		* Offer of non-Comparable throws CCE
207		*/
208		public void testOfferNonComparable() {
209	+	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
210		try {
201	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
202	–	q.offer(new Object());
203	–	q.offer(new Object());
211		q.offer(new Object());
212		shouldThrow();
213	<	} catch (ClassCastException success) {}
213	>	} catch (ClassCastException success) {
214	>	assertTrue(q.isEmpty());
215	>	assertEquals(0, q.size());
216	>	assertNull(q.poll());
217	>	}
218		}
219
220		/**
#	Line 221 | Line 232 | public class PriorityBlockingQueueTest e
232		* addAll(this) throws IAE
233		*/
234		public void testAddAllSelf() {
235	+	PriorityBlockingQueue q = populatedQueue(SIZE);
236		try {
225	–	PriorityBlockingQueue q = populatedQueue(SIZE);
237		q.addAll(q);
238		shouldThrow();
239		} catch (IllegalArgumentException success) {}
#	Line 233 | Line 244 | public class PriorityBlockingQueueTest e
244		* possibly adding some elements
245		*/
246		public void testAddAll3() {
247	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
248	+	Integer[] ints = new Integer[SIZE];
249	+	for (int i = 0; i < SIZE - 1; ++i)
250	+	ints[i] = new Integer(i);
251		try {
237	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
238	–	Integer[] ints = new Integer[SIZE];
239	–	for (int i = 0; i < SIZE-1; ++i)
240	–	ints[i] = new Integer(i);
252		q.addAll(Arrays.asList(ints));
253		shouldThrow();
254		} catch (NullPointerException success) {}
#	Line 249 | Line 260 | public class PriorityBlockingQueueTest e
260		public void testAddAll5() {
261		Integer[] empty = new Integer[0];
262		Integer[] ints = new Integer[SIZE];
263	<	for (int i = SIZE-1; i >= 0; --i)
263	>	for (int i = SIZE - 1; i >= 0; --i)
264		ints[i] = new Integer(i);
265		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 264 | Line 275 | public class PriorityBlockingQueueTest e
275		public void testPut() {
276		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
277		for (int i = 0; i < SIZE; ++i) {
278	<	Integer I = new Integer(i);
279	<	q.put(I);
280	<	assertTrue(q.contains(I));
278	>	Integer x = new Integer(i);
279	>	q.put(x);
280	>	assertTrue(q.contains(x));
281		}
282		assertEquals(SIZE, q.size());
283		}
#	Line 394 | Line 405 | public class PriorityBlockingQueueTest e
405		final CountDownLatch aboutToWait = new CountDownLatch(1);
406		Thread t = newStartedThread(new CheckedRunnable() {
407		public void realRun() throws InterruptedException {
408	+	long startTime = System.nanoTime();
409		for (int i = 0; i < SIZE; ++i) {
398	–	long t0 = System.nanoTime();
410		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
400	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
411		}
402	–	long t0 = System.nanoTime();
412		aboutToWait.countDown();
413		try {
414		q.poll(LONG_DELAY_MS, MILLISECONDS);
415		shouldThrow();
416		} catch (InterruptedException success) {
417	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
417	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
418		}
419		}});
420
421		aboutToWait.await();
422	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
422	>	waitForThreadToEnterWaitState(t);
423		t.interrupt();
424	<	awaitTermination(t, MEDIUM_DELAY_MS);
424	>	awaitTermination(t);
425		}
426
427		/**
#	Line 459 | Line 468 | public class PriorityBlockingQueueTest e
468		}
469
470		/**
462	–	* remove(x) removes x and returns true if present
463	–	*/
464	–	public void testRemoveElement() {
465	–	PriorityBlockingQueue q = populatedQueue(SIZE);
466	–	for (int i = 1; i < SIZE; i+=2) {
467	–	assertTrue(q.contains(i));
468	–	assertTrue(q.remove(i));
469	–	assertFalse(q.contains(i));
470	–	assertTrue(q.contains(i-1));
471	–	}
472	–	for (int i = 0; i < SIZE; i+=2) {
473	–	assertTrue(q.contains(i));
474	–	assertTrue(q.remove(i));
475	–	assertFalse(q.contains(i));
476	–	assertFalse(q.remove(i+1));
477	–	assertFalse(q.contains(i+1));
478	–	}
479	–	assertTrue(q.isEmpty());
480	–	}
481	–
482	–	/**
471		* contains(x) reports true when elements added but not yet removed
472		*/
473		public void testContains() {
#	Line 534 | Line 522 | public class PriorityBlockingQueueTest e
522		assertTrue(changed);
523
524		assertTrue(q.containsAll(p));
525	<	assertEquals(SIZE-i, q.size());
525	>	assertEquals(SIZE - i, q.size());
526		p.remove();
527		}
528		}
#	Line 547 | Line 535 | public class PriorityBlockingQueueTest e
535		PriorityBlockingQueue q = populatedQueue(SIZE);
536		PriorityBlockingQueue p = populatedQueue(i);
537		assertTrue(q.removeAll(p));
538	<	assertEquals(SIZE-i, q.size());
538	>	assertEquals(SIZE - i, q.size());
539		for (int j = 0; j < i; ++j) {
540	<	Integer I = (Integer)(p.remove());
541	<	assertFalse(q.contains(I));
540	>	Integer x = (Integer)(p.remove());
541	>	assertFalse(q.contains(x));
542		}
543		}
544		}
#	Line 595 | Line 583 | public class PriorityBlockingQueueTest e
583		*/
584		public void testIterator() {
585		PriorityBlockingQueue q = populatedQueue(SIZE);
598	–	int i = 0;
586		Iterator it = q.iterator();
587	<	while (it.hasNext()) {
587	>	int i;
588	>	for (i = 0; it.hasNext(); i++)
589		assertTrue(q.contains(it.next()));
602	–	++i;
603	–	}
590		assertEquals(i, SIZE);
591	+	assertIteratorExhausted(it);
592	+	}
593	+
594	+	/**
595	+	* iterator of empty collection has no elements
596	+	*/
597	+	public void testEmptyIterator() {
598	+	assertIteratorExhausted(new PriorityBlockingQueue().iterator());
599		}
600
601		/**
#	Line 640 | Line 634 | public class PriorityBlockingQueueTest e
634		public void testPollInExecutor() {
635		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
636		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
637	<	ExecutorService executor = Executors.newFixedThreadPool(2);
638	<	executor.execute(new CheckedRunnable() {
639	<	public void realRun() throws InterruptedException {
640	<	assertNull(q.poll());
641	<	threadsStarted.await();
642	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
643	<	checkEmpty(q);
644	<	}});
645	<
646	<	executor.execute(new CheckedRunnable() {
647	<	public void realRun() throws InterruptedException {
648	<	threadsStarted.await();
649	<	q.put(one);
650	<	}});
651	<
652	<	joinPool(executor);
637	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
638	>	try (PoolCleaner cleaner = cleaner(executor)) {
639	>	executor.execute(new CheckedRunnable() {
640	>	public void realRun() throws InterruptedException {
641	>	assertNull(q.poll());
642	>	threadsStarted.await();
643	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
644	>	checkEmpty(q);
645	>	}});
646	>
647	>	executor.execute(new CheckedRunnable() {
648	>	public void realRun() throws InterruptedException {
649	>	threadsStarted.await();
650	>	q.put(one);
651	>	}});
652	>	}
653		}
654
655		/**
#	Line 665 | Line 659 | public class PriorityBlockingQueueTest e
659		Queue x = populatedQueue(SIZE);
660		Queue y = serialClone(x);
661
662	<	assertTrue(x != y);
662	>	assertNotSame(x, y);
663		assertEquals(x.size(), y.size());
664		while (!x.isEmpty()) {
665		assertFalse(y.isEmpty());
#	Line 681 | Line 675 | public class PriorityBlockingQueueTest e
675		PriorityBlockingQueue q = populatedQueue(SIZE);
676		ArrayList l = new ArrayList();
677		q.drainTo(l);
678	<	assertEquals(q.size(), 0);
679	<	assertEquals(l.size(), SIZE);
678	>	assertEquals(0, q.size());
679	>	assertEquals(SIZE, l.size());
680		for (int i = 0; i < SIZE; ++i)
681		assertEquals(l.get(i), new Integer(i));
682		q.add(zero);
#	Line 692 | Line 686 | public class PriorityBlockingQueueTest e
686		assertTrue(q.contains(one));
687		l.clear();
688		q.drainTo(l);
689	<	assertEquals(q.size(), 0);
690	<	assertEquals(l.size(), 2);
689	>	assertEquals(0, q.size());
690	>	assertEquals(2, l.size());
691		for (int i = 0; i < 2; ++i)
692		assertEquals(l.get(i), new Integer(i));
693		}
#	Line 705 | Line 699 | public class PriorityBlockingQueueTest e
699		final PriorityBlockingQueue q = populatedQueue(SIZE);
700		Thread t = new Thread(new CheckedRunnable() {
701		public void realRun() {
702	<	q.put(new Integer(SIZE+1));
702	>	q.put(new Integer(SIZE + 1));
703		}});
704
705		t.start();
#	Line 722 | Line 716 | public class PriorityBlockingQueueTest e
716		* drainTo(c, n) empties first min(n, size) elements of queue into c
717		*/
718		public void testDrainToN() {
719	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
719	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
720		for (int i = 0; i < SIZE + 2; ++i) {
721		for (int j = 0; j < SIZE; j++)
722		assertTrue(q.offer(new Integer(j)));
723		ArrayList l = new ArrayList();
724		q.drainTo(l, i);
725		int k = (i < SIZE) ? i : SIZE;
726	<	assertEquals(l.size(), k);
727	<	assertEquals(q.size(), SIZE-k);
726	>	assertEquals(k, l.size());
727	>	assertEquals(SIZE - k, q.size());
728		for (int j = 0; j < k; ++j)
729		assertEquals(l.get(j), new Integer(j));
730	<	while (q.poll() != null) ;
730	>	do {} while (q.poll() != null);
731	>	}
732	>	}
733	>
734	>	/**
735	>	* remove(null), contains(null) always return false
736	>	*/
737	>	public void testNeverContainsNull() {
738	>	Collection<?>[] qs = {
739	>	new PriorityBlockingQueue<Object>(),
740	>	populatedQueue(2),
741	>	};
742	>
743	>	for (Collection<?> q : qs) {
744	>	assertFalse(q.contains(null));
745	>	assertFalse(q.remove(null));
746		}
747		}
748

Diff Legend

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