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.73 by jsr166, Sun May 14 01:30:34 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 351 | Line 351 | public class LinkedBlockingQueueTest ext
351		q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
352		shouldThrow();
353		} catch (InterruptedException success) {}
354	+	assertFalse(Thread.interrupted());
355		}});
356
357		await(pleaseInterrupt);
358	<	assertThreadStaysAlive(t);
358	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
359		t.interrupt();
360		awaitTermination(t);
361		}
#	Line 377 | Line 378 | public class LinkedBlockingQueueTest ext
378		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
379		Thread t = newStartedThread(new CheckedRunnable() {
380		public void realRun() throws InterruptedException {
381	<	for (int i = 0; i < SIZE; ++i) {
381	<	assertEquals(i, q.take());
382	<	}
381	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
382
383		Thread.currentThread().interrupt();
384		try {
#	Line 397 | Line 396 | public class LinkedBlockingQueueTest ext
396		}});
397
398		await(pleaseInterrupt);
399	<	assertThreadStaysAlive(t);
399	>	assertThreadBlocks(t, Thread.State.WAITING);
400		t.interrupt();
401		awaitTermination(t);
402		}
#	Line 446 | Line 445 | public class LinkedBlockingQueueTest ext
445		*/
446		public void testInterruptedTimedPoll() throws InterruptedException {
447		final BlockingQueue<Integer> q = populatedQueue(SIZE);
448	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
448	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
449		Thread t = newStartedThread(new CheckedRunnable() {
450		public void realRun() throws InterruptedException {
451		long startTime = System.nanoTime();
452	<	for (int i = 0; i < SIZE; ++i) {
452	>	for (int i = 0; i < SIZE; i++)
453		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
454	<	}
455	<	aboutToWait.countDown();
454	>
455	>	Thread.currentThread().interrupt();
456		try {
457		q.poll(LONG_DELAY_MS, MILLISECONDS);
458		shouldThrow();
459	<	} catch (InterruptedException success) {
460	<	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
461	<	}
459	>	} catch (InterruptedException success) {}
460	>	assertFalse(Thread.interrupted());
461	>
462	>	pleaseInterrupt.countDown();
463	>	try {
464	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
465	>	shouldThrow();
466	>	} catch (InterruptedException success) {}
467	>	assertFalse(Thread.interrupted());
468	>
469	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
470		}});
471
472	<	await(aboutToWait);
473	<	waitForThreadToEnterWaitState(t);
472	>	await(pleaseInterrupt);
473	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
474		t.interrupt();
475		awaitTermination(t);
476		checkEmpty(q);

Diff Legend

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