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.25 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.32 by jsr166, Tue Oct 19 00:43:49 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());
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 245 | Line 261 | public class PriorityBlockingQueueTest e
261		shouldThrow();
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 444 | Line 461 | public class PriorityBlockingQueueTest e
461		}
462
463		/**
447	–	*  timed poll before a delayed offer fails; after offer succeeds;
448	–	*  on interruption throws
449	–	*/
450	–	public void testTimedPollWithOffer() throws InterruptedException {
451	–	final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
452	–	Thread t = new Thread(new CheckedRunnable() {
453	–	public void realRun() throws InterruptedException {
454	–	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
455	–	assertSame(zero, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
456	–	try {
457	–	q.poll(LONG_DELAY_MS, MILLISECONDS);
458	–	shouldThrow();
459	–	} catch (InterruptedException success) {}
460	–	}});
461	–
462	–	t.start();
463	–	Thread.sleep(SMALL_DELAY_MS);
464	–	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
465	–	t.interrupt();
466	–	t.join();
467	–	}
468	–
469	–
470	–	/**
464		* peek returns next element, or null if empty
465		*/
466		public void testPeek() {
#	Line 602 | Line 595 | public class PriorityBlockingQueueTest e
595		}
596
597		/**
598	<	*  toArray contains all elements
598	>	* toArray contains all elements
599		*/
600		public void testToArray() throws InterruptedException {
601		PriorityBlockingQueue q = populatedQueue(SIZE);
#	Line 663 | 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 820 | Line 813 | public class PriorityBlockingQueueTest e
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 829 | 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)

Diff Legend

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