ViewVC Help

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

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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.65 by jsr166, Mon Oct 17 01:31:30 2016 UTC vs.
Revision 1.70 by jsr166, Sat May 13 22:49:01 2017 UTC

#	Line 58 | Line 58 | public class LinkedBlockingQueueTest ext
58		* Returns a new queue of given size containing consecutive
59		* Integers 0 ... n - 1.
60		*/
61	<	private LinkedBlockingQueue<Integer> populatedQueue(int n) {
61	>	private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62		LinkedBlockingQueue<Integer> q =
63		new LinkedBlockingQueue<Integer>(n);
64		assertTrue(q.isEmpty());
#	Line 292 | Line 292 | public class LinkedBlockingQueueTest ext
292		}});
293
294		await(pleaseInterrupt);
295	<	assertThreadStaysAlive(t);
295	>	assertThreadBlocks(t, Thread.State.WAITING);
296		t.interrupt();
297		awaitTermination(t);
298		assertEquals(SIZE, q.size());
#	Line 327 | Line 327 | public class LinkedBlockingQueueTest ext
327		assertEquals(0, q.take());
328
329		await(pleaseInterrupt);
330	<	assertThreadStaysAlive(t);
330	>	assertThreadBlocks(t, Thread.State.WAITING);
331		t.interrupt();
332		awaitTermination(t);
333		assertEquals(0, q.remainingCapacity());
#	Line 354 | Line 354 | public class LinkedBlockingQueueTest ext
354		}});
355
356		await(pleaseInterrupt);
357	<	assertThreadStaysAlive(t);
357	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
358		t.interrupt();
359		awaitTermination(t);
360		}
#	Line 377 | Line 377 | public class LinkedBlockingQueueTest ext
377		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
378		Thread t = newStartedThread(new CheckedRunnable() {
379		public void realRun() throws InterruptedException {
380	<	for (int i = 0; i < SIZE; ++i) {
381	<	assertEquals(i, q.take());
382	<	}
380	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
381
382		Thread.currentThread().interrupt();
383		try {
#	Line 397 | Line 395 | public class LinkedBlockingQueueTest ext
395		}});
396
397		await(pleaseInterrupt);
398	<	assertThreadStaysAlive(t);
398	>	assertThreadBlocks(t, Thread.State.WAITING);
399		t.interrupt();
400		awaitTermination(t);
401		}
#	Line 463 | Line 461 | public class LinkedBlockingQueueTest ext
461		}});
462
463		await(aboutToWait);
464	<	waitForThreadToEnterWaitState(t);
464	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
465		t.interrupt();
466		awaitTermination(t);
467		checkEmpty(q);

Diff Legend

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