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.28 by dl, Wed Sep 29 12:33:48 2010 UTC vs.
Revision 1.39 by jsr166, Thu Nov 18 20:21:53 2010 UTC

#	Line 13 | Line 13 | import static java.util.concurrent.TimeU
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());
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 33 | 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)));
#	Line 350 | Line 367 | public class PriorityBlockingQueueTest e
367		}
368
369		/**
353	–	* take blocks interruptibly when empty
354	–	*/
355	–	public void testTakeFromEmpty() throws InterruptedException {
356	–	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
357	–	Thread t = new Thread(new CheckedInterruptedRunnable() {
358	–	public void realRun() throws InterruptedException {
359	–	q.take();
360	–	}});
361	–
362	–	t.start();
363	–	Thread.sleep(SHORT_DELAY_MS);
364	–	t.interrupt();
365	–	t.join();
366	–	}
367	–
368	–	/**
370		* Take removes existing elements until empty, then blocks interruptibly
371		*/
372		public void testBlockingTake() throws InterruptedException {
#	Line 400 | Line 401 | public class PriorityBlockingQueueTest e
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() throws InterruptedException {
407		PriorityBlockingQueue q = populatedQueue(SIZE);
#	Line 411 | Line 412 | public class PriorityBlockingQueueTest e
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() throws InterruptedException {
418		PriorityBlockingQueue q = populatedQueue(SIZE);
#	Line 445 | Line 446 | public class PriorityBlockingQueueTest e
446		}
447
448		/**
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	–	try {
456	–	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
457	–	assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
458	–	q.poll(LONG_DELAY_MS, MILLISECONDS);
459	–	shouldThrow();
460	–	} catch (InterruptedException success) {}
461	–	}});
462	–
463	–	t.start();
464	–	Thread.sleep(SMALL_DELAY_MS);
465	–	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
466	–	t.interrupt();
467	–	t.join();
468	–	}
469	–
470	–
471	–	/**
449		* peek returns next element, or null if empty
450		*/
451		public void testPeek() {
#	Line 517 | 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 603 | Line 586 | public class PriorityBlockingQueueTest e
586		}
587
588		/**
589	<	*  toArray contains all elements
589	>	* toArray contains all elements
590		*/
591		public void testToArray() throws InterruptedException {
592		PriorityBlockingQueue q = populatedQueue(SIZE);
593		Object[] o = q.toArray();
594		Arrays.sort(o);
595		for (int i = 0; i < o.length; i++)
596	<	assertEquals(o[i], q.take());
596	>	assertSame(o[i], q.take());
597		}
598
599		/**
600		* toArray(a) contains all elements
601		*/
602		public void testToArray2() throws InterruptedException {
603	<	PriorityBlockingQueue q = populatedQueue(SIZE);
603	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
604		Integer[] ints = new Integer[SIZE];
605	<	ints = (Integer[])q.toArray(ints);
605	>	Integer[] array = q.toArray(ints);
606	>	assertSame(ints, array);
607		Arrays.sort(ints);
608		for (int i = 0; i < ints.length; i++)
609	<	assertEquals(ints[i], q.take());
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() {
615	>	public void testToArray_NullArg() {
616		PriorityBlockingQueue q = populatedQueue(SIZE);
617		try {
618	<	Object o[] = q.toArray(null);
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		PriorityBlockingQueue q = populatedQueue(SIZE);
628		try {
629	<	Object o[] = q.toArray(new String[10]);
629	>	q.toArray(new String[10]);
630		shouldThrow();
631		} catch (ArrayStoreException success) {}
632		}
#	Line 821 | Line 805 | public class PriorityBlockingQueueTest e
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 830 | 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)

Diff Legend

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