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.72 by jsr166, Sat Mar 25 21:41:10 2017 UTC vs.
Revision 1.78 by jsr166, Mon May 29 22:44:27 2017 UTC

#	Line 90 | Line 90 | public class PriorityBlockingQueueTest e
90		}
91
92		/**
93	<	* Constructor throws IAE if capacity argument nonpositive
93	>	* Constructor throws IllegalArgumentException if capacity argument nonpositive
94		*/
95		public void testConstructor2() {
96		try {
#	Line 229 | Line 229 | public class PriorityBlockingQueueTest e
229		}
230
231		/**
232	<	* addAll(this) throws IAE
232	>	* addAll(this) throws IllegalArgumentException
233		*/
234		public void testAddAllSelf() {
235		PriorityBlockingQueue q = populatedQueue(SIZE);
#	Line 302 | Line 302 | public class PriorityBlockingQueueTest e
302		/**
303		* timed offer does not time out
304		*/
305	<	public void testTimedOffer() throws InterruptedException {
305	>	public void testTimedOffer() {
306		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
307		Thread t = newStartedThread(new CheckedRunnable() {
308		public void realRun() {
#	Line 333 | Line 333 | public class PriorityBlockingQueueTest e
333		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
334		Thread t = newStartedThread(new CheckedRunnable() {
335		public void realRun() throws InterruptedException {
336	<	for (int i = 0; i < SIZE; ++i) {
337	<	assertEquals(i, q.take());
338	<	}
336	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
337
338		Thread.currentThread().interrupt();
339		try {
#	Line 353 | Line 351 | public class PriorityBlockingQueueTest e
351		}});
352
353		await(pleaseInterrupt);
354	<	assertThreadStaysAlive(t);
354	>	assertThreadBlocks(t, Thread.State.WAITING);
355		t.interrupt();
356		awaitTermination(t);
357		}
#	Line 402 | Line 400 | public class PriorityBlockingQueueTest e
400		*/
401		public void testInterruptedTimedPoll() throws InterruptedException {
402		final BlockingQueue<Integer> q = populatedQueue(SIZE);
403	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
403	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
404		Thread t = newStartedThread(new CheckedRunnable() {
405		public void realRun() throws InterruptedException {
406		long startTime = System.nanoTime();
407	<	for (int i = 0; i < SIZE; ++i) {
407	>	for (int i = 0; i < SIZE; i++)
408		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
409	<	}
410	<	aboutToWait.countDown();
409	>
410	>	Thread.currentThread().interrupt();
411	>	try {
412	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
413	>	shouldThrow();
414	>	} catch (InterruptedException success) {}
415	>	assertFalse(Thread.interrupted());
416	>
417	>	pleaseInterrupt.countDown();
418		try {
419		q.poll(LONG_DELAY_MS, MILLISECONDS);
420		shouldThrow();
421	<	} catch (InterruptedException success) {
422	<	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
423	<	}
421	>	} catch (InterruptedException success) {}
422	>	assertFalse(Thread.interrupted());
423	>
424	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
425		}});
426
427	<	await(aboutToWait);
428	<	waitForThreadToEnterWaitState(t);
427	>	await(pleaseInterrupt);
428	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
429		t.interrupt();
430		awaitTermination(t);
431		}

Diff Legend

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