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.57 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.65 by jsr166, Mon Oct 17 01:31:30 2016 UTC

#	Line 37 | Line 37 | public class LinkedBlockingQueueTest ext
37		}
38
39		public static void main(String[] args) {
40	<	junit.textui.TestRunner.run(suite());
40	>	main(suite(), args);
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) {
62		LinkedBlockingQueue<Integer> q =
#	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 108 | Line 117 | public class LinkedBlockingQueueTest ext
117		*/
118		public void testConstructor5() {
119		Integer[] ints = new Integer[SIZE];
120	<	for (int i = 0; i < SIZE-1; ++i)
120	>	for (int i = 0; i < SIZE - 1; ++i)
121		ints[i] = new Integer(i);
122		Collection<Integer> elements = Arrays.asList(ints);
123		try {
#	Line 148 | Line 157 | public class LinkedBlockingQueueTest ext
157		* remainingCapacity decreases on add, increases on remove
158		*/
159		public void testRemainingCapacity() {
160	<	LinkedBlockingQueue q = populatedQueue(SIZE);
160	>	BlockingQueue q = populatedQueue(SIZE);
161		for (int i = 0; i < SIZE; ++i) {
162		assertEquals(i, q.remainingCapacity());
163	<	assertEquals(SIZE-i, q.size());
164	<	q.remove();
163	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
164	>	assertEquals(i, q.remove());
165		}
166		for (int i = 0; i < SIZE; ++i) {
167	<	assertEquals(SIZE-i, q.remainingCapacity());
168	<	assertEquals(i, q.size());
169	<	q.add(new Integer(i));
167	>	assertEquals(SIZE - i, q.remainingCapacity());
168	>	assertEquals(SIZE, q.size() + q.remainingCapacity());
169	>	assertTrue(q.add(i));
170		}
171		}
172
#	Line 202 | Line 211 | public class LinkedBlockingQueueTest ext
211		public void testAddAll3() {
212		LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
213		Integer[] ints = new Integer[SIZE];
214	<	for (int i = 0; i < SIZE-1; ++i)
214	>	for (int i = 0; i < SIZE - 1; ++i)
215		ints[i] = new Integer(i);
216		Collection<Integer> elements = Arrays.asList(ints);
217		try {
#	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 574 | Line 581 | public class LinkedBlockingQueueTest ext
581		assertTrue(changed);
582
583		assertTrue(q.containsAll(p));
584	<	assertEquals(SIZE-i, q.size());
584	>	assertEquals(SIZE - i, q.size());
585		p.remove();
586		}
587		}
#	Line 587 | Line 594 | public class LinkedBlockingQueueTest ext
594		LinkedBlockingQueue q = populatedQueue(SIZE);
595		LinkedBlockingQueue p = populatedQueue(i);
596		assertTrue(q.removeAll(p));
597	<	assertEquals(SIZE-i, q.size());
597	>	assertEquals(SIZE - i, q.size());
598		for (int j = 0; j < i; ++j) {
599		Integer x = (Integer)(p.remove());
600		assertFalse(q.contains(x));
#	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		/**
#	Line 814 | Line 821 | public class LinkedBlockingQueueTest ext
821		final LinkedBlockingQueue q = populatedQueue(SIZE);
822		Thread t = new Thread(new CheckedRunnable() {
823		public void realRun() throws InterruptedException {
824	<	q.put(new Integer(SIZE+1));
824	>	q.put(new Integer(SIZE + 1));
825		}});
826
827		t.start();
#	Line 839 | Line 846 | public class LinkedBlockingQueueTest ext
846		q.drainTo(l, i);
847		int k = (i < SIZE) ? i : SIZE;
848		assertEquals(k, l.size());
849	<	assertEquals(SIZE-k, q.size());
849	>	assertEquals(SIZE - k, q.size());
850		for (int j = 0; j < k; ++j)
851		assertEquals(l.get(j), new Integer(j));
852		do {} while (q.poll() != null);

Diff Legend

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