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.18 by jsr166, Sat Nov 21 09:28:16 2009 UTC vs.
Revision 1.49 by jsr166, Sat Nov 26 05:42:14 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
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.*;
10	>	import java.util.Arrays;
11	>	import java.util.ArrayList;
12	>	import java.util.Collection;
13	>	import java.util.Comparator;
14	>	import java.util.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	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;
13	–	import java.io.*;
23
24		public class PriorityBlockingQueueTest extends JSR166TestCase {
25	+
26	+	public static class Generic extends BlockingQueueTest {
27	+	protected BlockingQueue emptyCollection() {
28	+	return new PriorityBlockingQueue();
29	+	}
30	+	}
31	+
32	+	public static class InitialCapacity extends BlockingQueueTest {
33	+	protected BlockingQueue emptyCollection() {
34	+	return new PriorityBlockingQueue(SIZE);
35	+	}
36	+	}
37	+
38		public static void main(String[] args) {
39	<	junit.textui.TestRunner.run (suite());
39	>	junit.textui.TestRunner.run(suite());
40		}
41	+
42		public static Test suite() {
43	<	return new TestSuite(PriorityBlockingQueueTest.class);
43	>	return newTestSuite(PriorityBlockingQueueTest.class,
44	>	new Generic().testSuite(),
45	>	new InitialCapacity().testSuite());
46		}
47
48		private static final int NOCAP = Integer.MAX_VALUE;
#	Line 25 | Line 50 | public class PriorityBlockingQueueTest e
50		/** Sample Comparator */
51		static class MyReverseComparator implements Comparator {
52		public int compare(Object x, Object y) {
53	<	int i = ((Integer)x).intValue();
29	<	int j = ((Integer)y).intValue();
30	<	if (i < j) return 1;
31	<	if (i > j) return -1;
32	<	return 0;
53	>	return ((Comparable)y).compareTo(x);
54		}
55		}
56
#	Line 37 | Line 58 | public class PriorityBlockingQueueTest e
58		* Create a queue of given size containing consecutive
59		* Integers 0 ... n.
60		*/
61	<	private PriorityBlockingQueue populatedQueue(int n) {
62	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
61	>	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
62	>	PriorityBlockingQueue<Integer> q =
63	>	new PriorityBlockingQueue<Integer>(n);
64		assertTrue(q.isEmpty());
65		for (int i = n-1; i >= 0; i-=2)
66		assertTrue(q.offer(new Integer(i)));
#	Line 58 | Line 80 | public class PriorityBlockingQueueTest e
80		}
81
82		/**
83	<	* Constructor throws IAE if  capacity argument nonpositive
83	>	* Constructor throws IAE if capacity argument nonpositive
84		*/
85		public void testConstructor2() {
86		try {
87	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
87	>	new PriorityBlockingQueue(0);
88		shouldThrow();
89		} catch (IllegalArgumentException success) {}
90		}
#	Line 72 | Line 94 | public class PriorityBlockingQueueTest e
94		*/
95		public void testConstructor3() {
96		try {
97	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
97	>	new PriorityBlockingQueue(null);
98		shouldThrow();
99		} catch (NullPointerException success) {}
100		}
#	Line 81 | Line 103 | public class PriorityBlockingQueueTest e
103		* Initializing from Collection of null elements throws NPE
104		*/
105		public void testConstructor4() {
106	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
107		try {
108	<	Integer[] ints = new Integer[SIZE];
86	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
108	>	new PriorityBlockingQueue(elements);
109		shouldThrow();
110		} catch (NullPointerException success) {}
111		}
#	Line 92 | Line 114 | public class PriorityBlockingQueueTest e
114		* Initializing from Collection with some null elements throws NPE
115		*/
116		public void testConstructor5() {
117	+	Integer[] ints = new Integer[SIZE];
118	+	for (int i = 0; i < SIZE-1; ++i)
119	+	ints[i] = i;
120	+	Collection<Integer> elements = Arrays.asList(ints);
121		try {
122	<	Integer[] ints = new Integer[SIZE];
97	<	for (int i = 0; i < SIZE-1; ++i)
98	<	ints[i] = new Integer(i);
99	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
122	>	new PriorityBlockingQueue(elements);
123		shouldThrow();
124		} catch (NullPointerException success) {}
125		}
#	Line 107 | Line 130 | public class PriorityBlockingQueueTest e
130		public void testConstructor6() {
131		Integer[] ints = new Integer[SIZE];
132		for (int i = 0; i < SIZE; ++i)
133	<	ints[i] = new Integer(i);
133	>	ints[i] = i;
134		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
135		for (int i = 0; i < SIZE; ++i)
136		assertEquals(ints[i], q.poll());
#	Line 162 | Line 185 | public class PriorityBlockingQueueTest e
185		}
186
187		/**
165	–	* offer(null) throws NPE
166	–	*/
167	–	public void testOfferNull() {
168	–	try {
169	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
170	–	q.offer(null);
171	–	shouldThrow();
172	–	} catch (NullPointerException success) {}
173	–	}
174	–
175	–	/**
176	–	* add(null) throws NPE
177	–	*/
178	–	public void testAddNull() {
179	–	try {
180	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
181	–	q.add(null);
182	–	shouldThrow();
183	–	} catch (NullPointerException success) {}
184	–	}
185	–
186	–	/**
188		* Offer of comparable element succeeds
189		*/
190		public void testOffer() {
#	Line 217 | Line 218 | public class PriorityBlockingQueueTest e
218		}
219
220		/**
220	–	* addAll(null) throws NPE
221	–	*/
222	–	public void testAddAll1() {
223	–	try {
224	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
225	–	q.addAll(null);
226	–	shouldThrow();
227	–	} catch (NullPointerException success) {}
228	–	}
229	–
230	–	/**
221		* addAll(this) throws IAE
222		*/
223		public void testAddAllSelf() {
#	Line 239 | Line 229 | public class PriorityBlockingQueueTest e
229		}
230
231		/**
242	–	* addAll of a collection with null elements throws NPE
243	–	*/
244	–	public void testAddAll2() {
245	–	try {
246	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
247	–	Integer[] ints = new Integer[SIZE];
248	–	q.addAll(Arrays.asList(ints));
249	–	shouldThrow();
250	–	} catch (NullPointerException success) {}
251	–	}
252	–	/**
232		* addAll of a collection with any null elements throws NPE after
233		* possibly adding some elements
234		*/
#	Line 280 | Line 259 | public class PriorityBlockingQueueTest e
259		}
260
261		/**
283	–	* put(null) throws NPE
284	–	*/
285	–	public void testPutNull() {
286	–	try {
287	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
288	–	q.put(null);
289	–	shouldThrow();
290	–	} catch (NullPointerException success) {}
291	–	}
292	–
293	–	/**
262		* all elements successfully put are contained
263		*/
264	<	public void testPut() {
265	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266	<	for (int i = 0; i < SIZE; ++i) {
267	<	Integer I = new Integer(i);
268	<	q.put(I);
269	<	assertTrue(q.contains(I));
270	<	}
271	<	assertEquals(SIZE, q.size());
264	>	public void testPut() {
265	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
266	>	for (int i = 0; i < SIZE; ++i) {
267	>	Integer I = new Integer(i);
268	>	q.put(I);
269	>	assertTrue(q.contains(I));
270	>	}
271	>	assertEquals(SIZE, q.size());
272		}
273
274		/**
#	Line 309 | Line 277 | public class PriorityBlockingQueueTest e
277		public void testPutWithTake() throws InterruptedException {
278		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
279		final int size = 4;
280	<	Thread t = new Thread(new CheckedRunnable() {
280	>	Thread t = newStartedThread(new CheckedRunnable() {
281		public void realRun() {
282		for (int i = 0; i < size; i++)
283		q.put(new Integer(0));
284		}});
285
286	<	t.start();
287	<	Thread.sleep(SHORT_DELAY_MS);
320	<	assertEquals(q.size(), size);
286	>	awaitTermination(t);
287	>	assertEquals(size, q.size());
288		q.take();
322	–	t.interrupt();
323	–	t.join();
289		}
290
291		/**
#	Line 328 | Line 293 | public class PriorityBlockingQueueTest e
293		*/
294		public void testTimedOffer() throws InterruptedException {
295		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
296	<	Thread t = new Thread(new CheckedRunnable() {
296	>	Thread t = newStartedThread(new CheckedRunnable() {
297		public void realRun() {
298		q.put(new Integer(0));
299		q.put(new Integer(0));
300	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
301	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
300	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
301	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
302		}});
303
304	<	t.start();
340	<	Thread.sleep(SMALL_DELAY_MS);
341	<	t.interrupt();
342	<	t.join();
304	>	awaitTermination(t);
305		}
306
307		/**
#	Line 348 | Line 310 | public class PriorityBlockingQueueTest e
310		public void testTake() throws InterruptedException {
311		PriorityBlockingQueue q = populatedQueue(SIZE);
312		for (int i = 0; i < SIZE; ++i) {
313	<	assertEquals(i, ((Integer)q.take()).intValue());
313	>	assertEquals(i, q.take());
314		}
315		}
316
317		/**
356	–	* take blocks interruptibly when empty
357	–	*/
358	–	public void testTakeFromEmpty() throws InterruptedException {
359	–	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
360	–	Thread t = new Thread(new CheckedInterruptedRunnable() {
361	–	public void realRun() throws InterruptedException {
362	–	q.take();
363	–	}});
364	–
365	–	t.start();
366	–	Thread.sleep(SHORT_DELAY_MS);
367	–	t.interrupt();
368	–	t.join();
369	–	}
370	–
371	–	/**
318		* Take removes existing elements until empty, then blocks interruptibly
319		*/
320		public void testBlockingTake() throws InterruptedException {
321	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
321	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
322	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
323	>	Thread t = newStartedThread(new CheckedRunnable() {
324		public void realRun() throws InterruptedException {
377	–	PriorityBlockingQueue q = populatedQueue(SIZE);
325		for (int i = 0; i < SIZE; ++i) {
326	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
326	>	assertEquals(i, q.take());
327		}
328	<	q.take();
328	>
329	>	Thread.currentThread().interrupt();
330	>	try {
331	>	q.take();
332	>	shouldThrow();
333	>	} catch (InterruptedException success) {}
334	>	assertFalse(Thread.interrupted());
335	>
336	>	pleaseInterrupt.countDown();
337	>	try {
338	>	q.take();
339	>	shouldThrow();
340	>	} catch (InterruptedException success) {}
341	>	assertFalse(Thread.interrupted());
342		}});
343
344	<	t.start();
345	<	Thread.sleep(SHORT_DELAY_MS);
344	>	await(pleaseInterrupt);
345	>	assertThreadStaysAlive(t);
346		t.interrupt();
347	<	t.join();
347	>	awaitTermination(t);
348		}
349
390	–
350		/**
351		* poll succeeds unless empty
352		*/
353		public void testPoll() {
354		PriorityBlockingQueue q = populatedQueue(SIZE);
355		for (int i = 0; i < SIZE; ++i) {
356	<	assertEquals(i, ((Integer)q.poll()).intValue());
356	>	assertEquals(i, q.poll());
357		}
358		assertNull(q.poll());
359		}
360
361		/**
362	<	* timed pool with zero timeout succeeds when non-empty, else times out
362	>	* timed poll with zero timeout succeeds when non-empty, else times out
363		*/
364		public void testTimedPoll0() throws InterruptedException {
365		PriorityBlockingQueue q = populatedQueue(SIZE);
366		for (int i = 0; i < SIZE; ++i) {
367	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
367	>	assertEquals(i, q.poll(0, MILLISECONDS));
368		}
369		assertNull(q.poll(0, MILLISECONDS));
370		}
371
372		/**
373	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
373	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
374		*/
375		public void testTimedPoll() throws InterruptedException {
376	<	PriorityBlockingQueue q = populatedQueue(SIZE);
376	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
377		for (int i = 0; i < SIZE; ++i) {
378	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
379	<	}
380	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
378	>	long startTime = System.nanoTime();
379	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
380	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
381	>	}
382	>	long startTime = System.nanoTime();
383	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
384	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
385	>	checkEmpty(q);
386		}
387
388		/**
#	Line 426 | Line 390 | public class PriorityBlockingQueueTest e
390		* returning timeout status
391		*/
392		public void testInterruptedTimedPoll() throws InterruptedException {
393	<	Thread t = new Thread(new CheckedRunnable() {
393	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
394	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
395	>	Thread t = newStartedThread(new CheckedRunnable() {
396		public void realRun() throws InterruptedException {
431	–	PriorityBlockingQueue q = populatedQueue(SIZE);
397		for (int i = 0; i < SIZE; ++i) {
398	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
398	>	long t0 = System.nanoTime();
399	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
400	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
401		}
402	+	long t0 = System.nanoTime();
403	+	aboutToWait.countDown();
404		try {
405		q.poll(LONG_DELAY_MS, MILLISECONDS);
406		shouldThrow();
407	<	} catch (InterruptedException success) {}
408	<	}});
409	<
441	<	t.start();
442	<	Thread.sleep(SHORT_DELAY_MS);
443	<	t.interrupt();
444	<	t.join();
445	<	}
446	<
447	<	/**
448	<	*  timed poll before a delayed offer fails; after offer succeeds;
449	<	*  on interruption throws
450	<	*/
451	<	public void testTimedPollWithOffer() throws InterruptedException {
452	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
453	<	Thread t = new Thread(new CheckedRunnable() {
454	<	public void realRun() throws InterruptedException {
455	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
456	<	assertEquals(0, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
457	<	try {
458	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
459	<	threadShouldThrow();
460	<	} catch (InterruptedException success) {}
407	>	} catch (InterruptedException success) {
408	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
409	>	}
410		}});
411
412	<	t.start();
413	<	Thread.sleep(SMALL_DELAY_MS);
465	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
412	>	aboutToWait.await();
413	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
414		t.interrupt();
415	<	t.join();
415	>	awaitTermination(t, MEDIUM_DELAY_MS);
416		}
417
470	–
418		/**
419		* peek returns next element, or null if empty
420		*/
421		public void testPeek() {
422		PriorityBlockingQueue q = populatedQueue(SIZE);
423		for (int i = 0; i < SIZE; ++i) {
424	<	assertEquals(i, ((Integer)q.peek()).intValue());
425	<	q.poll();
424	>	assertEquals(i, q.peek());
425	>	assertEquals(i, q.poll());
426		assertTrue(q.peek() == null ||
427	<	i != ((Integer)q.peek()).intValue());
427	>	!q.peek().equals(i));
428		}
429		assertNull(q.peek());
430		}
#	Line 488 | Line 435 | public class PriorityBlockingQueueTest e
435		public void testElement() {
436		PriorityBlockingQueue q = populatedQueue(SIZE);
437		for (int i = 0; i < SIZE; ++i) {
438	<	assertEquals(i, ((Integer)q.element()).intValue());
439	<	q.poll();
438	>	assertEquals(i, q.element());
439	>	assertEquals(i, q.poll());
440		}
441		try {
442		q.element();
#	Line 503 | Line 450 | public class PriorityBlockingQueueTest e
450		public void testRemove() {
451		PriorityBlockingQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453	<	assertEquals(i, ((Integer)q.remove()).intValue());
453	>	assertEquals(i, q.remove());
454		}
455		try {
456		q.remove();
#	Line 512 | Line 459 | public class PriorityBlockingQueueTest e
459		}
460
461		/**
515	–	* remove(x) removes x and returns true if present
516	–	*/
517	–	public void testRemoveElement() {
518	–	PriorityBlockingQueue q = populatedQueue(SIZE);
519	–	for (int i = 1; i < SIZE; i+=2) {
520	–	assertTrue(q.remove(new Integer(i)));
521	–	}
522	–	for (int i = 0; i < SIZE; i+=2) {
523	–	assertTrue(q.remove(new Integer(i)));
524	–	assertFalse(q.remove(new Integer(i+1)));
525	–	}
526	–	assertTrue(q.isEmpty());
527	–	}
528	–
529	–	/**
462		* contains(x) reports true when elements added but not yet removed
463		*/
464		public void testContains() {
#	Line 603 | Line 535 | public class PriorityBlockingQueueTest e
535		}
536
537		/**
538	<	*  toArray contains all elements
538	>	* toArray contains all elements
539		*/
540		public void testToArray() throws InterruptedException {
541		PriorityBlockingQueue q = populatedQueue(SIZE);
542		Object[] o = q.toArray();
543		Arrays.sort(o);
544		for (int i = 0; i < o.length; i++)
545	<	assertEquals(o[i], q.take());
545	>	assertSame(o[i], q.take());
546		}
547
548		/**
549		* toArray(a) contains all elements
550		*/
551		public void testToArray2() throws InterruptedException {
552	<	PriorityBlockingQueue q = populatedQueue(SIZE);
552	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
553		Integer[] ints = new Integer[SIZE];
554	<	ints = (Integer[])q.toArray(ints);
554	>	Integer[] array = q.toArray(ints);
555	>	assertSame(ints, array);
556		Arrays.sort(ints);
557		for (int i = 0; i < ints.length; i++)
558	<	assertEquals(ints[i], q.take());
626	<	}
627	<
628	<	/**
629	<	* toArray(null) throws NPE
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) {}
558	>	assertSame(ints[i], q.take());
559		}
560
561		/**
562	<	* toArray with incompatible array type throws CCE
562	>	* toArray(incompatible array type) throws ArrayStoreException
563		*/
564		public void testToArray1_BadArg() {
565	+	PriorityBlockingQueue q = populatedQueue(SIZE);
566		try {
567	<	PriorityBlockingQueue q = populatedQueue(SIZE);
645	<	Object o[] = q.toArray(new String[10] );
567	>	q.toArray(new String[10]);
568		shouldThrow();
569	<	} catch (ArrayStoreException  success) {}
569	>	} catch (ArrayStoreException success) {}
570		}
571
572		/**
#	Line 664 | Line 586 | public class PriorityBlockingQueueTest e
586		/**
587		* iterator.remove removes current element
588		*/
589	<	public void testIteratorRemove () {
589	>	public void testIteratorRemove() {
590		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
591		q.add(new Integer(2));
592		q.add(new Integer(1));
#	Line 680 | Line 602 | public class PriorityBlockingQueueTest e
602		assertFalse(it.hasNext());
603		}
604
683	–
605		/**
606		* toString contains toStrings of elements
607		*/
#	Line 688 | Line 609 | public class PriorityBlockingQueueTest e
609		PriorityBlockingQueue q = populatedQueue(SIZE);
610		String s = q.toString();
611		for (int i = 0; i < SIZE; ++i) {
612	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
612	>	assertTrue(s.contains(String.valueOf(i)));
613		}
614		}
615
616		/**
617	<	* offer transfers elements across Executor tasks
617	>	* timed poll transfers elements across Executor tasks
618		*/
619		public void testPollInExecutor() {
620		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
621	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
622		ExecutorService executor = Executors.newFixedThreadPool(2);
623		executor.execute(new CheckedRunnable() {
624		public void realRun() throws InterruptedException {
625	<	threadAssertNull(q.poll());
626	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
627	<	threadAssertTrue(q.isEmpty());
625	>	assertNull(q.poll());
626	>	threadsStarted.await();
627	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628	>	checkEmpty(q);
629		}});
630
631		executor.execute(new CheckedRunnable() {
632		public void realRun() throws InterruptedException {
633	<	Thread.sleep(SMALL_DELAY_MS);
634	<	q.put(new Integer(1));
633	>	threadsStarted.await();
634	>	q.put(one);
635		}});
636
637		joinPool(executor);
#	Line 718 | Line 641 | public class PriorityBlockingQueueTest e
641		* A deserialized serialized queue has same elements
642		*/
643		public void testSerialization() throws Exception {
644	<	PriorityBlockingQueue q = populatedQueue(SIZE);
645	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
723	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
724	<	out.writeObject(q);
725	<	out.close();
726	<
727	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
728	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
729	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
730	<	assertEquals(q.size(), r.size());
731	<	while (!q.isEmpty())
732	<	assertEquals(q.remove(), r.remove());
733	<	}
644	>	Queue x = populatedQueue(SIZE);
645	>	Queue y = serialClone(x);
646
647	<	/**
648	<	* drainTo(null) throws NPE
649	<	*/
650	<	public void testDrainToNull() {
651	<	PriorityBlockingQueue q = populatedQueue(SIZE);
652	<	try {
653	<	q.drainTo(null);
742	<	shouldThrow();
743	<	} catch (NullPointerException success) {}
744	<	}
745	<
746	<	/**
747	<	* drainTo(this) throws IAE
748	<	*/
749	<	public void testDrainToSelf() {
750	<	PriorityBlockingQueue q = populatedQueue(SIZE);
751	<	try {
752	<	q.drainTo(q);
753	<	shouldThrow();
754	<	} catch (IllegalArgumentException success) {}
647	>	assertTrue(x != y);
648	>	assertEquals(x.size(), y.size());
649	>	while (!x.isEmpty()) {
650	>	assertFalse(y.isEmpty());
651	>	assertEquals(x.remove(), y.remove());
652	>	}
653	>	assertTrue(y.isEmpty());
654		}
655
656		/**
#	Line 761 | Line 660 | public class PriorityBlockingQueueTest e
660		PriorityBlockingQueue q = populatedQueue(SIZE);
661		ArrayList l = new ArrayList();
662		q.drainTo(l);
663	<	assertEquals(q.size(), 0);
664	<	assertEquals(l.size(), SIZE);
663	>	assertEquals(0, q.size());
664	>	assertEquals(SIZE, l.size());
665		for (int i = 0; i < SIZE; ++i)
666		assertEquals(l.get(i), new Integer(i));
667		q.add(zero);
#	Line 772 | Line 671 | public class PriorityBlockingQueueTest e
671		assertTrue(q.contains(one));
672		l.clear();
673		q.drainTo(l);
674	<	assertEquals(q.size(), 0);
675	<	assertEquals(l.size(), 2);
674	>	assertEquals(0, q.size());
675	>	assertEquals(2, l.size());
676		for (int i = 0; i < 2; ++i)
677		assertEquals(l.get(i), new Integer(i));
678		}
#	Line 799 | Line 698 | public class PriorityBlockingQueueTest e
698		}
699
700		/**
701	<	* drainTo(null, n) throws NPE
803	<	*/
804	<	public void testDrainToNullN() {
805	<	PriorityBlockingQueue q = populatedQueue(SIZE);
806	<	try {
807	<	q.drainTo(null, 0);
808	<	shouldThrow();
809	<	} catch (NullPointerException success) {}
810	<	}
811	<
812	<	/**
813	<	* drainTo(this, n) throws IAE
814	<	*/
815	<	public void testDrainToSelfN() {
816	<	PriorityBlockingQueue q = populatedQueue(SIZE);
817	<	try {
818	<	q.drainTo(q, 0);
819	<	shouldThrow();
820	<	} catch (IllegalArgumentException success) {}
821	<	}
822	<
823	<	/**
824	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
701	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
702		*/
703		public void testDrainToN() {
704		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
#	Line 830 | Line 707 | public class PriorityBlockingQueueTest e
707		assertTrue(q.offer(new Integer(j)));
708		ArrayList l = new ArrayList();
709		q.drainTo(l, i);
710	<	int k = (i < SIZE)? i : SIZE;
711	<	assertEquals(l.size(), k);
712	<	assertEquals(q.size(), SIZE-k);
710	>	int k = (i < SIZE) ? i : SIZE;
711	>	assertEquals(k, l.size());
712	>	assertEquals(SIZE-k, q.size());
713		for (int j = 0; j < k; ++j)
714		assertEquals(l.get(j), new Integer(j));
715		while (q.poll() != null) ;

Diff Legend

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