ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/BlockingQueueTest.java

Comparing jsr166/src/test/tck/BlockingQueueTest.java (file contents):
Revision 1.17 by jsr166, Thu Oct 8 00:41:57 2015 UTC vs.
Revision 1.20 by jsr166, Sun May 14 14:52:50 2017 UTC

#	Line 106 | Line 106 | public abstract class BlockingQueueTest
106		}
107
108		/**
109	<	* put(null) throws NullPointerException
109	>	* addAll(null) throws NullPointerException
110		*/
111		public void testAddAllNull() throws InterruptedException {
112		final Collection q = emptyCollection();
#	Line 245 | Line 245 | public abstract class BlockingQueueTest
245		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
246
247		barrier.await();
248	<	assertThreadStaysAlive(t);
248	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
249		t.interrupt();
250		awaitTermination(t);
251		}
#	Line 267 | Line 267 | public abstract class BlockingQueueTest
267		}});
268
269		await(threadStarted);
270	<	assertThreadStaysAlive(t);
270	>	assertThreadBlocks(t, Thread.State.WAITING);
271		t.interrupt();
272		awaitTermination(t);
273		}
#	Line 308 | Line 308 | public abstract class BlockingQueueTest
308		}});
309
310		await(threadStarted);
311	<	assertThreadStaysAlive(t);
311	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
312		t.interrupt();
313		awaitTermination(t);
314		}

Diff Legend

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