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.13 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.20 by jsr166, Sat Nov 21 19:11:53 2009 UTC

#	Line 9 | Line 9
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		public static void main(String[] args) {
17	<	junit.textui.TestRunner.run (suite());
17	>	junit.textui.TestRunner.run (suite());
18		}
19		public static Test suite() {
20	<	return new TestSuite(PriorityBlockingQueueTest.class);
20	>	return new TestSuite(PriorityBlockingQueueTest.class);
21		}
22
23		private static final int NOCAP = Integer.MAX_VALUE;
#	Line 39 | Line 40 | public class PriorityBlockingQueueTest e
40		private PriorityBlockingQueue populatedQueue(int n) {
41		PriorityBlockingQueue q = new PriorityBlockingQueue(n);
42		assertTrue(q.isEmpty());
43	<	for (int i = n-1; i >= 0; i-=2)
44	<	assertTrue(q.offer(new Integer(i)));
45	<	for (int i = (n & 1); i < n; i+=2)
46	<	assertTrue(q.offer(new Integer(i)));
43	>	for (int i = n-1; i >= 0; i-=2)
44	>	assertTrue(q.offer(new Integer(i)));
45	>	for (int i = (n & 1); i < n; i+=2)
46	>	assertTrue(q.offer(new Integer(i)));
47		assertFalse(q.isEmpty());
48		assertEquals(NOCAP, q.remainingCapacity());
49	<	assertEquals(n, q.size());
49	>	assertEquals(n, q.size());
50		return q;
51		}
52
#	Line 57 | Line 58 | public class PriorityBlockingQueueTest e
58		}
59
60		/**
61	<	* Constructor throws IAE if  capacity argument nonpositive
61	>	* Constructor throws IAE if capacity argument nonpositive
62		*/
63		public void testConstructor2() {
64		try {
65		PriorityBlockingQueue q = new PriorityBlockingQueue(0);
66		shouldThrow();
67	<	}
67	<	catch (IllegalArgumentException success) {}
67	>	} catch (IllegalArgumentException success) {}
68		}
69
70		/**
#	Line 74 | Line 74 | public class PriorityBlockingQueueTest e
74		try {
75		PriorityBlockingQueue q = new PriorityBlockingQueue(null);
76		shouldThrow();
77	<	}
78	<	catch (NullPointerException success) {}
77	>	} catch (NullPointerException success) {}
78		}
79
80		/**
#	Line 86 | Line 85 | public class PriorityBlockingQueueTest e
85		Integer[] ints = new Integer[SIZE];
86		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
87		shouldThrow();
88	<	}
90	<	catch (NullPointerException success) {}
88	>	} catch (NullPointerException success) {}
89		}
90
91		/**
#	Line 100 | Line 98 | public class PriorityBlockingQueueTest e
98		ints[i] = new Integer(i);
99		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
100		shouldThrow();
101	<	}
104	<	catch (NullPointerException success) {}
101	>	} catch (NullPointerException success) {}
102		}
103
104		/**
105		* Queue contains all elements of collection used to initialize
106		*/
107		public void testConstructor6() {
108	<	try {
109	<	Integer[] ints = new Integer[SIZE];
110	<	for (int i = 0; i < SIZE; ++i)
111	<	ints[i] = new Integer(i);
112	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
113	<	for (int i = 0; i < SIZE; ++i)
117	<	assertEquals(ints[i], q.poll());
118	<	}
119	<	finally {}
108	>	Integer[] ints = new Integer[SIZE];
109	>	for (int i = 0; i < SIZE; ++i)
110	>	ints[i] = new Integer(i);
111	>	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
112	>	for (int i = 0; i < SIZE; ++i)
113	>	assertEquals(ints[i], q.poll());
114		}
115
116		/**
117		* The comparator used in constructor is used
118		*/
119		public void testConstructor7() {
120	<	try {
121	<	MyReverseComparator cmp = new MyReverseComparator();
122	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
123	<	assertEquals(cmp, q.comparator());
124	<	Integer[] ints = new Integer[SIZE];
125	<	for (int i = 0; i < SIZE; ++i)
126	<	ints[i] = new Integer(i);
127	<	q.addAll(Arrays.asList(ints));
128	<	for (int i = SIZE-1; i >= 0; --i)
135	<	assertEquals(ints[i], q.poll());
136	<	}
137	<	finally {}
120	>	MyReverseComparator cmp = new MyReverseComparator();
121	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
122	>	assertEquals(cmp, q.comparator());
123	>	Integer[] ints = new Integer[SIZE];
124	>	for (int i = 0; i < SIZE; ++i)
125	>	ints[i] = new Integer(i);
126	>	q.addAll(Arrays.asList(ints));
127	>	for (int i = SIZE-1; i >= 0; --i)
128	>	assertEquals(ints[i], q.poll());
129		}
130
131		/**
#	Line 174 | Line 165 | public class PriorityBlockingQueueTest e
165		* offer(null) throws NPE
166		*/
167		public void testOfferNull() {
168	<	try {
168	>	try {
169		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
170		q.offer(null);
171		shouldThrow();
172	<	} catch (NullPointerException success) { }
172	>	} catch (NullPointerException success) {}
173		}
174
175		/**
176		* add(null) throws NPE
177		*/
178		public void testAddNull() {
179	<	try {
179	>	try {
180		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
181		q.add(null);
182		shouldThrow();
183	<	} catch (NullPointerException success) { }
183	>	} catch (NullPointerException success) {}
184		}
185
186		/**
#	Line 211 | Line 202 | public class PriorityBlockingQueueTest e
202		q.offer(new Object());
203		q.offer(new Object());
204		shouldThrow();
205	<	}
215	<	catch (ClassCastException success) {}
205	>	} catch (ClassCastException success) {}
206		}
207
208		/**
#	Line 234 | Line 224 | public class PriorityBlockingQueueTest e
224		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
225		q.addAll(null);
226		shouldThrow();
227	<	}
238	<	catch (NullPointerException success) {}
227	>	} catch (NullPointerException success) {}
228		}
229
230		/**
#	Line 246 | Line 235 | public class PriorityBlockingQueueTest e
235		PriorityBlockingQueue q = populatedQueue(SIZE);
236		q.addAll(q);
237		shouldThrow();
238	<	}
250	<	catch (IllegalArgumentException success) {}
238	>	} catch (IllegalArgumentException success) {}
239		}
240
241		/**
#	Line 259 | Line 247 | public class PriorityBlockingQueueTest e
247		Integer[] ints = new Integer[SIZE];
248		q.addAll(Arrays.asList(ints));
249		shouldThrow();
250	<	}
263	<	catch (NullPointerException success) {}
250	>	} catch (NullPointerException success) {}
251		}
252		/**
253		* addAll of a collection with any null elements throws NPE after
#	Line 274 | Line 261 | public class PriorityBlockingQueueTest e
261		ints[i] = new Integer(i);
262		q.addAll(Arrays.asList(ints));
263		shouldThrow();
264	<	}
278	<	catch (NullPointerException success) {}
264	>	} catch (NullPointerException success) {}
265		}
266
267		/**
268		* Queue contains all elements of successful addAll
269		*/
270		public void testAddAll5() {
271	<	try {
272	<	Integer[] empty = new Integer[0];
273	<	Integer[] ints = new Integer[SIZE];
274	<	for (int i = SIZE-1; i >= 0; --i)
275	<	ints[i] = new Integer(i);
276	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
277	<	assertFalse(q.addAll(Arrays.asList(empty)));
278	<	assertTrue(q.addAll(Arrays.asList(ints)));
279	<	for (int i = 0; i < SIZE; ++i)
294	<	assertEquals(ints[i], q.poll());
295	<	}
296	<	finally {}
271	>	Integer[] empty = new Integer[0];
272	>	Integer[] ints = new Integer[SIZE];
273	>	for (int i = SIZE-1; i >= 0; --i)
274	>	ints[i] = new Integer(i);
275	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
276	>	assertFalse(q.addAll(Arrays.asList(empty)));
277	>	assertTrue(q.addAll(Arrays.asList(ints)));
278	>	for (int i = 0; i < SIZE; ++i)
279	>	assertEquals(ints[i], q.poll());
280		}
281
282		/**
283		* put(null) throws NPE
284		*/
285		public void testPutNull() {
286	<	try {
286	>	try {
287		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
288		q.put(null);
289		shouldThrow();
290	<	}
308	<	catch (NullPointerException success){
309	<	}
290	>	} catch (NullPointerException success) {}
291		}
292
293		/**
294		* all elements successfully put are contained
295		*/
296		public void testPut() {
297	<	try {
298	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
299	<	for (int i = 0; i < SIZE; ++i) {
300	<	Integer I = new Integer(i);
301	<	q.put(I);
321	<	assertTrue(q.contains(I));
322	<	}
323	<	assertEquals(SIZE, q.size());
297	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
298	>	for (int i = 0; i < SIZE; ++i) {
299	>	Integer I = new Integer(i);
300	>	q.put(I);
301	>	assertTrue(q.contains(I));
302		}
303	<	finally {
326	<	}
303	>	assertEquals(SIZE, q.size());
304		}
305
306		/**
307		* put doesn't block waiting for take
308		*/
309	<	public void testPutWithTake() {
309	>	public void testPutWithTake() throws InterruptedException {
310		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
311	<	Thread t = new Thread(new Runnable() {
312	<	public void run() {
313	<	int added = 0;
314	<	try {
315	<	q.put(new Integer(0));
316	<	++added;
317	<	q.put(new Integer(0));
318	<	++added;
319	<	q.put(new Integer(0));
320	<	++added;
321	<	q.put(new Integer(0));
322	<	++added;
323	<	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	<	}
311	>	final int size = 4;
312	>	Thread t = new Thread(new CheckedRunnable() {
313	>	public void realRun() {
314	>	for (int i = 0; i < size; i++)
315	>	q.put(new Integer(0));
316	>	}});
317	>
318	>	t.start();
319	>	Thread.sleep(SHORT_DELAY_MS);
320	>	assertEquals(q.size(), size);
321	>	q.take();
322	>	t.interrupt();
323	>	t.join();
324		}
325
326		/**
327		* timed offer does not time out
328		*/
329	<	public void testTimedOffer() {
329	>	public void testTimedOffer() throws InterruptedException {
330		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
331	<	Thread t = new Thread(new Runnable() {
332	<	public void run() {
333	<	try {
334	<	q.put(new Integer(0));
335	<	q.put(new Integer(0));
336	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
337	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
374	<	} finally { }
375	<	}
376	<	});
331	>	Thread t = new Thread(new CheckedRunnable() {
332	>	public void realRun() {
333	>	q.put(new Integer(0));
334	>	q.put(new Integer(0));
335	>	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
336	>	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
337	>	}});
338
339	<	try {
340	<	t.start();
341	<	Thread.sleep(SMALL_DELAY_MS);
342	<	t.interrupt();
382	<	t.join();
383	<	} catch (Exception e){
384	<	unexpectedException();
385	<	}
339	>	t.start();
340	>	Thread.sleep(SMALL_DELAY_MS);
341	>	t.interrupt();
342	>	t.join();
343		}
344
345		/**
346		* take retrieves elements in priority order
347		*/
348	<	public void testTake() {
349	<	try {
350	<	PriorityBlockingQueue q = populatedQueue(SIZE);
351	<	for (int i = 0; i < SIZE; ++i) {
352	<	assertEquals(i, ((Integer)q.take()).intValue());
396	<	}
397	<	} catch (InterruptedException e){
398	<	unexpectedException();
399	<	}
348	>	public void testTake() throws InterruptedException {
349	>	PriorityBlockingQueue q = populatedQueue(SIZE);
350	>	for (int i = 0; i < SIZE; ++i) {
351	>	assertEquals(i, ((Integer)q.take()).intValue());
352	>	}
353		}
354
355		/**
356		* take blocks interruptibly when empty
357		*/
358	<	public void testTakeFromEmpty() {
358	>	public void testTakeFromEmpty() throws InterruptedException {
359		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
360	<	Thread t = new Thread(new Runnable() {
361	<	public void run() {
362	<	try {
363	<	q.take();
364	<	threadShouldThrow();
365	<	} catch (InterruptedException success){ }
366	<	}
367	<	});
368	<	try {
416	<	t.start();
417	<	Thread.sleep(SHORT_DELAY_MS);
418	<	t.interrupt();
419	<	t.join();
420	<	} catch (Exception e){
421	<	unexpectedException();
422	<	}
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		/**
372		* Take removes existing elements until empty, then blocks interruptibly
373		*/
374	<	public void testBlockingTake() {
375	<	Thread t = new Thread(new Runnable() {
376	<	public void run() {
377	<	try {
378	<	PriorityBlockingQueue q = populatedQueue(SIZE);
379	<	for (int i = 0; i < SIZE; ++i) {
380	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
381	<	}
382	<	q.take();
383	<	threadShouldThrow();
438	<	} catch (InterruptedException success){
439	<	}
440	<	}});
374	>	public void testBlockingTake() throws InterruptedException {
375	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
376	>	public void realRun() throws InterruptedException {
377	>	PriorityBlockingQueue q = populatedQueue(SIZE);
378	>	for (int i = 0; i < SIZE; ++i) {
379	>	threadAssertEquals(i, ((Integer)q.take()).intValue());
380	>	}
381	>	q.take();
382	>	}});
383	>
384		t.start();
385	<	try {
386	<	Thread.sleep(SHORT_DELAY_MS);
387	<	t.interrupt();
445	<	t.join();
446	<	}
447	<	catch (InterruptedException ie) {
448	<	unexpectedException();
449	<	}
385	>	Thread.sleep(SHORT_DELAY_MS);
386	>	t.interrupt();
387	>	t.join();
388		}
389
390
#	Line 458 | Line 396 | public class PriorityBlockingQueueTest e
396		for (int i = 0; i < SIZE; ++i) {
397		assertEquals(i, ((Integer)q.poll()).intValue());
398		}
399	<	assertNull(q.poll());
399	>	assertNull(q.poll());
400		}
401
402		/**
403		* timed pool with zero timeout succeeds when non-empty, else times out
404		*/
405	<	public void testTimedPoll0() {
406	<	try {
407	<	PriorityBlockingQueue q = populatedQueue(SIZE);
408	<	for (int i = 0; i < SIZE; ++i) {
409	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
410	<	}
473	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474	<	} catch (InterruptedException e){
475	<	unexpectedException();
476	<	}
405	>	public void testTimedPoll0() throws InterruptedException {
406	>	PriorityBlockingQueue q = populatedQueue(SIZE);
407	>	for (int i = 0; i < SIZE; ++i) {
408	>	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
409	>	}
410	>	assertNull(q.poll(0, MILLISECONDS));
411		}
412
413		/**
414		* timed pool with nonzero timeout succeeds when non-empty, else times out
415		*/
416	<	public void testTimedPoll() {
417	<	try {
418	<	PriorityBlockingQueue q = populatedQueue(SIZE);
419	<	for (int i = 0; i < SIZE; ++i) {
420	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
421	<	}
488	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
489	<	} catch (InterruptedException e){
490	<	unexpectedException();
491	<	}
416	>	public void testTimedPoll() throws InterruptedException {
417	>	PriorityBlockingQueue q = populatedQueue(SIZE);
418	>	for (int i = 0; i < SIZE; ++i) {
419	>	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
420	>	}
421	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
422		}
423
424		/**
425		* Interrupted timed poll throws InterruptedException instead of
426		* returning timeout status
427		*/
428	<	public void testInterruptedTimedPoll() {
429	<	Thread t = new Thread(new Runnable() {
430	<	public void run() {
431	<	try {
432	<	PriorityBlockingQueue q = populatedQueue(SIZE);
433	<	for (int i = 0; i < SIZE; ++i) {
434	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
435	<	}
436	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
437	<	} catch (InterruptedException success){
438	<	}
439	<	}});
428	>	public void testInterruptedTimedPoll() throws InterruptedException {
429	>	Thread t = new Thread(new CheckedRunnable() {
430	>	public void realRun() throws InterruptedException {
431	>	PriorityBlockingQueue q = populatedQueue(SIZE);
432	>	for (int i = 0; i < SIZE; ++i) {
433	>	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
434	>	}
435	>	try {
436	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
437	>	shouldThrow();
438	>	} catch (InterruptedException success) {}
439	>	}});
440	>
441		t.start();
442	<	try {
443	<	Thread.sleep(SHORT_DELAY_MS);
444	<	t.interrupt();
514	<	t.join();
515	<	}
516	<	catch (InterruptedException ie) {
517	<	unexpectedException();
518	<	}
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() {
451	>	public void testTimedPollWithOffer() throws InterruptedException {
452		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
453	<	Thread t = new Thread(new Runnable() {
454	<	public void run() {
455	<	try {
456	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
457	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
458	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
459	<	threadShouldThrow();
460	<	} catch (InterruptedException success) { }
461	<	}
462	<	});
463	<	try {
464	<	t.start();
465	<	Thread.sleep(SMALL_DELAY_MS);
466	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
467	<	t.interrupt();
542	<	t.join();
543	<	} catch (Exception e){
544	<	unexpectedException();
545	<	}
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) {}
461	>	}});
462	>
463	>	t.start();
464	>	Thread.sleep(SMALL_DELAY_MS);
465	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
466	>	t.interrupt();
467	>	t.join();
468		}
469
470
#	Line 557 | Line 479 | public class PriorityBlockingQueueTest e
479		assertTrue(q.peek() == null ||
480		i != ((Integer)q.peek()).intValue());
481		}
482	<	assertNull(q.peek());
482	>	assertNull(q.peek());
483		}
484
485		/**
#	Line 572 | Line 494 | public class PriorityBlockingQueueTest e
494		try {
495		q.element();
496		shouldThrow();
497	<	}
576	<	catch (NoSuchElementException success) {}
497	>	} catch (NoSuchElementException success) {}
498		}
499
500		/**
#	Line 587 | Line 508 | public class PriorityBlockingQueueTest e
508		try {
509		q.remove();
510		shouldThrow();
511	<	} catch (NoSuchElementException success){
591	<	}
511	>	} catch (NoSuchElementException success) {}
512		}
513
514		/**
#	Line 685 | Line 605 | public class PriorityBlockingQueueTest e
605		/**
606		*  toArray contains all elements
607		*/
608	<	public void testToArray() {
608	>	public void testToArray() throws InterruptedException {
609		PriorityBlockingQueue q = populatedQueue(SIZE);
610	<	Object[] o = q.toArray();
610	>	Object[] o = q.toArray();
611		Arrays.sort(o);
612	<	try {
613	<	for (int i = 0; i < o.length; i++)
694	<	assertEquals(o[i], q.take());
695	<	} catch (InterruptedException e){
696	<	unexpectedException();
697	<	}
612	>	for (int i = 0; i < o.length; i++)
613	>	assertEquals(o[i], q.take());
614		}
615
616		/**
617		* toArray(a) contains all elements
618		*/
619	<	public void testToArray2() {
619	>	public void testToArray2() throws InterruptedException {
620		PriorityBlockingQueue q = populatedQueue(SIZE);
621	<	Integer[] ints = new Integer[SIZE];
622	<	ints = (Integer[])q.toArray(ints);
621	>	Integer[] ints = new Integer[SIZE];
622	>	ints = (Integer[])q.toArray(ints);
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	>	assertEquals(ints[i], q.take());
626		}
627
628		/**
629		* toArray(null) throws NPE
630		*/
631		public void testToArray_BadArg() {
632	<	try {
632	>	try {
633		PriorityBlockingQueue q = populatedQueue(SIZE);
634	<	Object o[] = q.toArray(null);
635	<	shouldThrow();
636	<	} catch (NullPointerException success){}
634	>	Object o[] = q.toArray(null);
635	>	shouldThrow();
636	>	} catch (NullPointerException success) {}
637		}
638
639		/**
640		* toArray with incompatible array type throws CCE
641		*/
642		public void testToArray1_BadArg() {
643	<	try {
643	>	try {
644		PriorityBlockingQueue q = populatedQueue(SIZE);
645	<	Object o[] = q.toArray(new String[10] );
646	<	shouldThrow();
647	<	} catch (ArrayStoreException  success){}
645	>	Object o[] = q.toArray(new String[10] );
646	>	shouldThrow();
647	>	} catch (ArrayStoreException success) {}
648		}
649
650		/**
#	Line 741 | Line 653 | public class PriorityBlockingQueueTest e
653		public void testIterator() {
654		PriorityBlockingQueue q = populatedQueue(SIZE);
655		int i = 0;
656	<	Iterator it = q.iterator();
656	>	Iterator it = q.iterator();
657		while (it.hasNext()) {
658		assertTrue(q.contains(it.next()));
659		++i;
#	Line 786 | Line 698 | public class PriorityBlockingQueueTest e
698		public void testPollInExecutor() {
699		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
700		ExecutorService executor = Executors.newFixedThreadPool(2);
701	<	executor.execute(new Runnable() {
702	<	public void run() {
701	>	executor.execute(new CheckedRunnable() {
702	>	public void realRun() throws InterruptedException {
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	<	});
801	<
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	<	});
704	>	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
705	>	threadAssertTrue(q.isEmpty());
706	>	}});
707	>
708	>	executor.execute(new CheckedRunnable() {
709	>	public void realRun() throws InterruptedException {
710	>	Thread.sleep(SMALL_DELAY_MS);
711	>	q.put(new Integer(1));
712	>	}});
713
714		joinPool(executor);
715		}
#	Line 817 | Line 717 | public class PriorityBlockingQueueTest e
717		/**
718		* A deserialized serialized queue has same elements
719		*/
720	<	public void testSerialization() {
720	>	public void testSerialization() throws Exception {
721		PriorityBlockingQueue q = populatedQueue(SIZE);
722	<	try {
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())
833	<	assertEquals(q.remove(), r.remove());
834	<	} catch (Exception e){
835	<	unexpectedException();
836	<	}
722	>	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		}
734
735		/**
#	Line 844 | Line 740 | public class PriorityBlockingQueueTest e
740		try {
741		q.drainTo(null);
742		shouldThrow();
743	<	} catch (NullPointerException success) {
848	<	}
743	>	} catch (NullPointerException success) {}
744		}
745
746		/**
#	Line 856 | Line 751 | public class PriorityBlockingQueueTest e
751		try {
752		q.drainTo(q);
753		shouldThrow();
754	<	} catch (IllegalArgumentException success) {
860	<	}
754	>	} catch (IllegalArgumentException success) {}
755		}
756
757		/**
#	Line 887 | Line 781 | public class PriorityBlockingQueueTest e
781		/**
782		* drainTo empties queue
783		*/
784	<	public void testDrainToWithActivePut() {
784	>	public void testDrainToWithActivePut() throws InterruptedException {
785		final PriorityBlockingQueue q = populatedQueue(SIZE);
786	<	Thread t = new Thread(new Runnable() {
787	<	public void run() {
788	<	q.put(new Integer(SIZE+1));
789	<	}
790	<	});
791	<	try {
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();
905	<	assertTrue(q.size() + l.size() >= SIZE);
906	<	} catch (Exception e){
907	<	unexpectedException();
908	<	}
786	>	Thread t = new Thread(new CheckedRunnable() {
787	>	public void realRun() {
788	>	q.put(new Integer(SIZE+1));
789	>	}});
790	>
791	>	t.start();
792	>	ArrayList l = new ArrayList();
793	>	q.drainTo(l);
794	>	assertTrue(l.size() >= SIZE);
795	>	for (int i = 0; i < SIZE; ++i)
796	>	assertEquals(l.get(i), new Integer(i));
797	>	t.join();
798	>	assertTrue(q.size() + l.size() >= SIZE);
799		}
800
801		/**
#	Line 916 | Line 806 | public class PriorityBlockingQueueTest e
806		try {
807		q.drainTo(null, 0);
808		shouldThrow();
809	<	} catch (NullPointerException success) {
920	<	}
809	>	} catch (NullPointerException success) {}
810		}
811
812		/**
#	Line 928 | Line 817 | public class PriorityBlockingQueueTest e
817		try {
818		q.drainTo(q, 0);
819		shouldThrow();
820	<	} catch (IllegalArgumentException success) {
932	<	}
820	>	} catch (IllegalArgumentException success) {}
821		}
822
823		/**
#	Line 951 | Line 839 | public class PriorityBlockingQueueTest e
839		}
840		}
841
954	–
842		}

Diff Legend

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