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.60 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.66 by jsr166, Sat Mar 11 18:20:47 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.
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 59 | Line 67 | public class LinkedBlockingQueueTest ext
67		assertFalse(q.isEmpty());
68		assertEquals(0, q.remainingCapacity());
69		assertEquals(n, q.size());
70	+	assertEquals((Integer) 0, q.peek());
71		return q;
72		}
73
#	Line 440 | Line 449 | public class LinkedBlockingQueueTest ext
449		final CountDownLatch aboutToWait = new CountDownLatch(1);
450		Thread t = newStartedThread(new CheckedRunnable() {
451		public void realRun() throws InterruptedException {
452	+	long startTime = System.nanoTime();
453		for (int i = 0; i < SIZE; ++i) {
444	–	long t0 = System.nanoTime();
454		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
446	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
455		}
448	–	long t0 = System.nanoTime();
456		aboutToWait.countDown();
457		try {
458	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
458	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
459		shouldThrow();
460		} catch (InterruptedException success) {
461	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
461	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
462		}
463		}});
464
465	<	aboutToWait.await();
466	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
465	>	await(aboutToWait);
466	>	waitForThreadToEnterWaitState(t);
467		t.interrupt();
468	<	awaitTermination(t, MEDIUM_DELAY_MS);
468	>	awaitTermination(t);
469		checkEmpty(q);
470		}
471
#	Line 722 | Line 729 | public class LinkedBlockingQueueTest ext
729		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
730		q.add(one);
731		q.add(two);
725	–	ExecutorService executor = Executors.newFixedThreadPool(2);
732		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
733	<	executor.execute(new CheckedRunnable() {
734	<	public void realRun() throws InterruptedException {
735	<	assertFalse(q.offer(three));
736	<	threadsStarted.await();
737	<	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
738	<	assertEquals(0, q.remainingCapacity());
739	<	}});
740	<
741	<	executor.execute(new CheckedRunnable() {
742	<	public void realRun() throws InterruptedException {
743	<	threadsStarted.await();
744	<	assertSame(one, q.take());
745	<	}});
746	<
747	<	joinPool(executor);
733	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
734	>	try (PoolCleaner cleaner = cleaner(executor)) {
735	>	executor.execute(new CheckedRunnable() {
736	>	public void realRun() throws InterruptedException {
737	>	assertFalse(q.offer(three));
738	>	threadsStarted.await();
739	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
740	>	assertEquals(0, q.remainingCapacity());
741	>	}});
742	>
743	>	executor.execute(new CheckedRunnable() {
744	>	public void realRun() throws InterruptedException {
745	>	threadsStarted.await();
746	>	assertSame(one, q.take());
747	>	}});
748	>	}
749		}
750
751		/**
#	Line 747 | Line 754 | public class LinkedBlockingQueueTest ext
754		public void testPollInExecutor() {
755		final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
756		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
757	<	ExecutorService executor = Executors.newFixedThreadPool(2);
758	<	executor.execute(new CheckedRunnable() {
759	<	public void realRun() throws InterruptedException {
760	<	assertNull(q.poll());
761	<	threadsStarted.await();
762	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
763	<	checkEmpty(q);
764	<	}});
765	<
766	<	executor.execute(new CheckedRunnable() {
767	<	public void realRun() throws InterruptedException {
768	<	threadsStarted.await();
769	<	q.put(one);
770	<	}});
771	<
772	<	joinPool(executor);
757	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
758	>	try (PoolCleaner cleaner = cleaner(executor)) {
759	>	executor.execute(new CheckedRunnable() {
760	>	public void realRun() throws InterruptedException {
761	>	assertNull(q.poll());
762	>	threadsStarted.await();
763	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
764	>	checkEmpty(q);
765	>	}});
766	>
767	>	executor.execute(new CheckedRunnable() {
768	>	public void realRun() throws InterruptedException {
769	>	threadsStarted.await();
770	>	q.put(one);
771	>	}});
772	>	}
773		}
774
775		/**

Diff Legend

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