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.39 by jsr166, Thu Nov 18 20:21:53 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 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
#	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 {
300	>	try {
301		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302		q.put(null);
303		shouldThrow();
304	<	}
308	<	catch (NullPointerException success){
309	<	}
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());
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	<	finally {
326	<	}
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;
335	<	q.put(new Integer(0));
336	<	++added;
337	<	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 = new Thread(new CheckedRunnable() {
327	>	public void realRun() {
328	>	for (int i = 0; i < size; i++)
329	>	q.put(new Integer(0));
330	>	}});
331	>
332	>	t.start();
333	>	Thread.sleep(SHORT_DELAY_MS);
334	>	assertEquals(q.size(), size);
335	>	q.take();
336	>	t.interrupt();
337	>	t.join();
338		}
339
340		/**
341		* timed offer does not time out
342		*/
343	<	public void testTimedOffer() {
343	>	public void testTimedOffer() throws InterruptedException {
344		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
345	<	Thread t = new Thread(new Runnable() {
346	<	public void run() {
347	<	try {
348	<	q.put(new Integer(0));
349	<	q.put(new Integer(0));
350	<	threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
351	<	threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
374	<	} finally { }
375	<	}
376	<	});
345	>	Thread t = new Thread(new CheckedRunnable() {
346	>	public void realRun() {
347	>	q.put(new Integer(0));
348	>	q.put(new Integer(0));
349	>	assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS));
350	>	assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
351	>	}});
352
353	<	try {
354	<	t.start();
355	<	Thread.sleep(SMALL_DELAY_MS);
356	<	t.interrupt();
382	<	t.join();
383	<	} catch (Exception e){
384	<	unexpectedException();
385	<	}
353	>	t.start();
354	>	Thread.sleep(SMALL_DELAY_MS);
355	>	t.interrupt();
356	>	t.join();
357		}
358
359		/**
360		* take retrieves elements in priority order
361		*/
362	<	public void testTake() {
363	<	try {
364	<	PriorityBlockingQueue q = populatedQueue(SIZE);
365	<	for (int i = 0; i < SIZE; ++i) {
395	<	assertEquals(i, ((Integer)q.take()).intValue());
396	<	}
397	<	} catch (InterruptedException e){
398	<	unexpectedException();
399	<	}
400	<	}
401	<
402	<	/**
403	<	* take blocks interruptibly when empty
404	<	*/
405	<	public void testTakeFromEmpty() {
406	<	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
407	<	Thread t = new Thread(new Runnable() {
408	<	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();
362	>	public void testTake() throws InterruptedException {
363	>	PriorityBlockingQueue q = populatedQueue(SIZE);
364	>	for (int i = 0; i < SIZE; ++i) {
365	>	assertEquals(i, q.take());
366		}
367		}
368
369		/**
370		* Take removes existing elements until empty, then blocks interruptibly
371		*/
372	<	public void testBlockingTake() {
373	<	Thread t = new Thread(new Runnable() {
374	<	public void run() {
375	<	try {
376	<	PriorityBlockingQueue q = populatedQueue(SIZE);
377	<	for (int i = 0; i < SIZE; ++i) {
378	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
379	<	}
380	<	q.take();
381	<	threadShouldThrow();
382	<	} catch (InterruptedException success){
383	<	}
384	<	}});
372	>	public void testBlockingTake() throws InterruptedException {
373	>	final PriorityBlockingQueue q = populatedQueue(SIZE);
374	>	Thread t = new Thread(new CheckedRunnable() {
375	>	public void realRun() throws InterruptedException {
376	>	for (int i = 0; i < SIZE; ++i) {
377	>	assertEquals(i, q.take());
378	>	}
379	>	try {
380	>	q.take();
381	>	shouldThrow();
382	>	} catch (InterruptedException success) {}
383	>	}});
384	>
385		t.start();
386	<	try {
387	<	Thread.sleep(SHORT_DELAY_MS);
388	<	t.interrupt();
445	<	t.join();
446	<	}
447	<	catch (InterruptedException ie) {
448	<	unexpectedException();
449	<	}
386	>	Thread.sleep(SHORT_DELAY_MS);
387	>	t.interrupt();
388	>	t.join();
389		}
390
391
#	Line 456 | Line 395 | public class PriorityBlockingQueueTest e
395		public void testPoll() {
396		PriorityBlockingQueue q = populatedQueue(SIZE);
397		for (int i = 0; i < SIZE; ++i) {
398	<	assertEquals(i, ((Integer)q.poll()).intValue());
398	>	assertEquals(i, q.poll());
399		}
400	<	assertNull(q.poll());
400	>	assertNull(q.poll());
401		}
402
403		/**
404	<	* timed pool with zero timeout succeeds when non-empty, else times out
404	>	* timed poll with zero timeout succeeds when non-empty, else times out
405		*/
406	<	public void testTimedPoll0() {
407	<	try {
408	<	PriorityBlockingQueue q = populatedQueue(SIZE);
409	<	for (int i = 0; i < SIZE; ++i) {
410	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
411	<	}
473	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
474	<	} catch (InterruptedException e){
475	<	unexpectedException();
476	<	}
406	>	public void testTimedPoll0() throws InterruptedException {
407	>	PriorityBlockingQueue q = populatedQueue(SIZE);
408	>	for (int i = 0; i < SIZE; ++i) {
409	>	assertEquals(i, q.poll(0, MILLISECONDS));
410	>	}
411	>	assertNull(q.poll(0, MILLISECONDS));
412		}
413
414		/**
415	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
415	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
416		*/
417	<	public void testTimedPoll() {
418	<	try {
419	<	PriorityBlockingQueue q = populatedQueue(SIZE);
420	<	for (int i = 0; i < SIZE; ++i) {
421	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
422	<	}
488	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
489	<	} catch (InterruptedException e){
490	<	unexpectedException();
491	<	}
417	>	public void testTimedPoll() throws InterruptedException {
418	>	PriorityBlockingQueue q = populatedQueue(SIZE);
419	>	for (int i = 0; i < SIZE; ++i) {
420	>	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
421	>	}
422	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
423		}
424
425		/**
426		* Interrupted timed poll throws InterruptedException instead of
427		* returning timeout status
428		*/
429	<	public void testInterruptedTimedPoll() {
430	<	Thread t = new Thread(new Runnable() {
431	<	public void run() {
432	<	try {
433	<	PriorityBlockingQueue q = populatedQueue(SIZE);
434	<	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) { }
429	>	public void testInterruptedTimedPoll() throws InterruptedException {
430	>	Thread t = new Thread(new CheckedRunnable() {
431	>	public void realRun() throws InterruptedException {
432	>	PriorityBlockingQueue q = populatedQueue(SIZE);
433	>	for (int i = 0; i < SIZE; ++i) {
434	>	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
435		}
436	<	});
437	<	try {
438	<	t.start();
439	<	Thread.sleep(SMALL_DELAY_MS);
440	<	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	<	}
436	>	try {
437	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
438	>	shouldThrow();
439	>	} catch (InterruptedException success) {}
440	>	}});
441
442	+	t.start();
443	+	Thread.sleep(SHORT_DELAY_MS);
444	+	t.interrupt();
445	+	t.join();
446	+	}
447
448		/**
449		* peek returns next element, or null if empty
#	Line 552 | Line 451 | public class PriorityBlockingQueueTest e
451		public void testPeek() {
452		PriorityBlockingQueue q = populatedQueue(SIZE);
453		for (int i = 0; i < SIZE; ++i) {
454	<	assertEquals(i, ((Integer)q.peek()).intValue());
455	<	q.poll();
454	>	assertEquals(i, q.peek());
455	>	assertEquals(i, q.poll());
456		assertTrue(q.peek() == null ||
457	<	i != ((Integer)q.peek()).intValue());
457	>	!q.peek().equals(i));
458		}
459	<	assertNull(q.peek());
459	>	assertNull(q.peek());
460		}
461
462		/**
#	Line 566 | Line 465 | public class PriorityBlockingQueueTest e
465		public void testElement() {
466		PriorityBlockingQueue q = populatedQueue(SIZE);
467		for (int i = 0; i < SIZE; ++i) {
468	<	assertEquals(i, ((Integer)q.element()).intValue());
469	<	q.poll();
468	>	assertEquals(i, q.element());
469	>	assertEquals(i, q.poll());
470		}
471		try {
472		q.element();
473		shouldThrow();
474	<	}
576	<	catch (NoSuchElementException success) {}
474	>	} catch (NoSuchElementException success) {}
475		}
476
477		/**
#	Line 582 | Line 480 | public class PriorityBlockingQueueTest e
480		public void testRemove() {
481		PriorityBlockingQueue q = populatedQueue(SIZE);
482		for (int i = 0; i < SIZE; ++i) {
483	<	assertEquals(i, ((Integer)q.remove()).intValue());
483	>	assertEquals(i, q.remove());
484		}
485		try {
486		q.remove();
487		shouldThrow();
488	<	} catch (NoSuchElementException success){
591	<	}
488	>	} catch (NoSuchElementException success) {}
489		}
490
491		/**
#	Line 597 | Line 494 | public class PriorityBlockingQueueTest e
494		public void testRemoveElement() {
495		PriorityBlockingQueue q = populatedQueue(SIZE);
496		for (int i = 1; i < SIZE; i+=2) {
497	<	assertTrue(q.remove(new Integer(i)));
497	>	assertTrue(q.contains(i));
498	>	assertTrue(q.remove(i));
499	>	assertFalse(q.contains(i));
500	>	assertTrue(q.contains(i-1));
501		}
502		for (int i = 0; i < SIZE; i+=2) {
503	<	assertTrue(q.remove(new Integer(i)));
504	<	assertFalse(q.remove(new Integer(i+1)));
503	>	assertTrue(q.contains(i));
504	>	assertTrue(q.remove(i));
505	>	assertFalse(q.contains(i));
506	>	assertFalse(q.remove(i+1));
507	>	assertFalse(q.contains(i+1));
508		}
509		assertTrue(q.isEmpty());
510		}
#	Line 683 | Line 586 | public class PriorityBlockingQueueTest e
586		}
587
588		/**
589	<	*  toArray contains all elements
589	>	* toArray contains all elements
590		*/
591	<	public void testToArray() {
591	>	public void testToArray() throws InterruptedException {
592		PriorityBlockingQueue q = populatedQueue(SIZE);
593	<	Object[] o = q.toArray();
593	>	Object[] o = q.toArray();
594		Arrays.sort(o);
595	<	try {
596	<	for (int i = 0; i < o.length; i++)
694	<	assertEquals(o[i], q.take());
695	<	} catch (InterruptedException e){
696	<	unexpectedException();
697	<	}
595	>	for (int i = 0; i < o.length; i++)
596	>	assertSame(o[i], q.take());
597		}
598
599		/**
600		* toArray(a) contains all elements
601		*/
602	<	public void testToArray2() {
603	<	PriorityBlockingQueue q = populatedQueue(SIZE);
604	<	Integer[] ints = new Integer[SIZE];
605	<	ints = (Integer[])q.toArray(ints);
602	>	public void testToArray2() throws InterruptedException {
603	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
604	>	Integer[] ints = new Integer[SIZE];
605	>	Integer[] array = q.toArray(ints);
606	>	assertSame(ints, array);
607		Arrays.sort(ints);
608	<	try {
609	<	for (int i = 0; i < ints.length; i++)
710	<	assertEquals(ints[i], q.take());
711	<	} catch (InterruptedException e){
712	<	unexpectedException();
713	<	}
608	>	for (int i = 0; i < ints.length; i++)
609	>	assertSame(ints[i], q.take());
610		}
611
612		/**
613	<	* toArray(null) throws NPE
613	>	* toArray(null) throws NullPointerException
614		*/
615	<	public void testToArray_BadArg() {
616	<	try {
617	<	PriorityBlockingQueue q = populatedQueue(SIZE);
618	<	Object o[] = q.toArray(null);
619	<	shouldThrow();
620	<	} catch (NullPointerException success){}
615	>	public void testToArray_NullArg() {
616	>	PriorityBlockingQueue q = populatedQueue(SIZE);
617	>	try {
618	>	q.toArray(null);
619	>	shouldThrow();
620	>	} catch (NullPointerException success) {}
621		}
622
623		/**
624	<	* toArray with incompatible array type throws CCE
624	>	* toArray(incompatible array type) throws ArrayStoreException
625		*/
626		public void testToArray1_BadArg() {
627	<	try {
628	<	PriorityBlockingQueue q = populatedQueue(SIZE);
629	<	Object o[] = q.toArray(new String[10] );
630	<	shouldThrow();
631	<	} catch (ArrayStoreException  success){}
627	>	PriorityBlockingQueue q = populatedQueue(SIZE);
628	>	try {
629	>	q.toArray(new String[10]);
630	>	shouldThrow();
631	>	} catch (ArrayStoreException success) {}
632		}
633
634		/**
#	Line 741 | Line 637 | public class PriorityBlockingQueueTest e
637		public void testIterator() {
638		PriorityBlockingQueue q = populatedQueue(SIZE);
639		int i = 0;
640	<	Iterator it = q.iterator();
640	>	Iterator it = q.iterator();
641		while (it.hasNext()) {
642		assertTrue(q.contains(it.next()));
643		++i;
#	Line 752 | Line 648 | public class PriorityBlockingQueueTest e
648		/**
649		* iterator.remove removes current element
650		*/
651	<	public void testIteratorRemove () {
651	>	public void testIteratorRemove() {
652		final PriorityBlockingQueue q = new PriorityBlockingQueue(3);
653		q.add(new Integer(2));
654		q.add(new Integer(1));
#	Line 786 | Line 682 | public class PriorityBlockingQueueTest e
682		public void testPollInExecutor() {
683		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
684		ExecutorService executor = Executors.newFixedThreadPool(2);
685	<	executor.execute(new Runnable() {
686	<	public void run() {
687	<	threadAssertNull(q.poll());
688	<	try {
689	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
690	<	threadAssertTrue(q.isEmpty());
691	<	}
692	<	catch (InterruptedException e) {
693	<	threadUnexpectedException();
694	<	}
695	<	}
696	<	});
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	<	});
685	>	executor.execute(new CheckedRunnable() {
686	>	public void realRun() throws InterruptedException {
687	>	assertNull(q.poll());
688	>	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
689	>	assertTrue(q.isEmpty());
690	>	}});
691	>
692	>	executor.execute(new CheckedRunnable() {
693	>	public void realRun() throws InterruptedException {
694	>	Thread.sleep(SMALL_DELAY_MS);
695	>	q.put(one);
696	>	}});
697
698		joinPool(executor);
699		}
#	Line 817 | Line 701 | public class PriorityBlockingQueueTest e
701		/**
702		* A deserialized serialized queue has same elements
703		*/
704	<	public void testSerialization() {
704	>	public void testSerialization() throws Exception {
705		PriorityBlockingQueue q = populatedQueue(SIZE);
706	<	try {
707	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
708	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
709	<	out.writeObject(q);
710	<	out.close();
711	<
712	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
713	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
714	<	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
715	<	assertEquals(q.size(), r.size());
716	<	while (!q.isEmpty())
833	<	assertEquals(q.remove(), r.remove());
834	<	} catch (Exception e){
835	<	unexpectedException();
836	<	}
706	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
707	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
708	>	out.writeObject(q);
709	>	out.close();
710	>
711	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
712	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
713	>	PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject();
714	>	assertEquals(q.size(), r.size());
715	>	while (!q.isEmpty())
716	>	assertEquals(q.remove(), r.remove());
717		}
718
719		/**
#	Line 844 | Line 724 | public class PriorityBlockingQueueTest e
724		try {
725		q.drainTo(null);
726		shouldThrow();
727	<	} catch (NullPointerException success) {
848	<	}
727	>	} catch (NullPointerException success) {}
728		}
729
730		/**
#	Line 856 | Line 735 | public class PriorityBlockingQueueTest e
735		try {
736		q.drainTo(q);
737		shouldThrow();
738	<	} catch (IllegalArgumentException success) {
860	<	}
738	>	} catch (IllegalArgumentException success) {}
739		}
740
741		/**
#	Line 887 | Line 765 | public class PriorityBlockingQueueTest e
765		/**
766		* drainTo empties queue
767		*/
768	<	public void testDrainToWithActivePut() {
768	>	public void testDrainToWithActivePut() throws InterruptedException {
769		final PriorityBlockingQueue q = populatedQueue(SIZE);
770	<	Thread t = new Thread(new Runnable() {
771	<	public void run() {
772	<	q.put(new Integer(SIZE+1));
773	<	}
774	<	});
775	<	try {
776	<	t.start();
777	<	ArrayList l = new ArrayList();
778	<	q.drainTo(l);
779	<	assertTrue(l.size() >= SIZE);
780	<	for (int i = 0; i < SIZE; ++i)
781	<	assertEquals(l.get(i), new Integer(i));
782	<	t.join();
905	<	assertTrue(q.size() + l.size() >= SIZE);
906	<	} catch (Exception e){
907	<	unexpectedException();
908	<	}
770	>	Thread t = new Thread(new CheckedRunnable() {
771	>	public void realRun() {
772	>	q.put(new Integer(SIZE+1));
773	>	}});
774	>
775	>	t.start();
776	>	ArrayList l = new ArrayList();
777	>	q.drainTo(l);
778	>	assertTrue(l.size() >= SIZE);
779	>	for (int i = 0; i < SIZE; ++i)
780	>	assertEquals(l.get(i), new Integer(i));
781	>	t.join();
782	>	assertTrue(q.size() + l.size() >= SIZE);
783		}
784
785		/**
#	Line 916 | Line 790 | public class PriorityBlockingQueueTest e
790		try {
791		q.drainTo(null, 0);
792		shouldThrow();
793	<	} catch (NullPointerException success) {
920	<	}
793	>	} catch (NullPointerException success) {}
794		}
795
796		/**
#	Line 928 | Line 801 | public class PriorityBlockingQueueTest e
801		try {
802		q.drainTo(q, 0);
803		shouldThrow();
804	<	} catch (IllegalArgumentException success) {
932	<	}
804	>	} catch (IllegalArgumentException success) {}
805		}
806
807		/**
808	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
808	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
809		*/
810		public void testDrainToN() {
811		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
#	Line 942 | Line 814 | public class PriorityBlockingQueueTest e
814		assertTrue(q.offer(new Integer(j)));
815		ArrayList l = new ArrayList();
816		q.drainTo(l, i);
817	<	int k = (i < SIZE)? i : SIZE;
817	>	int k = (i < SIZE) ? i : SIZE;
818		assertEquals(l.size(), k);
819		assertEquals(q.size(), SIZE-k);
820		for (int j = 0; j < k; ++j)
#	Line 951 | Line 823 | public class PriorityBlockingQueueTest e
823		}
824		}
825
954	–
826		}

Diff Legend

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