ViewVC Help

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

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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.66 by jsr166, Wed Dec 31 20:17:39 2014 UTC vs.
Revision 1.83 by jsr166, Sat May 13 21:43:50 2017 UTC

#	Line 35 | Line 35 | public class DelayQueueTest extends JSR1
35		}
36
37		public static void main(String[] args) {
38	<	junit.textui.TestRunner.run(suite());
38	>	main(suite(), args);
39		}
40
41		public static Test suite() {
42	+	class Implementation implements CollectionImplementation {
43	+	public Class<?> klazz() { return DelayQueue.class; }
44	+	public Collection emptyCollection() { return new DelayQueue(); }
45	+	public Object makeElement(int i) { return new PDelay(i); }
46	+	public boolean isConcurrent() { return true; }
47	+	public boolean permitsNulls() { return false; }
48	+	}
49		return newTestSuite(DelayQueueTest.class,
50	<	new Generic().testSuite());
50	>	new Generic().testSuite(),
51	>	CollectionTest.testSuite(new Implementation()));
52		}
53
46	–	private static final int NOCAP = Integer.MAX_VALUE;
47	–
54		/**
55	<	* A delayed implementation for testing.
56	<	* Most tests use Pseudodelays, where delays are all elapsed
55	>	* A fake Delayed implementation for testing.
56	>	* Most tests use PDelays, where delays are all elapsed
57		* (so, no blocking solely for delays) but are still ordered
58		*/
59		static class PDelay implements Delayed {
60	<	int pseudodelay;
61	<	PDelay(int i) { pseudodelay = i; }
56	<	public int compareTo(PDelay other) {
57	<	int a = this.pseudodelay;
58	<	int b = other.pseudodelay;
59	<	return (a < b) ? -1 : (a > b) ? 1 : 0;
60	<	}
60	>	final int pseudodelay;
61	>	PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62		public int compareTo(Delayed y) {
63	<	return compareTo((PDelay)y);
63	>	return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64		}
65		public boolean equals(Object other) {
66		return (other instanceof PDelay) &&
#	Line 79 | Line 80 | public class DelayQueueTest extends JSR1
80		* Delayed implementation that actually delays
81		*/
82		static class NanoDelay implements Delayed {
83	<	long trigger;
83	>	final long trigger;
84		NanoDelay(long i) {
85		trigger = System.nanoTime() + i;
86		}
86	–	public int compareTo(NanoDelay y) {
87	–	long i = trigger;
88	–	long j = y.trigger;
89	–	if (i < j) return -1;
90	–	if (i > j) return 1;
91	–	return 0;
92	–	}
87
88		public int compareTo(Delayed y) {
89	<	return compareTo((NanoDelay)y);
89	>	return Long.compare(trigger, ((NanoDelay)y).trigger);
90		}
91
92		public boolean equals(Object other) {
93	<	return equals((NanoDelay)other);
94	<	}
101	<	public boolean equals(NanoDelay other) {
102	<	return other.trigger == trigger;
93	>	return (other instanceof NanoDelay) &&
94	>	this.trigger == ((NanoDelay)other).trigger;
95		}
96
97		// suppress [overrides] javac warning
#	Line 121 | Line 113 | public class DelayQueueTest extends JSR1
113
114		/**
115		* Returns a new queue of given size containing consecutive
116	<	* PDelays 0 ... n.
116	>	* PDelays 0 ... n - 1.
117		*/
118	<	private DelayQueue<PDelay> populatedQueue(int n) {
119	<	DelayQueue<PDelay> q = new DelayQueue<PDelay>();
118	>	private static DelayQueue<PDelay> populatedQueue(int n) {
119	>	DelayQueue<PDelay> q = new DelayQueue<>();
120		assertTrue(q.isEmpty());
121	<	for (int i = n-1; i >= 0; i -= 2)
121	>	for (int i = n - 1; i >= 0; i -= 2)
122		assertTrue(q.offer(new PDelay(i)));
123		for (int i = (n & 1); i < n; i += 2)
124		assertTrue(q.offer(new PDelay(i)));
125		assertFalse(q.isEmpty());
126	<	assertEquals(NOCAP, q.remainingCapacity());
126	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
127		assertEquals(n, q.size());
128	+	assertEquals(new PDelay(0), q.peek());
129		return q;
130		}
131
#	Line 140 | Line 133 | public class DelayQueueTest extends JSR1
133		* A new queue has unbounded capacity
134		*/
135		public void testConstructor1() {
136	<	assertEquals(NOCAP, new DelayQueue().remainingCapacity());
136	>	assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
137		}
138
139		/**
#	Line 148 | Line 141 | public class DelayQueueTest extends JSR1
141		*/
142		public void testConstructor3() {
143		try {
144	<	DelayQueue q = new DelayQueue(null);
144	>	new DelayQueue(null);
145		shouldThrow();
146		} catch (NullPointerException success) {}
147		}
#	Line 158 | Line 151 | public class DelayQueueTest extends JSR1
151		*/
152		public void testConstructor4() {
153		try {
154	<	PDelay[] ints = new PDelay[SIZE];
162	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
154	>	new DelayQueue(Arrays.asList(new PDelay[SIZE]));
155		shouldThrow();
156		} catch (NullPointerException success) {}
157		}
#	Line 168 | Line 160 | public class DelayQueueTest extends JSR1
160		* Initializing from Collection with some null elements throws NPE
161		*/
162		public void testConstructor5() {
163	+	PDelay[] a = new PDelay[SIZE];
164	+	for (int i = 0; i < SIZE - 1; ++i)
165	+	a[i] = new PDelay(i);
166		try {
167	<	PDelay[] ints = new PDelay[SIZE];
173	<	for (int i = 0; i < SIZE-1; ++i)
174	<	ints[i] = new PDelay(i);
175	<	DelayQueue q = new DelayQueue(Arrays.asList(ints));
167	>	new DelayQueue(Arrays.asList(a));
168		shouldThrow();
169		} catch (NullPointerException success) {}
170		}
#	Line 195 | Line 187 | public class DelayQueueTest extends JSR1
187		public void testEmpty() {
188		DelayQueue q = new DelayQueue();
189		assertTrue(q.isEmpty());
190	<	assertEquals(NOCAP, q.remainingCapacity());
190	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
191		q.add(new PDelay(1));
192		assertFalse(q.isEmpty());
193		q.add(new PDelay(2));
#	Line 205 | Line 197 | public class DelayQueueTest extends JSR1
197		}
198
199		/**
200	<	* remainingCapacity does not change when elements added or removed,
209	<	* but size does
200	>	* remainingCapacity() always returns Integer.MAX_VALUE
201		*/
202		public void testRemainingCapacity() {
203	<	DelayQueue q = populatedQueue(SIZE);
203	>	BlockingQueue q = populatedQueue(SIZE);
204		for (int i = 0; i < SIZE; ++i) {
205	<	assertEquals(NOCAP, q.remainingCapacity());
206	<	assertEquals(SIZE-i, q.size());
207	<	q.remove();
205	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
206	>	assertEquals(SIZE - i, q.size());
207	>	assertTrue(q.remove() instanceof PDelay);
208		}
209		for (int i = 0; i < SIZE; ++i) {
210	<	assertEquals(NOCAP, q.remainingCapacity());
210	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211		assertEquals(i, q.size());
212	<	q.add(new PDelay(i));
212	>	assertTrue(q.add(new PDelay(i)));
213		}
214		}
215
#	Line 246 | Line 237 | public class DelayQueueTest extends JSR1
237		* addAll(this) throws IAE
238		*/
239		public void testAddAllSelf() {
240	+	DelayQueue q = populatedQueue(SIZE);
241		try {
250	–	DelayQueue q = populatedQueue(SIZE);
242		q.addAll(q);
243		shouldThrow();
244		} catch (IllegalArgumentException success) {}
#	Line 258 | Line 249 | public class DelayQueueTest extends JSR1
249		* possibly adding some elements
250		*/
251		public void testAddAll3() {
252	+	DelayQueue q = new DelayQueue();
253	+	PDelay[] a = new PDelay[SIZE];
254	+	for (int i = 0; i < SIZE - 1; ++i)
255	+	a[i] = new PDelay(i);
256		try {
257	<	DelayQueue q = new DelayQueue();
263	<	PDelay[] ints = new PDelay[SIZE];
264	<	for (int i = 0; i < SIZE-1; ++i)
265	<	ints[i] = new PDelay(i);
266	<	q.addAll(Arrays.asList(ints));
257	>	q.addAll(Arrays.asList(a));
258		shouldThrow();
259		} catch (NullPointerException success) {}
260		}
#	Line 274 | Line 265 | public class DelayQueueTest extends JSR1
265		public void testAddAll5() {
266		PDelay[] empty = new PDelay[0];
267		PDelay[] ints = new PDelay[SIZE];
268	<	for (int i = SIZE-1; i >= 0; --i)
268	>	for (int i = SIZE - 1; i >= 0; --i)
269		ints[i] = new PDelay(i);
270		DelayQueue q = new DelayQueue();
271		assertFalse(q.addAll(Arrays.asList(empty)));
#	Line 335 | Line 326 | public class DelayQueueTest extends JSR1
326		public void testTake() throws InterruptedException {
327		DelayQueue q = populatedQueue(SIZE);
328		for (int i = 0; i < SIZE; ++i) {
329	<	assertEquals(new PDelay(i), ((PDelay)q.take()));
329	>	assertEquals(new PDelay(i), q.take());
330		}
331		}
332
#	Line 347 | Line 338 | public class DelayQueueTest extends JSR1
338		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339		Thread t = newStartedThread(new CheckedRunnable() {
340		public void realRun() throws InterruptedException {
341	<	for (int i = 0; i < SIZE; ++i) {
341	>	for (int i = 0; i < SIZE; i++)
342		assertEquals(new PDelay(i), ((PDelay)q.take()));
352	–	}
343
344		Thread.currentThread().interrupt();
345		try {
#	Line 367 | Line 357 | public class DelayQueueTest extends JSR1
357		}});
358
359		await(pleaseInterrupt);
360	<	assertThreadStaysAlive(t);
360	>	assertThreadBlocks(t, Thread.State.WAITING);
361		t.interrupt();
362		awaitTermination(t);
363		}
#	Line 378 | Line 368 | public class DelayQueueTest extends JSR1
368		public void testPoll() {
369		DelayQueue q = populatedQueue(SIZE);
370		for (int i = 0; i < SIZE; ++i) {
371	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
371	>	assertEquals(new PDelay(i), q.poll());
372		}
373		assertNull(q.poll());
374		}
#	Line 389 | Line 379 | public class DelayQueueTest extends JSR1
379		public void testTimedPoll0() throws InterruptedException {
380		DelayQueue q = populatedQueue(SIZE);
381		for (int i = 0; i < SIZE; ++i) {
382	<	assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
382	>	assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
383		}
384		assertNull(q.poll(0, MILLISECONDS));
385		}
#	Line 401 | Line 391 | public class DelayQueueTest extends JSR1
391		DelayQueue q = populatedQueue(SIZE);
392		for (int i = 0; i < SIZE; ++i) {
393		long startTime = System.nanoTime();
394	<	assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
394	>	assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
395		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
396		}
397		long startTime = System.nanoTime();
#	Line 416 | Line 406 | public class DelayQueueTest extends JSR1
406		*/
407		public void testInterruptedTimedPoll() throws InterruptedException {
408		final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
409	+	final DelayQueue q = populatedQueue(SIZE);
410		Thread t = newStartedThread(new CheckedRunnable() {
411		public void realRun() throws InterruptedException {
412	<	DelayQueue q = populatedQueue(SIZE);
412	>	long startTime = System.nanoTime();
413		for (int i = 0; i < SIZE; ++i) {
414	<	assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
414	>	assertEquals(new PDelay(i),
415	>	((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
416		}
417
418		Thread.currentThread().interrupt();
#	Line 436 | Line 428 | public class DelayQueueTest extends JSR1
428		shouldThrow();
429		} catch (InterruptedException success) {}
430		assertFalse(Thread.interrupted());
431	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
432		}});
433
434		await(pleaseInterrupt);
435		assertThreadStaysAlive(t);
436		t.interrupt();
437		awaitTermination(t);
438	+	checkEmpty(q);
439		}
440
441		/**
#	Line 450 | Line 444 | public class DelayQueueTest extends JSR1
444		public void testPeek() {
445		DelayQueue q = populatedQueue(SIZE);
446		for (int i = 0; i < SIZE; ++i) {
447	<	assertEquals(new PDelay(i), ((PDelay)q.peek()));
448	<	assertEquals(new PDelay(i), ((PDelay)q.poll()));
447	>	assertEquals(new PDelay(i), q.peek());
448	>	assertEquals(new PDelay(i), q.poll());
449		if (q.isEmpty())
450		assertNull(q.peek());
451		else
#	Line 466 | Line 460 | public class DelayQueueTest extends JSR1
460		public void testElement() {
461		DelayQueue q = populatedQueue(SIZE);
462		for (int i = 0; i < SIZE; ++i) {
463	<	assertEquals(new PDelay(i), ((PDelay)q.element()));
463	>	assertEquals(new PDelay(i), q.element());
464		q.poll();
465		}
466		try {
#	Line 481 | Line 475 | public class DelayQueueTest extends JSR1
475		public void testRemove() {
476		DelayQueue q = populatedQueue(SIZE);
477		for (int i = 0; i < SIZE; ++i) {
478	<	assertEquals(new PDelay(i), ((PDelay)q.remove()));
478	>	assertEquals(new PDelay(i), q.remove());
479		}
480		try {
481		q.remove();
#	Line 509 | Line 503 | public class DelayQueueTest extends JSR1
503		q.clear();
504		assertTrue(q.isEmpty());
505		assertEquals(0, q.size());
506	<	assertEquals(NOCAP, q.remainingCapacity());
506	>	assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
507		PDelay x = new PDelay(1);
508		q.add(x);
509		assertFalse(q.isEmpty());
#	Line 546 | Line 540 | public class DelayQueueTest extends JSR1
540		assertTrue(changed);
541
542		assertTrue(q.containsAll(p));
543	<	assertEquals(SIZE-i, q.size());
543	>	assertEquals(SIZE - i, q.size());
544		p.remove();
545		}
546		}
#	Line 559 | Line 553 | public class DelayQueueTest extends JSR1
553		DelayQueue q = populatedQueue(SIZE);
554		DelayQueue p = populatedQueue(i);
555		assertTrue(q.removeAll(p));
556	<	assertEquals(SIZE-i, q.size());
556	>	assertEquals(SIZE - i, q.size());
557		for (int j = 0; j < i; ++j) {
558		PDelay x = (PDelay)(p.remove());
559		assertFalse(q.contains(x));
#	Line 614 | Line 608 | public class DelayQueueTest extends JSR1
608		++i;
609		}
610		assertEquals(i, SIZE);
611	+	assertIteratorExhausted(it);
612	+	}
613	+
614	+	/**
615	+	* iterator of empty collection has no elements
616	+	*/
617	+	public void testEmptyIterator() {
618	+	assertIteratorExhausted(new DelayQueue().iterator());
619		}
620
621		/**
#	Line 649 | Line 651 | public class DelayQueueTest extends JSR1
651		public void testPollInExecutor() {
652		final DelayQueue q = new DelayQueue();
653		final CheckedBarrier threadsStarted = new CheckedBarrier(2);
654	<	ExecutorService executor = Executors.newFixedThreadPool(2);
655	<	executor.execute(new CheckedRunnable() {
656	<	public void realRun() throws InterruptedException {
657	<	assertNull(q.poll());
658	<	threadsStarted.await();
659	<	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
660	<	checkEmpty(q);
661	<	}});
662	<
663	<	executor.execute(new CheckedRunnable() {
664	<	public void realRun() throws InterruptedException {
665	<	threadsStarted.await();
666	<	q.put(new PDelay(1));
667	<	}});
668	<
669	<	joinPool(executor);
654	>	final ExecutorService executor = Executors.newFixedThreadPool(2);
655	>	try (PoolCleaner cleaner = cleaner(executor)) {
656	>	executor.execute(new CheckedRunnable() {
657	>	public void realRun() throws InterruptedException {
658	>	assertNull(q.poll());
659	>	threadsStarted.await();
660	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
661	>	checkEmpty(q);
662	>	}});
663	>
664	>	executor.execute(new CheckedRunnable() {
665	>	public void realRun() throws InterruptedException {
666	>	threadsStarted.await();
667	>	q.put(new PDelay(1));
668	>	}});
669	>	}
670		}
671
672		/**
673		* Delayed actions do not occur until their delay elapses
674		*/
675		public void testDelay() throws InterruptedException {
676	<	DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
676	>	DelayQueue<NanoDelay> q = new DelayQueue<>();
677		for (int i = 0; i < SIZE; ++i)
678		q.add(new NanoDelay(1000000L * (SIZE - i)));
679
#	Line 749 | Line 751 | public class DelayQueueTest extends JSR1
751		final DelayQueue q = populatedQueue(SIZE);
752		Thread t = new Thread(new CheckedRunnable() {
753		public void realRun() {
754	<	q.put(new PDelay(SIZE+1));
754	>	q.put(new PDelay(SIZE + 1));
755		}});
756
757		t.start();
#	Line 769 | Line 771 | public class DelayQueueTest extends JSR1
771		ArrayList l = new ArrayList();
772		q.drainTo(l, i);
773		int k = (i < SIZE) ? i : SIZE;
774	<	assertEquals(SIZE-k, q.size());
774	>	assertEquals(SIZE - k, q.size());
775		assertEquals(k, l.size());
776		}
777		}

Diff Legend

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