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.10 by dl, Wed Jan 7 01:13:50 2004 UTC vs.
Revision 1.44 by jsr166, Fri May 27 20:07:24 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
10		import java.util.*;
11		import java.util.concurrent.*;
12	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
13		import java.io.*;
14
15		public class PriorityBlockingQueueTest extends JSR166TestCase {
16	+
17	+	public static class Generic extends BlockingQueueTest {
18	+	protected BlockingQueue emptyCollection() {
19	+	return new PriorityBlockingQueue();
20	+	}
21	+	}
22	+
23	+	public static class InitialCapacity extends BlockingQueueTest {
24	+	protected BlockingQueue emptyCollection() {
25	+	return new PriorityBlockingQueue(20);
26	+	}
27	+	}
28	+
29		public static void main(String[] args) {
30	<	junit.textui.TestRunner.run (suite());
30	>	junit.textui.TestRunner.run(suite());
31		}
32	+
33		public static Test suite() {
34	<	return new TestSuite(PriorityBlockingQueueTest.class);
34	>	return newTestSuite(PriorityBlockingQueueTest.class,
35	>	new Generic().testSuite(),
36	>	new InitialCapacity().testSuite());
37		}
38
39		private static final int NOCAP = Integer.MAX_VALUE;
40
41		/** Sample Comparator */
42	<	static class MyReverseComparator implements Comparator {
42	>	static class MyReverseComparator implements Comparator {
43		public int compare(Object x, Object y) {
44	<	int i = ((Integer)x).intValue();
28	<	int j = ((Integer)y).intValue();
29	<	if (i < j) return 1;
30	<	if (i > j) return -1;
31	<	return 0;
44	>	return ((Comparable)y).compareTo(x);
45		}
46		}
47
#	Line 36 | Line 49 | public class PriorityBlockingQueueTest e
49		* Create a queue of given size containing consecutive
50		* Integers 0 ... n.
51		*/
52	<	private PriorityBlockingQueue populatedQueue(int n) {
53	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
52	>	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
53	>	PriorityBlockingQueue<Integer> q =
54	>	new PriorityBlockingQueue<Integer>(n);
55		assertTrue(q.isEmpty());
56	<	for(int i = n-1; i >= 0; i-=2)
57	<	assertTrue(q.offer(new Integer(i)));
58	<	for(int i = (n & 1); i < n; i+=2)
59	<	assertTrue(q.offer(new Integer(i)));
56	>	for (int i = n-1; i >= 0; i-=2)
57	>	assertTrue(q.offer(new Integer(i)));
58	>	for (int i = (n & 1); i < n; i+=2)
59	>	assertTrue(q.offer(new Integer(i)));
60		assertFalse(q.isEmpty());
61		assertEquals(NOCAP, q.remainingCapacity());
62	<	assertEquals(n, q.size());
62	>	assertEquals(n, q.size());
63		return q;
64		}
65	<
65	>
66		/**
67		* A new queue has unbounded capacity
68		*/
#	Line 57 | Line 71 | public class PriorityBlockingQueueTest e
71		}
72
73		/**
74	<	* Constructor throws IAE if  capacity argument nonpositive
74	>	* Constructor throws IAE if capacity argument nonpositive
75		*/
76		public void testConstructor2() {
77		try {
78		PriorityBlockingQueue q = new PriorityBlockingQueue(0);
79		shouldThrow();
80	<	}
67	<	catch (IllegalArgumentException success) {}
80	>	} catch (IllegalArgumentException success) {}
81		}
82
83		/**
#	Line 74 | Line 87 | public class PriorityBlockingQueueTest e
87		try {
88		PriorityBlockingQueue q = new PriorityBlockingQueue(null);
89		shouldThrow();
90	<	}
78	<	catch (NullPointerException success) {}
90	>	} catch (NullPointerException success) {}
91		}
92
93		/**
#	Line 86 | Line 98 | public class PriorityBlockingQueueTest e
98		Integer[] ints = new Integer[SIZE];
99		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
100		shouldThrow();
101	<	}
90	<	catch (NullPointerException success) {}
101	>	} catch (NullPointerException success) {}
102		}
103
104		/**
#	Line 100 | Line 111 | public class PriorityBlockingQueueTest e
111		ints[i] = new Integer(i);
112		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
113		shouldThrow();
114	<	}
104	<	catch (NullPointerException success) {}
114	>	} catch (NullPointerException success) {}
115		}
116
117		/**
118		* Queue contains all elements of collection used to initialize
119		*/
120		public void testConstructor6() {
121	<	try {
122	<	Integer[] ints = new Integer[SIZE];
123	<	for (int i = 0; i < SIZE; ++i)
124	<	ints[i] = new Integer(i);
125	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
126	<	for (int i = 0; i < SIZE; ++i)
117	<	assertEquals(ints[i], q.poll());
118	<	}
119	<	finally {}
121	>	Integer[] ints = new Integer[SIZE];
122	>	for (int i = 0; i < SIZE; ++i)
123	>	ints[i] = new Integer(i);
124	>	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
125	>	for (int i = 0; i < SIZE; ++i)
126	>	assertEquals(ints[i], q.poll());
127		}
128
129		/**
130		* The comparator used in constructor is used
131		*/
132		public void testConstructor7() {
133	<	try {
134	<	MyReverseComparator cmp = new MyReverseComparator();
135	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
136	<	assertEquals(cmp, q.comparator());
137	<	Integer[] ints = new Integer[SIZE];
138	<	for (int i = 0; i < SIZE; ++i)
139	<	ints[i] = new Integer(i);
140	<	q.addAll(Arrays.asList(ints));
141	<	for (int i = SIZE-1; i >= 0; --i)
135	<	assertEquals(ints[i], q.poll());
136	<	}
137	<	finally {}
133	>	MyReverseComparator cmp = new MyReverseComparator();
134	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
135	>	assertEquals(cmp, q.comparator());
136	>	Integer[] ints = new Integer[SIZE];
137	>	for (int i = 0; i < SIZE; ++i)
138	>	ints[i] = new Integer(i);
139	>	q.addAll(Arrays.asList(ints));
140	>	for (int i = SIZE-1; i >= 0; --i)
141	>	assertEquals(ints[i], q.poll());
142		}
143
144		/**
#	Line 174 | Line 178 | public class PriorityBlockingQueueTest e
178		* offer(null) throws NPE
179		*/
180		public void testOfferNull() {
181	<	try {
181	>	try {
182		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
183		q.offer(null);
184		shouldThrow();
185	<	} catch (NullPointerException success) { }
185	>	} catch (NullPointerException success) {}
186		}
187
188		/**
189		* add(null) throws NPE
190		*/
191		public void testAddNull() {
192	<	try {
192	>	try {
193		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
194		q.add(null);
195		shouldThrow();
196	<	} catch (NullPointerException success) { }
196	>	} catch (NullPointerException success) {}
197		}
198
199		/**
#	Line 211 | Line 215 | public class PriorityBlockingQueueTest e
215		q.offer(new Object());
216		q.offer(new Object());
217		shouldThrow();
218	<	}
215	<	catch(ClassCastException success) {}
218	>	} catch (ClassCastException success) {}
219		}
220
221		/**
#	Line 234 | Line 237 | public class PriorityBlockingQueueTest e
237		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
238		q.addAll(null);
239		shouldThrow();
240	<	}
238	<	catch (NullPointerException success) {}
240	>	} catch (NullPointerException success) {}
241		}
242
243		/**
#	Line 246 | Line 248 | public class PriorityBlockingQueueTest e
248		PriorityBlockingQueue q = populatedQueue(SIZE);
249		q.addAll(q);
250		shouldThrow();
251	<	}
250	<	catch (IllegalArgumentException success) {}
251	>	} catch (IllegalArgumentException success) {}
252		}
253
254		/**
#	Line 259 | Line 260 | public class PriorityBlockingQueueTest e
260		Integer[] ints = new Integer[SIZE];
261		q.addAll(Arrays.asList(ints));
262		shouldThrow();
263	<	}
263	<	catch (NullPointerException success) {}
263	>	} catch (NullPointerException success) {}
264		}
265	+
266		/**
267		* addAll of a collection with any null elements throws NPE after
268		* possibly adding some elements
#	Line 274 | Line 275 | public class PriorityBlockingQueueTest e
275		ints[i] = new Integer(i);
276		q.addAll(Arrays.asList(ints));
277		shouldThrow();
278	<	}
278	<	catch (NullPointerException success) {}
278	>	} catch (NullPointerException success) {}
279		}
280
281		/**
282		* Queue contains all elements of successful addAll
283		*/
284		public void testAddAll5() {
285	<	try {
286	<	Integer[] empty = new Integer[0];
287	<	Integer[] ints = new Integer[SIZE];
288	<	for (int i = SIZE-1; i >= 0; --i)
289	<	ints[i] = new Integer(i);
290	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
291	<	assertFalse(q.addAll(Arrays.asList(empty)));
292	<	assertTrue(q.addAll(Arrays.asList(ints)));
293	<	for (int i = 0; i < SIZE; ++i)
294	<	assertEquals(ints[i], q.poll());
295	<	}
296	<	finally {}
285	>	Integer[] empty = new Integer[0];
286	>	Integer[] ints = new Integer[SIZE];
287	>	for (int i = SIZE-1; i >= 0; --i)
288	>	ints[i] = new Integer(i);
289	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
290	>	assertFalse(q.addAll(Arrays.asList(empty)));
291	>	assertTrue(q.addAll(Arrays.asList(ints)));
292	>	for (int i = 0; i < SIZE; ++i)
293	>	assertEquals(ints[i], q.poll());
294		}
295
296		/**
297		* put(null) throws NPE
298		*/
299	<	public void testPutNull() {
300	<	try {
299	>	public void testPutNull() {
300	>	try {
301		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302		q.put(null);
303		shouldThrow();
304	<	}
305	<	catch (NullPointerException success){
309	<	}
310	<	}
304	>	} catch (NullPointerException success) {}
305	>	}
306
307		/**
308		* all elements successfully put are contained
309		*/
310	<	public void testPut() {
311	<	try {
312	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
313	<	for (int i = 0; i < SIZE; ++i) {
314	<	Integer I = new Integer(i);
315	<	q.put(I);
321	<	assertTrue(q.contains(I));
322	<	}
323	<	assertEquals(SIZE, q.size());
324	<	}
325	<	finally {
310	>	public void testPut() {
311	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
312	>	for (int i = 0; i < SIZE; ++i) {
313	>	Integer I = new Integer(i);
314	>	q.put(I);
315	>	assertTrue(q.contains(I));
316		}
317	+	assertEquals(SIZE, q.size());
318		}
319
320		/**
321		* put doesn't block waiting for take
322		*/
323	<	public void testPutWithTake() {
323	>	public void testPutWithTake() throws InterruptedException {
324		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
325	<	Thread t = new Thread(new Runnable() {
326	<	public void run() {
327	<	int added = 0;
328	<	try {
329	<	q.put(new Integer(0));
330	<	++added;
331	<	q.put(new Integer(0));
332	<	++added;
333	<	q.put(new Integer(0));
334	<	++added;
344	<	q.put(new Integer(0));
345	<	++added;
346	<	threadAssertTrue(added == 4);
347	<	} finally {
348	<	}
349	<	}
350	<	});
351	<	try {
352	<	t.start();
353	<	Thread.sleep(SHORT_DELAY_MS);
354	<	q.take();
355	<	t.interrupt();
356	<	t.join();
357	<	} catch (Exception e){
358	<	unexpectedException();
359	<	}
325	>	final int size = 4;
326	>	Thread t = newStartedThread(new CheckedRunnable() {
327	>	public void realRun() {
328	>	for (int i = 0; i < size; i++)
329	>	q.put(new Integer(0));
330	>	}});
331	>
332	>	awaitTermination(t);
333	>	assertEquals(size, q.size());
334	>	q.take();
335		}
336
337		/**
338		* timed offer does not time out
339		*/
340	<	public void testTimedOffer() {
340	>	public void testTimedOffer() throws InterruptedException {
341		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
342	<	Thread t = new Thread(new Runnable() {
343	<	public void run() {
344	<	try {
345	<	q.put(new Integer(0));
346	<	q.put(new Integer(0));
347	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
348	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
374	<	} finally { }
375	<	}
376	<	});
377	<
378	<	try {
379	<	t.start();
380	<	Thread.sleep(SMALL_DELAY_MS);
381	<	t.interrupt();
382	<	t.join();
383	<	} catch (Exception e){
384	<	unexpectedException();
385	<	}
386	<	}
342	>	Thread t = newStartedThread(new CheckedRunnable() {
343	>	public void realRun() {
344	>	q.put(new Integer(0));
345	>	q.put(new Integer(0));
346	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
347	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
348	>	}});
349
350	<	/**
389	<	* take retrieves elements in priority order
390	<	*/
391	<	public void testTake() {
392	<	try {
393	<	PriorityBlockingQueue q = populatedQueue(SIZE);
394	<	for (int i = 0; i < SIZE; ++i) {
395	<	assertEquals(i, ((Integer)q.take()).intValue());
396	<	}
397	<	} catch (InterruptedException e){
398	<	unexpectedException();
399	<	}
350	>	awaitTermination(t);
351		}
352
353		/**
354	<	* take blocks interruptibly when empty
354	>	* take retrieves elements in priority order
355		*/
356	<	public void testTakeFromEmpty() {
357	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
358	<	Thread t = new Thread(new Runnable() {
359	<	public void run() {
409	<	try {
410	<	q.take();
411	<	threadShouldThrow();
412	<	} catch (InterruptedException success){ }
413	<	}
414	<	});
415	<	try {
416	<	t.start();
417	<	Thread.sleep(SHORT_DELAY_MS);
418	<	t.interrupt();
419	<	t.join();
420	<	} catch (Exception e){
421	<	unexpectedException();
356	>	public void testTake() throws InterruptedException {
357	>	PriorityBlockingQueue q = populatedQueue(SIZE);
358	>	for (int i = 0; i < SIZE; ++i) {
359	>	assertEquals(i, q.take());
360		}
361		}
362
363		/**
364		* Take removes existing elements until empty, then blocks interruptibly
365		*/
366	<	public void testBlockingTake() {
367	<	Thread t = new Thread(new Runnable() {
368	<	public void run() {
369	<	try {
370	<	PriorityBlockingQueue q = populatedQueue(SIZE);
371	<	for (int i = 0; i < SIZE; ++i) {
372	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
373	<	}
436	<	q.take();
437	<	threadShouldThrow();
438	<	} catch (InterruptedException success){
439	<	}
440	<	}});
441	<	t.start();
442	<	try {
443	<	Thread.sleep(SHORT_DELAY_MS);
444	<	t.interrupt();
445	<	t.join();
446	<	}
447	<	catch (InterruptedException ie) {
448	<	unexpectedException();
449	<	}
450	<	}
366	>	public void testBlockingTake() throws InterruptedException {
367	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
368	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
369	>	Thread t = newStartedThread(new CheckedRunnable() {
370	>	public void realRun() throws InterruptedException {
371	>	for (int i = 0; i < SIZE; ++i) {
372	>	assertEquals(i, q.take());
373	>	}
374
375	+	Thread.currentThread().interrupt();
376	+	try {
377	+	q.take();
378	+	shouldThrow();
379	+	} catch (InterruptedException success) {}
380	+	assertFalse(Thread.interrupted());
381	+
382	+	pleaseInterrupt.countDown();
383	+	try {
384	+	q.take();
385	+	shouldThrow();
386	+	} catch (InterruptedException success) {}
387	+	assertFalse(Thread.interrupted());
388	+	}});
389	+
390	+	await(pleaseInterrupt);
391	+	assertThreadStaysAlive(t);
392	+	t.interrupt();
393	+	awaitTermination(t);
394	+	}
395
396		/**
397		* poll succeeds unless empty
#	Line 456 | Line 399 | public class PriorityBlockingQueueTest e
399		public void testPoll() {
400		PriorityBlockingQueue q = populatedQueue(SIZE);
401		for (int i = 0; i < SIZE; ++i) {
402	<	assertEquals(i, ((Integer)q.poll()).intValue());
402	>	assertEquals(i, q.poll());
403		}
404	<	assertNull(q.poll());
404	>	assertNull(q.poll());
405		}
406
407		/**
408	<	* timed pool with zero timeout succeeds when non-empty, else times out
408	>	* timed poll with zero timeout succeeds when non-empty, else times out
409		*/
410	<	public void testTimedPoll0() {
411	<	try {
412	<	PriorityBlockingQueue q = populatedQueue(SIZE);
413	<	for (int i = 0; i < SIZE; ++i) {
414	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
415	<	}
473	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474	<	} catch (InterruptedException e){
475	<	unexpectedException();
476	<	}
410	>	public void testTimedPoll0() throws InterruptedException {
411	>	PriorityBlockingQueue q = populatedQueue(SIZE);
412	>	for (int i = 0; i < SIZE; ++i) {
413	>	assertEquals(i, q.poll(0, MILLISECONDS));
414	>	}
415	>	assertNull(q.poll(0, MILLISECONDS));
416		}
417
418		/**
419	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
419	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
420		*/
421	<	public void testTimedPoll() {
422	<	try {
423	<	PriorityBlockingQueue q = populatedQueue(SIZE);
424	<	for (int i = 0; i < SIZE; ++i) {
425	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
426	<	}
427	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
428	<	} catch (InterruptedException e){
429	<	unexpectedException();
430	<	}
421	>	public void testTimedPoll() throws InterruptedException {
422	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
423	>	for (int i = 0; i < SIZE; ++i) {
424	>	long startTime = System.nanoTime();
425	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
426	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
427	>	}
428	>	long startTime = System.nanoTime();
429	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
430	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
431	>	checkEmpty(q);
432		}
433
434		/**
435		* Interrupted timed poll throws InterruptedException instead of
436		* returning timeout status
437		*/
438	<	public void testInterruptedTimedPoll() {
439	<	Thread t = new Thread(new Runnable() {
440	<	public void run() {
441	<	try {
442	<	PriorityBlockingQueue q = populatedQueue(SIZE);
443	<	for (int i = 0; i < SIZE; ++i) {
444	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
445	<	}
446	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
507	<	} catch (InterruptedException success){
508	<	}
509	<	}});
510	<	t.start();
511	<	try {
512	<	Thread.sleep(SHORT_DELAY_MS);
513	<	t.interrupt();
514	<	t.join();
515	<	}
516	<	catch (InterruptedException ie) {
517	<	unexpectedException();
518	<	}
519	<	}
520	<
521	<	/**
522	<	*  timed poll before a delayed offer fails; after offer succeeds;
523	<	*  on interruption throws
524	<	*/
525	<	public void testTimedPollWithOffer() {
526	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
527	<	Thread t = new Thread(new Runnable() {
528	<	public void run() {
529	<	try {
530	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
531	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
532	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
533	<	threadShouldThrow();
534	<	} catch (InterruptedException success) { }
438	>	public void testInterruptedTimedPoll() throws InterruptedException {
439	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
440	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
441	>	Thread t = newStartedThread(new CheckedRunnable() {
442	>	public void realRun() throws InterruptedException {
443	>	for (int i = 0; i < SIZE; ++i) {
444	>	long t0 = System.nanoTime();
445	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
446	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
447		}
448	<	});
449	<	try {
450	<	t.start();
451	<	Thread.sleep(SMALL_DELAY_MS);
452	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
453	<	t.interrupt();
454	<	t.join();
455	<	} catch (Exception e){
456	<	unexpectedException();
545	<	}
546	<	}
448	>	long t0 = System.nanoTime();
449	>	aboutToWait.countDown();
450	>	try {
451	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
452	>	shouldThrow();
453	>	} catch (InterruptedException success) {
454	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
455	>	}
456	>	}});
457
458	+	aboutToWait.await();
459	+	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
460	+	t.interrupt();
461	+	awaitTermination(t, MEDIUM_DELAY_MS);
462	+	}
463
464		/**
465		* peek returns next element, or null if empty
#	Line 552 | Line 467 | public class PriorityBlockingQueueTest e
467		public void testPeek() {
468		PriorityBlockingQueue q = populatedQueue(SIZE);
469		for (int i = 0; i < SIZE; ++i) {
470	<	assertEquals(i, ((Integer)q.peek()).intValue());
471	<	q.poll();
470	>	assertEquals(i, q.peek());
471	>	assertEquals(i, q.poll());
472		assertTrue(q.peek() == null ||
473	<	i != ((Integer)q.peek()).intValue());
473	>	!q.peek().equals(i));
474		}
475	<	assertNull(q.peek());
475	>	assertNull(q.peek());
476		}
477
478		/**
#	Line 566 | Line 481 | public class PriorityBlockingQueueTest e
481		public void testElement() {
482		PriorityBlockingQueue q = populatedQueue(SIZE);
483		for (int i = 0; i < SIZE; ++i) {
484	<	assertEquals(i, ((Integer)q.element()).intValue());
485	<	q.poll();
484	>	assertEquals(i, q.element());
485	>	assertEquals(i, q.poll());
486		}
487		try {
488		q.element();
489		shouldThrow();
490	<	}
576	<	catch (NoSuchElementException success) {}
490	>	} catch (NoSuchElementException success) {}
491		}
492
493		/**
#	Line 582 | Line 496 | public class PriorityBlockingQueueTest e
496		public void testRemove() {
497		PriorityBlockingQueue q = populatedQueue(SIZE);
498		for (int i = 0; i < SIZE; ++i) {
499	<	assertEquals(i, ((Integer)q.remove()).intValue());
499	>	assertEquals(i, q.remove());
500		}
501		try {
502		q.remove();
503		shouldThrow();
504	<	} catch (NoSuchElementException success){
591	<	}
504	>	} catch (NoSuchElementException success) {}
505		}
506
507		/**
#	Line 597 | Line 510 | public class PriorityBlockingQueueTest e
510		public void testRemoveElement() {
511		PriorityBlockingQueue q = populatedQueue(SIZE);
512		for (int i = 1; i < SIZE; i+=2) {
513	<	assertTrue(q.remove(new Integer(i)));
513	>	assertTrue(q.contains(i));
514	>	assertTrue(q.remove(i));
515	>	assertFalse(q.contains(i));
516	>	assertTrue(q.contains(i-1));
517		}
518		for (int i = 0; i < SIZE; i+=2) {
519	<	assertTrue(q.remove(new Integer(i)));
520	<	assertFalse(q.remove(new Integer(i+1)));
519	>	assertTrue(q.contains(i));
520	>	assertTrue(q.remove(i));
521	>	assertFalse(q.contains(i));
522	>	assertFalse(q.remove(i+1));
523	>	assertFalse(q.contains(i+1));
524		}
525		assertTrue(q.isEmpty());
526		}
527	<
527	>
528		/**
529		* contains(x) reports true when elements added but not yet removed
530		*/
#	Line 626 | Line 545 | public class PriorityBlockingQueueTest e
545		q.clear();
546		assertTrue(q.isEmpty());
547		assertEquals(0, q.size());
548	<	assertEquals(NOCAP, q.remainingCapacity());
630	<	q.add(new Integer(1));
548	>	q.add(one);
549		assertFalse(q.isEmpty());
550	+	assertTrue(q.contains(one));
551		q.clear();
552		assertTrue(q.isEmpty());
553		}
#	Line 683 | Line 602 | public class PriorityBlockingQueueTest e
602		}
603
604		/**
605	<	*  toArray contains all elements
605	>	* toArray contains all elements
606		*/
607	<	public void testToArray() {
607	>	public void testToArray() throws InterruptedException {
608		PriorityBlockingQueue q = populatedQueue(SIZE);
609	<	Object[] o = q.toArray();
609	>	Object[] o = q.toArray();
610		Arrays.sort(o);
611	<	try {
612	<	for(int i = 0; i < o.length; i++)
694	<	assertEquals(o[i], q.take());
695	<	} catch (InterruptedException e){
696	<	unexpectedException();
697	<	}
611	>	for (int i = 0; i < o.length; i++)
612	>	assertSame(o[i], q.take());
613		}
614
615		/**
616		* toArray(a) contains all elements
617		*/
618	<	public void testToArray2() {
619	<	PriorityBlockingQueue q = populatedQueue(SIZE);
620	<	Integer[] ints = new Integer[SIZE];
621	<	ints = (Integer[])q.toArray(ints);
618	>	public void testToArray2() throws InterruptedException {
619	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
620	>	Integer[] ints = new Integer[SIZE];
621	>	Integer[] array = q.toArray(ints);
622	>	assertSame(ints, array);
623		Arrays.sort(ints);
624	<	try {
625	<	for(int i = 0; i < ints.length; i++)
710	<	assertEquals(ints[i], q.take());
711	<	} catch (InterruptedException e){
712	<	unexpectedException();
713	<	}
624	>	for (int i = 0; i < ints.length; i++)
625	>	assertSame(ints[i], q.take());
626		}
627
628		/**
629	<	* toArray(null) throws NPE
629	>	* toArray(null) throws NullPointerException
630		*/
631	<	public void testToArray_BadArg() {
632	<	try {
633	<	PriorityBlockingQueue q = populatedQueue(SIZE);
634	<	Object o[] = q.toArray(null);
635	<	shouldThrow();
636	<	} catch(NullPointerException success){}
631	>	public void testToArray_NullArg() {
632	>	PriorityBlockingQueue q = populatedQueue(SIZE);
633	>	try {
634	>	q.toArray(null);
635	>	shouldThrow();
636	>	} catch (NullPointerException success) {}
637		}
638
639		/**
640	<	* toArray with incompatible array type throws CCE
640	>	* toArray(incompatible array type) throws ArrayStoreException
641		*/
642		public void testToArray1_BadArg() {
643	<	try {
644	<	PriorityBlockingQueue q = populatedQueue(SIZE);
645	<	Object o[] = q.toArray(new String[10] );
646	<	shouldThrow();
647	<	} catch(ArrayStoreException  success){}
643	>	PriorityBlockingQueue q = populatedQueue(SIZE);
644	>	try {
645	>	q.toArray(new String[10]);
646	>	shouldThrow();
647	>	} catch (ArrayStoreException success) {}
648		}
649	<
649	>
650		/**
651		* iterator iterates through all elements
652		*/
653		public void testIterator() {
654		PriorityBlockingQueue q = populatedQueue(SIZE);
655		int i = 0;
656	<	Iterator it = q.iterator();
657	<	while(it.hasNext()) {
656	>	Iterator it = q.iterator();
657	>	while (it.hasNext()) {
658		assertTrue(q.contains(it.next()));
659		++i;
660		}
#	Line 752 | Line 664 | public class PriorityBlockingQueueTest e
664		/**
665		* iterator.remove removes current element
666		*/
667	<	public void testIteratorRemove () {
667	>	public void testIteratorRemove() {
668		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
669		q.add(new Integer(2));
670		q.add(new Integer(1));
#	Line 768 | Line 680 | public class PriorityBlockingQueueTest e
680		assertFalse(it.hasNext());
681		}
682
771	–
683		/**
684		* toString contains toStrings of elements
685		*/
#	Line 776 | Line 687 | public class PriorityBlockingQueueTest e
687		PriorityBlockingQueue q = populatedQueue(SIZE);
688		String s = q.toString();
689		for (int i = 0; i < SIZE; ++i) {
690	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
690	>	assertTrue(s.contains(String.valueOf(i)));
691		}
692	<	}
692	>	}
693
694		/**
695	<	* offer transfers elements across Executor tasks
695	>	* timed poll transfers elements across Executor tasks
696		*/
697		public void testPollInExecutor() {
698		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
699	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
700		ExecutorService executor = Executors.newFixedThreadPool(2);
701	<	executor.execute(new Runnable() {
702	<	public void run() {
703	<	threadAssertNull(q.poll());
704	<	try {
705	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
706	<	threadAssertTrue(q.isEmpty());
707	<	}
708	<	catch (InterruptedException e) {
709	<	threadUnexpectedException();
710	<	}
711	<	}
712	<	});
701	>	executor.execute(new CheckedRunnable() {
702	>	public void realRun() throws InterruptedException {
703	>	assertNull(q.poll());
704	>	threadsStarted.await();
705	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
706	>	checkEmpty(q);
707	>	}});
708	>
709	>	executor.execute(new CheckedRunnable() {
710	>	public void realRun() throws InterruptedException {
711	>	threadsStarted.await();
712	>	q.put(one);
713	>	}});
714
802	–	executor.execute(new Runnable() {
803	–	public void run() {
804	–	try {
805	–	Thread.sleep(SMALL_DELAY_MS);
806	–	q.put(new Integer(1));
807	–	}
808	–	catch (InterruptedException e) {
809	–	threadUnexpectedException();
810	–	}
811	–	}
812	–	});
813	–
715		joinPool(executor);
716		}
717
718		/**
719	<	* A deserialized serialized queue has same elements
719	>	* A deserialized serialized queue has same elements
720		*/
721	<	public void testSerialization() {
721	>	public void testSerialization() throws Exception {
722		PriorityBlockingQueue q = populatedQueue(SIZE);
723	<	try {
724	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
725	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
726	<	out.writeObject(q);
727	<	out.close();
728	<
729	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
730	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
731	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
732	<	assertEquals(q.size(), r.size());
733	<	while (!q.isEmpty())
833	<	assertEquals(q.remove(), r.remove());
834	<	} catch(Exception e){
835	<	unexpectedException();
836	<	}
723	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
724	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
725	>	out.writeObject(q);
726	>	out.close();
727	>
728	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
729	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
730	>	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
731	>	assertEquals(q.size(), r.size());
732	>	while (!q.isEmpty())
733	>	assertEquals(q.remove(), r.remove());
734		}
735
736		/**
737		* drainTo(null) throws NPE
738	<	*/
738	>	*/
739		public void testDrainToNull() {
740		PriorityBlockingQueue q = populatedQueue(SIZE);
741		try {
742		q.drainTo(null);
743		shouldThrow();
744	<	} catch(NullPointerException success) {
848	<	}
744	>	} catch (NullPointerException success) {}
745		}
746
747		/**
748		* drainTo(this) throws IAE
749	<	*/
749	>	*/
750		public void testDrainToSelf() {
751		PriorityBlockingQueue q = populatedQueue(SIZE);
752		try {
753		q.drainTo(q);
754		shouldThrow();
755	<	} catch(IllegalArgumentException success) {
860	<	}
755	>	} catch (IllegalArgumentException success) {}
756		}
757
758		/**
759		* drainTo(c) empties queue into another collection c
760	<	*/
760	>	*/
761		public void testDrainTo() {
762		PriorityBlockingQueue q = populatedQueue(SIZE);
763		ArrayList l = new ArrayList();
764		q.drainTo(l);
765		assertEquals(q.size(), 0);
766		assertEquals(l.size(), SIZE);
767	<	for (int i = 0; i < SIZE; ++i)
767	>	for (int i = 0; i < SIZE; ++i)
768	>	assertEquals(l.get(i), new Integer(i));
769	>	q.add(zero);
770	>	q.add(one);
771	>	assertFalse(q.isEmpty());
772	>	assertTrue(q.contains(zero));
773	>	assertTrue(q.contains(one));
774	>	l.clear();
775	>	q.drainTo(l);
776	>	assertEquals(q.size(), 0);
777	>	assertEquals(l.size(), 2);
778	>	for (int i = 0; i < 2; ++i)
779		assertEquals(l.get(i), new Integer(i));
780		}
781
782		/**
783		* drainTo empties queue
784	<	*/
785	<	public void testDrainToWithActivePut() {
784	>	*/
785	>	public void testDrainToWithActivePut() throws InterruptedException {
786		final PriorityBlockingQueue q = populatedQueue(SIZE);
787	<	Thread t = new Thread(new Runnable() {
788	<	public void run() {
789	<	q.put(new Integer(SIZE+1));
790	<	}
791	<	});
792	<	try {
793	<	t.start();
794	<	ArrayList l = new ArrayList();
795	<	q.drainTo(l);
796	<	assertTrue(l.size() >= SIZE);
797	<	for (int i = 0; i < SIZE; ++i)
798	<	assertEquals(l.get(i), new Integer(i));
799	<	t.join();
894	<	assertTrue(q.size() + l.size() >= SIZE);
895	<	} catch(Exception e){
896	<	unexpectedException();
897	<	}
787	>	Thread t = new Thread(new CheckedRunnable() {
788	>	public void realRun() {
789	>	q.put(new Integer(SIZE+1));
790	>	}});
791	>
792	>	t.start();
793	>	ArrayList l = new ArrayList();
794	>	q.drainTo(l);
795	>	assertTrue(l.size() >= SIZE);
796	>	for (int i = 0; i < SIZE; ++i)
797	>	assertEquals(l.get(i), new Integer(i));
798	>	t.join();
799	>	assertTrue(q.size() + l.size() >= SIZE);
800		}
801
802		/**
803		* drainTo(null, n) throws NPE
804	<	*/
804	>	*/
805		public void testDrainToNullN() {
806		PriorityBlockingQueue q = populatedQueue(SIZE);
807		try {
808		q.drainTo(null, 0);
809		shouldThrow();
810	<	} catch(NullPointerException success) {
909	<	}
810	>	} catch (NullPointerException success) {}
811		}
812
813		/**
814		* drainTo(this, n) throws IAE
815	<	*/
815	>	*/
816		public void testDrainToSelfN() {
817		PriorityBlockingQueue q = populatedQueue(SIZE);
818		try {
819		q.drainTo(q, 0);
820		shouldThrow();
821	<	} catch(IllegalArgumentException success) {
921	<	}
821	>	} catch (IllegalArgumentException success) {}
822		}
823
824		/**
825	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
826	<	*/
825	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
826	>	*/
827		public void testDrainToN() {
828	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
829		for (int i = 0; i < SIZE + 2; ++i) {
830	<	PriorityBlockingQueue q = populatedQueue(SIZE);
830	>	for (int j = 0; j < SIZE; j++)
831	>	assertTrue(q.offer(new Integer(j)));
832		ArrayList l = new ArrayList();
833		q.drainTo(l, i);
834	<	int k = (i < SIZE)? i : SIZE;
933	<	assertEquals(q.size(), SIZE-k);
834	>	int k = (i < SIZE) ? i : SIZE;
835		assertEquals(l.size(), k);
836	<	for (int j = 0; j < k; ++j)
837	<	assertTrue(l.contains(new Integer(j)));
836	>	assertEquals(q.size(), SIZE-k);
837	>	for (int j = 0; j < k; ++j)
838	>	assertEquals(l.get(j), new Integer(j));
839	>	while (q.poll() != null) ;
840		}
841		}
842
940	–
843		}

Diff Legend

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