ViewVC Help

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

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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.63 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.74 by jsr166, Sat May 13 22:49:01 2017 UTC

#	Line 42 | Line 42 | public class PriorityBlockingQueueTest e
42		}
43
44		public static Test suite() {
45	+	class Implementation implements CollectionImplementation {
46	+	public Class<?> klazz() { return PriorityBlockingQueue.class; }
47	+	public Collection emptyCollection() { return new PriorityBlockingQueue(); }
48	+	public Object makeElement(int i) { return i; }
49	+	public boolean isConcurrent() { return true; }
50	+	public boolean permitsNulls() { return false; }
51	+	}
52		return newTestSuite(PriorityBlockingQueueTest.class,
53		new Generic().testSuite(),
54	<	new InitialCapacity().testSuite());
54	>	new InitialCapacity().testSuite(),
55	>	CollectionTest.testSuite(new Implementation()));
56		}
57
58		/** Sample Comparator */
#	Line 56 | Line 64 | public class PriorityBlockingQueueTest e
64
65		/**
66		* Returns a new queue of given size containing consecutive
67	<	* Integers 0 ... n.
67	>	* Integers 0 ... n - 1.
68		*/
69	<	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
69	>	private static PriorityBlockingQueue<Integer> populatedQueue(int n) {
70		PriorityBlockingQueue<Integer> q =
71		new PriorityBlockingQueue<Integer>(n);
72		assertTrue(q.isEmpty());
73	<	for (int i = n-1; i >= 0; i -= 2)
73	>	for (int i = n - 1; i >= 0; i -= 2)
74		assertTrue(q.offer(new Integer(i)));
75		for (int i = (n & 1); i < n; i += 2)
76		assertTrue(q.offer(new Integer(i)));
77		assertFalse(q.isEmpty());
78		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
79		assertEquals(n, q.size());
80	+	assertEquals((Integer) 0, q.peek());
81		return q;
82		}
83
#	Line 200 | Line 209 | public class PriorityBlockingQueueTest e
209		PriorityBlockingQueue q = new PriorityBlockingQueue(1);
210		try {
211		q.offer(new Object());
203	–	q.offer(new Object());
212		shouldThrow();
213	<	} catch (ClassCastException success) {}
213	>	} catch (ClassCastException success) {
214	>	assertTrue(q.isEmpty());
215	>	assertEquals(0, q.size());
216	>	assertNull(q.poll());
217	>	}
218		}
219
220		/**
#	Line 321 | Line 333 | public class PriorityBlockingQueueTest e
333		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
334		Thread t = newStartedThread(new CheckedRunnable() {
335		public void realRun() throws InterruptedException {
336	<	for (int i = 0; i < SIZE; ++i) {
325	<	assertEquals(i, q.take());
326	<	}
336	>	for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
337
338		Thread.currentThread().interrupt();
339		try {
#	Line 341 | Line 351 | public class PriorityBlockingQueueTest e
351		}});
352
353		await(pleaseInterrupt);
354	<	assertThreadStaysAlive(t);
354	>	assertThreadBlocks(t, Thread.State.WAITING);
355		t.interrupt();
356		awaitTermination(t);
357		}
#	Line 393 | Line 403 | public class PriorityBlockingQueueTest e
403		final CountDownLatch aboutToWait = new CountDownLatch(1);
404		Thread t = newStartedThread(new CheckedRunnable() {
405		public void realRun() throws InterruptedException {
406	+	long startTime = System.nanoTime();
407		for (int i = 0; i < SIZE; ++i) {
397	–	long t0 = System.nanoTime();
408		assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
399	–	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
409		}
401	–	long t0 = System.nanoTime();
410		aboutToWait.countDown();
411		try {
412		q.poll(LONG_DELAY_MS, MILLISECONDS);
413		shouldThrow();
414		} catch (InterruptedException success) {
415	<	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
415	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
416		}
417		}});
418
419	<	aboutToWait.await();
420	<	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
419	>	await(aboutToWait);
420	>	assertThreadBlocks(t, Thread.State.TIMED_WAITING);
421		t.interrupt();
422	<	awaitTermination(t, MEDIUM_DELAY_MS);
422	>	awaitTermination(t);
423		}
424
425		/**
#	Line 624 | Line 632 | public class PriorityBlockingQueueTest e
632		public void testPollInExecutor() {
633		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
634		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
635	<	ExecutorService executor = Executors.newFixedThreadPool(2);
636	<	executor.execute(new CheckedRunnable() {
637	<	public void realRun() throws InterruptedException {
638	<	assertNull(q.poll());
639	<	threadsStarted.await();
640	<	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
641	<	checkEmpty(q);
642	<	}});
643	<
644	<	executor.execute(new CheckedRunnable() {
645	<	public void realRun() throws InterruptedException {
646	<	threadsStarted.await();
647	<	q.put(one);
648	<	}});
649	<
650	<	joinPool(executor);
635	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
636	>	try (PoolCleaner cleaner = cleaner(executor)) {
637	>	executor.execute(new CheckedRunnable() {
638	>	public void realRun() throws InterruptedException {
639	>	assertNull(q.poll());
640	>	threadsStarted.await();
641	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
642	>	checkEmpty(q);
643	>	}});
644	>
645	>	executor.execute(new CheckedRunnable() {
646	>	public void realRun() throws InterruptedException {
647	>	threadsStarted.await();
648	>	q.put(one);
649	>	}});
650	>	}
651		}
652
653		/**

Diff Legend

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