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.64 by jsr166, Sun Oct 16 20:44:18 2016 UTC vs.
Revision 1.71 by jsr166, Sun May 14 00:48:20 2017 UTC

#	Line 41 | Line 41 | public class LinkedBlockingQueueTest ext
41		}
42
43		public static Test suite() {
44	+	class Implementation implements CollectionImplementation {
45	+	public Class<?> klazz() { return LinkedBlockingQueue.class; }
46	+	public Collection emptyCollection() { return new LinkedBlockingQueue(); }
47	+	public Object makeElement(int i) { return i; }
48	+	public boolean isConcurrent() { return true; }
49	+	public boolean permitsNulls() { return false; }
50	+	}
51		return newTestSuite(LinkedBlockingQueueTest.class,
52		new Unbounded().testSuite(),
53	<	new Bounded().testSuite());
53	>	new Bounded().testSuite(),
54	>	CollectionTest.testSuite(new Implementation()));
55		}
56
57		/**
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 284 | 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 319 | 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 346 | 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 369 | 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) {
373	<	assertEquals(i, q.take());
374	<	}
380	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
381
382		Thread.currentThread().interrupt();
383		try {
#	Line 389 | 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 438 | Line 444 | public class LinkedBlockingQueueTest ext
444		*/
445		public void testInterruptedTimedPoll() throws InterruptedException {
446		final BlockingQueue<Integer> q = populatedQueue(SIZE);
447	<	final CountDownLatch aboutToWait = new CountDownLatch(1);
447	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
448		Thread t = newStartedThread(new CheckedRunnable() {
449		public void realRun() throws InterruptedException {
450		long startTime = System.nanoTime();
451		for (int i = 0; i < SIZE; ++i) {
452		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
453		}
454	<	aboutToWait.countDown();
454	>
455	>	pleaseInterrupt.countDown();
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	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
463		}});
464
465	<	await(aboutToWait);
466	<	waitForThreadToEnterWaitState(t);
465	>	await(pleaseInterrupt);
466	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
467		t.interrupt();
468		awaitTermination(t);
469		checkEmpty(q);

Diff Legend

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