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.14 by jsr166, Mon Nov 16 05:30:08 2009 UTC vs.
Revision 1.32 by jsr166, Tue Oct 19 00:43:49 2010 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	+
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;
#	Line 24 | Line 41 | public class PriorityBlockingQueueTest e
41		/** Sample 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 39 | Line 52 | public class PriorityBlockingQueueTest e
52		private PriorityBlockingQueue populatedQueue(int n) {
53		PriorityBlockingQueue q = new PriorityBlockingQueue(n);
54		assertTrue(q.isEmpty());
55	<	for (int i = n-1; i >= 0; i-=2)
56	<	assertTrue(q.offer(new Integer(i)));
57	<	for (int i = (n & 1); i < n; i+=2)
58	<	assertTrue(q.offer(new Integer(i)));
55	>	for (int i = n-1; i >= 0; i-=2)
56	>	assertTrue(q.offer(new Integer(i)));
57	>	for (int i = (n & 1); i < n; i+=2)
58	>	assertTrue(q.offer(new Integer(i)));
59		assertFalse(q.isEmpty());
60		assertEquals(NOCAP, q.remainingCapacity());
61	<	assertEquals(n, q.size());
61	>	assertEquals(n, q.size());
62		return q;
63		}
64
#	Line 57 | Line 70 | public class PriorityBlockingQueueTest e
70		}
71
72		/**
73	<	* Constructor throws IAE if  capacity argument nonpositive
73	>	* Constructor throws IAE if capacity argument nonpositive
74		*/
75		public void testConstructor2() {
76		try {
77		PriorityBlockingQueue q = new PriorityBlockingQueue(0);
78		shouldThrow();
79	<	}
67	<	catch (IllegalArgumentException success) {}
79	>	} catch (IllegalArgumentException success) {}
80		}
81
82		/**
#	Line 74 | Line 86 | public class PriorityBlockingQueueTest e
86		try {
87		PriorityBlockingQueue q = new PriorityBlockingQueue(null);
88		shouldThrow();
89	<	}
78	<	catch (NullPointerException success) {}
89	>	} catch (NullPointerException success) {}
90		}
91
92		/**
#	Line 86 | Line 97 | public class PriorityBlockingQueueTest e
97		Integer[] ints = new Integer[SIZE];
98		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
99		shouldThrow();
100	<	}
90	<	catch (NullPointerException success) {}
100	>	} catch (NullPointerException success) {}
101		}
102
103		/**
#	Line 100 | Line 110 | public class PriorityBlockingQueueTest e
110		ints[i] = new Integer(i);
111		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
112		shouldThrow();
113	<	}
104	<	catch (NullPointerException success) {}
113	>	} catch (NullPointerException success) {}
114		}
115
116		/**
117		* Queue contains all elements of collection used to initialize
118		*/
119		public void testConstructor6() {
120	<	try {
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)
117	<	assertEquals(ints[i], q.poll());
118	<	}
119	<	finally {}
120	>	Integer[] ints = new Integer[SIZE];
121	>	for (int i = 0; i < SIZE; ++i)
122	>	ints[i] = new Integer(i);
123	>	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
124	>	for (int i = 0; i < SIZE; ++i)
125	>	assertEquals(ints[i], q.poll());
126		}
127
128		/**
129		* The comparator used in constructor is used
130		*/
131		public void testConstructor7() {
132	<	try {
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)
135	<	assertEquals(ints[i], q.poll());
136	<	}
137	<	finally {}
132	>	MyReverseComparator cmp = new MyReverseComparator();
133	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE, cmp);
134	>	assertEquals(cmp, q.comparator());
135	>	Integer[] ints = new Integer[SIZE];
136	>	for (int i = 0; i < SIZE; ++i)
137	>	ints[i] = new Integer(i);
138	>	q.addAll(Arrays.asList(ints));
139	>	for (int i = SIZE-1; i >= 0; --i)
140	>	assertEquals(ints[i], q.poll());
141		}
142
143		/**
#	Line 174 | Line 177 | public class PriorityBlockingQueueTest e
177		* offer(null) throws NPE
178		*/
179		public void testOfferNull() {
180	<	try {
180	>	try {
181		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
182		q.offer(null);
183		shouldThrow();
184	<	} catch (NullPointerException success) { }
184	>	} catch (NullPointerException success) {}
185		}
186
187		/**
188		* add(null) throws NPE
189		*/
190		public void testAddNull() {
191	<	try {
191	>	try {
192		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
193		q.add(null);
194		shouldThrow();
195	<	} catch (NullPointerException success) { }
195	>	} catch (NullPointerException success) {}
196		}
197
198		/**
#	Line 211 | Line 214 | public class PriorityBlockingQueueTest e
214		q.offer(new Object());
215		q.offer(new Object());
216		shouldThrow();
217	<	}
215	<	catch (ClassCastException success) {}
217	>	} catch (ClassCastException success) {}
218		}
219
220		/**
#	Line 234 | Line 236 | public class PriorityBlockingQueueTest e
236		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
237		q.addAll(null);
238		shouldThrow();
239	<	}
238	<	catch (NullPointerException success) {}
239	>	} catch (NullPointerException success) {}
240		}
241
242		/**
#	Line 246 | Line 247 | public class PriorityBlockingQueueTest e
247		PriorityBlockingQueue q = populatedQueue(SIZE);
248		q.addAll(q);
249		shouldThrow();
250	<	}
250	<	catch (IllegalArgumentException success) {}
250	>	} catch (IllegalArgumentException success) {}
251		}
252
253		/**
#	Line 259 | Line 259 | public class PriorityBlockingQueueTest e
259		Integer[] ints = new Integer[SIZE];
260		q.addAll(Arrays.asList(ints));
261		shouldThrow();
262	<	}
263	<	catch (NullPointerException success) {}
262	>	} catch (NullPointerException success) {}
263		}
264	+
265		/**
266		* addAll of a collection with any null elements throws NPE after
267		* possibly adding some elements
#	Line 274 | Line 274 | public class PriorityBlockingQueueTest e
274		ints[i] = new Integer(i);
275		q.addAll(Arrays.asList(ints));
276		shouldThrow();
277	<	}
278	<	catch (NullPointerException success) {}
277	>	} catch (NullPointerException success) {}
278		}
279
280		/**
281		* Queue contains all elements of successful addAll
282		*/
283		public void testAddAll5() {
284	<	try {
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)
294	<	assertEquals(ints[i], q.poll());
295	<	}
296	<	finally {}
284	>	Integer[] empty = new Integer[0];
285	>	Integer[] ints = new Integer[SIZE];
286	>	for (int i = SIZE-1; i >= 0; --i)
287	>	ints[i] = new Integer(i);
288	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
289	>	assertFalse(q.addAll(Arrays.asList(empty)));
290	>	assertTrue(q.addAll(Arrays.asList(ints)));
291	>	for (int i = 0; i < SIZE; ++i)
292	>	assertEquals(ints[i], q.poll());
293		}
294
295		/**
296		* put(null) throws NPE
297		*/
298		public void testPutNull() {
299	<	try {
299	>	try {
300		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
301		q.put(null);
302		shouldThrow();
303	<	}
308	<	catch (NullPointerException success) {
309	<	}
303	>	} catch (NullPointerException success) {}
304		}
305
306		/**
307		* all elements successfully put are contained
308		*/
309		public void testPut() {
310	<	try {
311	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
312	<	for (int i = 0; i < SIZE; ++i) {
313	<	Integer I = new Integer(i);
314	<	q.put(I);
321	<	assertTrue(q.contains(I));
322	<	}
323	<	assertEquals(SIZE, q.size());
310	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
311	>	for (int i = 0; i < SIZE; ++i) {
312	>	Integer I = new Integer(i);
313	>	q.put(I);
314	>	assertTrue(q.contains(I));
315		}
316	<	finally {
326	<	}
316	>	assertEquals(SIZE, q.size());
317		}
318
319		/**
320		* put doesn't block waiting for take
321		*/
322	<	public void testPutWithTake() {
322	>	public void testPutWithTake() throws InterruptedException {
323		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
324	<	Thread t = new Thread(new Runnable() {
325	<	public void run() {
326	<	int added = 0;
327	<	try {
328	<	q.put(new Integer(0));
329	<	++added;
330	<	q.put(new Integer(0));
331	<	++added;
332	<	q.put(new Integer(0));
333	<	++added;
334	<	q.put(new Integer(0));
335	<	++added;
336	<	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	<	}
324	>	final int size = 4;
325	>	Thread t = new Thread(new CheckedRunnable() {
326	>	public void realRun() {
327	>	for (int i = 0; i < size; i++)
328	>	q.put(new Integer(0));
329	>	}});
330	>
331	>	t.start();
332	>	Thread.sleep(SHORT_DELAY_MS);
333	>	assertEquals(q.size(), size);
334	>	q.take();
335	>	t.interrupt();
336	>	t.join();
337		}
338
339		/**
340		* timed offer does not time out
341		*/
342	<	public void testTimedOffer() {
342	>	public void testTimedOffer() throws InterruptedException {
343		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
344	<	Thread t = new Thread(new Runnable() {
345	<	public void run() {
346	<	try {
347	<	q.put(new Integer(0));
348	<	q.put(new Integer(0));
349	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
350	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
374	<	} finally { }
375	<	}
376	<	});
344	>	Thread t = new Thread(new CheckedRunnable() {
345	>	public void realRun() {
346	>	q.put(new Integer(0));
347	>	q.put(new Integer(0));
348	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
349	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
350	>	}});
351
352	<	try {
353	<	t.start();
354	<	Thread.sleep(SMALL_DELAY_MS);
355	<	t.interrupt();
382	<	t.join();
383	<	} catch (Exception e) {
384	<	unexpectedException();
385	<	}
352	>	t.start();
353	>	Thread.sleep(SMALL_DELAY_MS);
354	>	t.interrupt();
355	>	t.join();
356		}
357
358		/**
359		* take retrieves elements in priority order
360		*/
361	<	public void testTake() {
362	<	try {
363	<	PriorityBlockingQueue q = populatedQueue(SIZE);
364	<	for (int i = 0; i < SIZE; ++i) {
365	<	assertEquals(i, ((Integer)q.take()).intValue());
396	<	}
397	<	} catch (InterruptedException e) {
398	<	unexpectedException();
399	<	}
361	>	public void testTake() throws InterruptedException {
362	>	PriorityBlockingQueue q = populatedQueue(SIZE);
363	>	for (int i = 0; i < SIZE; ++i) {
364	>	assertEquals(i, q.take());
365	>	}
366		}
367
368		/**
369		* take blocks interruptibly when empty
370		*/
371	<	public void testTakeFromEmpty() {
371	>	public void testTakeFromEmpty() throws InterruptedException {
372		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
373	<	Thread t = new Thread(new Runnable() {
374	<	public void run() {
375	<	try {
376	<	q.take();
377	<	threadShouldThrow();
378	<	} catch (InterruptedException success) { }
379	<	}
380	<	});
381	<	try {
416	<	t.start();
417	<	Thread.sleep(SHORT_DELAY_MS);
418	<	t.interrupt();
419	<	t.join();
420	<	} catch (Exception e) {
421	<	unexpectedException();
422	<	}
373	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
374	>	public void realRun() throws InterruptedException {
375	>	q.take();
376	>	}});
377	>
378	>	t.start();
379	>	Thread.sleep(SHORT_DELAY_MS);
380	>	t.interrupt();
381	>	t.join();
382		}
383
384		/**
385		* Take removes existing elements until empty, then blocks interruptibly
386		*/
387	<	public void testBlockingTake() {
388	<	Thread t = new Thread(new Runnable() {
389	<	public void run() {
390	<	try {
391	<	PriorityBlockingQueue q = populatedQueue(SIZE);
392	<	for (int i = 0; i < SIZE; ++i) {
393	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
394	<	}
395	<	q.take();
396	<	threadShouldThrow();
397	<	} catch (InterruptedException success) {
398	<	}
399	<	}});
387	>	public void testBlockingTake() throws InterruptedException {
388	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
389	>	Thread t = new Thread(new CheckedRunnable() {
390	>	public void realRun() throws InterruptedException {
391	>	for (int i = 0; i < SIZE; ++i) {
392	>	assertEquals(i, q.take());
393	>	}
394	>	try {
395	>	q.take();
396	>	shouldThrow();
397	>	} catch (InterruptedException success) {}
398	>	}});
399	>
400		t.start();
401	<	try {
402	<	Thread.sleep(SHORT_DELAY_MS);
403	<	t.interrupt();
445	<	t.join();
446	<	}
447	<	catch (InterruptedException ie) {
448	<	unexpectedException();
449	<	}
401	>	Thread.sleep(SHORT_DELAY_MS);
402	>	t.interrupt();
403	>	t.join();
404		}
405
406
#	Line 456 | Line 410 | public class PriorityBlockingQueueTest e
410		public void testPoll() {
411		PriorityBlockingQueue q = populatedQueue(SIZE);
412		for (int i = 0; i < SIZE; ++i) {
413	<	assertEquals(i, ((Integer)q.poll()).intValue());
413	>	assertEquals(i, q.poll());
414		}
415	<	assertNull(q.poll());
415	>	assertNull(q.poll());
416		}
417
418		/**
419		* timed pool with zero timeout succeeds when non-empty, else times out
420		*/
421	<	public void testTimedPoll0() {
422	<	try {
423	<	PriorityBlockingQueue q = populatedQueue(SIZE);
424	<	for (int i = 0; i < SIZE; ++i) {
425	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
426	<	}
473	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474	<	} catch (InterruptedException e) {
475	<	unexpectedException();
476	<	}
421	>	public void testTimedPoll0() throws InterruptedException {
422	>	PriorityBlockingQueue q = populatedQueue(SIZE);
423	>	for (int i = 0; i < SIZE; ++i) {
424	>	assertEquals(i, q.poll(0, MILLISECONDS));
425	>	}
426	>	assertNull(q.poll(0, MILLISECONDS));
427		}
428
429		/**
430		* timed pool with nonzero timeout succeeds when non-empty, else times out
431		*/
432	<	public void testTimedPoll() {
433	<	try {
434	<	PriorityBlockingQueue q = populatedQueue(SIZE);
435	<	for (int i = 0; i < SIZE; ++i) {
436	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
437	<	}
488	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
489	<	} catch (InterruptedException e) {
490	<	unexpectedException();
491	<	}
432	>	public void testTimedPoll() throws InterruptedException {
433	>	PriorityBlockingQueue q = populatedQueue(SIZE);
434	>	for (int i = 0; i < SIZE; ++i) {
435	>	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
436	>	}
437	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
438		}
439
440		/**
441		* Interrupted timed poll throws InterruptedException instead of
442		* returning timeout status
443		*/
444	<	public void testInterruptedTimedPoll() {
445	<	Thread t = new Thread(new Runnable() {
446	<	public void run() {
447	<	try {
448	<	PriorityBlockingQueue q = populatedQueue(SIZE);
449	<	for (int i = 0; i < SIZE; ++i) {
504	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
505	<	}
506	<	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) { }
444	>	public void testInterruptedTimedPoll() throws InterruptedException {
445	>	Thread t = new Thread(new CheckedRunnable() {
446	>	public void realRun() throws InterruptedException {
447	>	PriorityBlockingQueue q = populatedQueue(SIZE);
448	>	for (int i = 0; i < SIZE; ++i) {
449	>	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
450		}
451	<	});
452	<	try {
453	<	t.start();
454	<	Thread.sleep(SMALL_DELAY_MS);
455	<	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
541	<	t.interrupt();
542	<	t.join();
543	<	} catch (Exception e) {
544	<	unexpectedException();
545	<	}
546	<	}
451	>	try {
452	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
453	>	shouldThrow();
454	>	} catch (InterruptedException success) {}
455	>	}});
456
457	+	t.start();
458	+	Thread.sleep(SHORT_DELAY_MS);
459	+	t.interrupt();
460	+	t.join();
461	+	}
462
463		/**
464		* peek returns next element, or null if empty
#	Line 552 | Line 466 | public class PriorityBlockingQueueTest e
466		public void testPeek() {
467		PriorityBlockingQueue q = populatedQueue(SIZE);
468		for (int i = 0; i < SIZE; ++i) {
469	<	assertEquals(i, ((Integer)q.peek()).intValue());
470	<	q.poll();
469	>	assertEquals(i, q.peek());
470	>	assertEquals(i, q.poll());
471		assertTrue(q.peek() == null ||
472	<	i != ((Integer)q.peek()).intValue());
472	>	!q.peek().equals(i));
473		}
474	<	assertNull(q.peek());
474	>	assertNull(q.peek());
475		}
476
477		/**
#	Line 566 | Line 480 | public class PriorityBlockingQueueTest e
480		public void testElement() {
481		PriorityBlockingQueue q = populatedQueue(SIZE);
482		for (int i = 0; i < SIZE; ++i) {
483	<	assertEquals(i, ((Integer)q.element()).intValue());
484	<	q.poll();
483	>	assertEquals(i, q.element());
484	>	assertEquals(i, q.poll());
485		}
486		try {
487		q.element();
488		shouldThrow();
489	<	}
576	<	catch (NoSuchElementException success) {}
489	>	} catch (NoSuchElementException success) {}
490		}
491
492		/**
#	Line 582 | Line 495 | public class PriorityBlockingQueueTest e
495		public void testRemove() {
496		PriorityBlockingQueue q = populatedQueue(SIZE);
497		for (int i = 0; i < SIZE; ++i) {
498	<	assertEquals(i, ((Integer)q.remove()).intValue());
498	>	assertEquals(i, q.remove());
499		}
500		try {
501		q.remove();
502		shouldThrow();
503	<	} catch (NoSuchElementException success) {
591	<	}
503	>	} catch (NoSuchElementException success) {}
504		}
505
506		/**
#	Line 683 | Line 595 | public class PriorityBlockingQueueTest e
595		}
596
597		/**
598	<	*  toArray contains all elements
598	>	* toArray contains all elements
599		*/
600	<	public void testToArray() {
600	>	public void testToArray() throws InterruptedException {
601		PriorityBlockingQueue q = populatedQueue(SIZE);
602	<	Object[] o = q.toArray();
602	>	Object[] o = q.toArray();
603		Arrays.sort(o);
604	<	try {
605	<	for (int i = 0; i < o.length; i++)
694	<	assertEquals(o[i], q.take());
695	<	} catch (InterruptedException e) {
696	<	unexpectedException();
697	<	}
604	>	for (int i = 0; i < o.length; i++)
605	>	assertEquals(o[i], q.take());
606		}
607
608		/**
609		* toArray(a) contains all elements
610		*/
611	<	public void testToArray2() {
611	>	public void testToArray2() throws InterruptedException {
612		PriorityBlockingQueue q = populatedQueue(SIZE);
613	<	Integer[] ints = new Integer[SIZE];
614	<	ints = (Integer[])q.toArray(ints);
613	>	Integer[] ints = new Integer[SIZE];
614	>	ints = (Integer[])q.toArray(ints);
615		Arrays.sort(ints);
616	<	try {
617	<	for (int i = 0; i < ints.length; i++)
710	<	assertEquals(ints[i], q.take());
711	<	} catch (InterruptedException e) {
712	<	unexpectedException();
713	<	}
616	>	for (int i = 0; i < ints.length; i++)
617	>	assertEquals(ints[i], q.take());
618		}
619
620		/**
621		* toArray(null) throws NPE
622		*/
623		public void testToArray_BadArg() {
624	<	try {
625	<	PriorityBlockingQueue q = populatedQueue(SIZE);
626	<	Object o[] = q.toArray(null);
627	<	shouldThrow();
628	<	} catch (NullPointerException success) {}
624	>	PriorityBlockingQueue q = populatedQueue(SIZE);
625	>	try {
626	>	Object o[] = q.toArray(null);
627	>	shouldThrow();
628	>	} catch (NullPointerException success) {}
629		}
630
631		/**
632		* toArray with incompatible array type throws CCE
633		*/
634		public void testToArray1_BadArg() {
635	<	try {
636	<	PriorityBlockingQueue q = populatedQueue(SIZE);
637	<	Object o[] = q.toArray(new String[10] );
638	<	shouldThrow();
639	<	} catch (ArrayStoreException  success) {}
635	>	PriorityBlockingQueue q = populatedQueue(SIZE);
636	>	try {
637	>	Object o[] = q.toArray(new String[10]);
638	>	shouldThrow();
639	>	} catch (ArrayStoreException success) {}
640		}
641
642		/**
#	Line 741 | Line 645 | public class PriorityBlockingQueueTest e
645		public void testIterator() {
646		PriorityBlockingQueue q = populatedQueue(SIZE);
647		int i = 0;
648	<	Iterator it = q.iterator();
648	>	Iterator it = q.iterator();
649		while (it.hasNext()) {
650		assertTrue(q.contains(it.next()));
651		++i;
#	Line 752 | Line 656 | public class PriorityBlockingQueueTest e
656		/**
657		* iterator.remove removes current element
658		*/
659	<	public void testIteratorRemove () {
659	>	public void testIteratorRemove() {
660		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
661		q.add(new Integer(2));
662		q.add(new Integer(1));
#	Line 786 | Line 690 | public class PriorityBlockingQueueTest e
690		public void testPollInExecutor() {
691		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
692		ExecutorService executor = Executors.newFixedThreadPool(2);
693	<	executor.execute(new Runnable() {
694	<	public void run() {
695	<	threadAssertNull(q.poll());
696	<	try {
697	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
698	<	threadAssertTrue(q.isEmpty());
699	<	}
700	<	catch (InterruptedException e) {
701	<	threadUnexpectedException();
702	<	}
703	<	}
704	<	});
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	<	});
693	>	executor.execute(new CheckedRunnable() {
694	>	public void realRun() throws InterruptedException {
695	>	assertNull(q.poll());
696	>	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
697	>	assertTrue(q.isEmpty());
698	>	}});
699	>
700	>	executor.execute(new CheckedRunnable() {
701	>	public void realRun() throws InterruptedException {
702	>	Thread.sleep(SMALL_DELAY_MS);
703	>	q.put(one);
704	>	}});
705
706		joinPool(executor);
707		}
#	Line 817 | Line 709 | public class PriorityBlockingQueueTest e
709		/**
710		* A deserialized serialized queue has same elements
711		*/
712	<	public void testSerialization() {
712	>	public void testSerialization() throws Exception {
713		PriorityBlockingQueue q = populatedQueue(SIZE);
714	<	try {
715	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
716	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
717	<	out.writeObject(q);
718	<	out.close();
719	<
720	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
721	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
722	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
723	<	assertEquals(q.size(), r.size());
724	<	while (!q.isEmpty())
833	<	assertEquals(q.remove(), r.remove());
834	<	} catch (Exception e) {
835	<	unexpectedException();
836	<	}
714	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
715	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
716	>	out.writeObject(q);
717	>	out.close();
718	>
719	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
720	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
721	>	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
722	>	assertEquals(q.size(), r.size());
723	>	while (!q.isEmpty())
724	>	assertEquals(q.remove(), r.remove());
725		}
726
727		/**
#	Line 844 | Line 732 | public class PriorityBlockingQueueTest e
732		try {
733		q.drainTo(null);
734		shouldThrow();
735	<	} catch (NullPointerException success) {
848	<	}
735	>	} catch (NullPointerException success) {}
736		}
737
738		/**
#	Line 856 | Line 743 | public class PriorityBlockingQueueTest e
743		try {
744		q.drainTo(q);
745		shouldThrow();
746	<	} catch (IllegalArgumentException success) {
860	<	}
746	>	} catch (IllegalArgumentException success) {}
747		}
748
749		/**
#	Line 887 | Line 773 | public class PriorityBlockingQueueTest e
773		/**
774		* drainTo empties queue
775		*/
776	<	public void testDrainToWithActivePut() {
776	>	public void testDrainToWithActivePut() throws InterruptedException {
777		final PriorityBlockingQueue q = populatedQueue(SIZE);
778	<	Thread t = new Thread(new Runnable() {
779	<	public void run() {
780	<	q.put(new Integer(SIZE+1));
781	<	}
782	<	});
783	<	try {
784	<	t.start();
785	<	ArrayList l = new ArrayList();
786	<	q.drainTo(l);
787	<	assertTrue(l.size() >= SIZE);
788	<	for (int i = 0; i < SIZE; ++i)
789	<	assertEquals(l.get(i), new Integer(i));
790	<	t.join();
905	<	assertTrue(q.size() + l.size() >= SIZE);
906	<	} catch (Exception e) {
907	<	unexpectedException();
908	<	}
778	>	Thread t = new Thread(new CheckedRunnable() {
779	>	public void realRun() {
780	>	q.put(new Integer(SIZE+1));
781	>	}});
782	>
783	>	t.start();
784	>	ArrayList l = new ArrayList();
785	>	q.drainTo(l);
786	>	assertTrue(l.size() >= SIZE);
787	>	for (int i = 0; i < SIZE; ++i)
788	>	assertEquals(l.get(i), new Integer(i));
789	>	t.join();
790	>	assertTrue(q.size() + l.size() >= SIZE);
791		}
792
793		/**
#	Line 916 | Line 798 | public class PriorityBlockingQueueTest e
798		try {
799		q.drainTo(null, 0);
800		shouldThrow();
801	<	} catch (NullPointerException success) {
920	<	}
801	>	} catch (NullPointerException success) {}
802		}
803
804		/**
#	Line 928 | Line 809 | public class PriorityBlockingQueueTest e
809		try {
810		q.drainTo(q, 0);
811		shouldThrow();
812	<	} catch (IllegalArgumentException success) {
932	<	}
812	>	} catch (IllegalArgumentException success) {}
813		}
814
815		/**
816	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
816	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
817		*/
818		public void testDrainToN() {
819		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
#	Line 942 | Line 822 | public class PriorityBlockingQueueTest e
822		assertTrue(q.offer(new Integer(j)));
823		ArrayList l = new ArrayList();
824		q.drainTo(l, i);
825	<	int k = (i < SIZE)? i : SIZE;
825	>	int k = (i < SIZE) ? i : SIZE;
826		assertEquals(l.size(), k);
827		assertEquals(q.size(), SIZE-k);
828		for (int j = 0; j < k; ++j)
#	Line 951 | Line 831 | public class PriorityBlockingQueueTest e
831		}
832		}
833
954	–
834		}

Diff Legend

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