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.52 by jsr166, Sat May 28 22:40:00 2011 UTC vs.
Revision 1.63 by jsr166, Sun Nov 23 22:27:06 2014 UTC

#	Line 7 | Line 7
7		*/
8
9		import junit.framework.*;
10	<	import java.util.*;
10	>	import java.util.Arrays;
11	>	import java.util.ArrayList;
12	>	import java.util.Collection;
13	>	import java.util.Iterator;
14	>	import java.util.NoSuchElementException;
15	>	import java.util.concurrent.BlockingQueue;
16	>	import java.util.concurrent.CountDownLatch;
17	>	import java.util.concurrent.Delayed;
18	>	import java.util.concurrent.DelayQueue;
19	>	import java.util.concurrent.Executors;
20	>	import java.util.concurrent.ExecutorService;
21	>	import java.util.concurrent.TimeUnit;
22		import static java.util.concurrent.TimeUnit.MILLISECONDS;
12	–	import java.util.concurrent.*;
23
24		public class DelayQueueTest extends JSR166TestCase {
25	+
26	+	public static class Generic extends BlockingQueueTest {
27	+	protected BlockingQueue emptyCollection() {
28	+	return new DelayQueue();
29	+	}
30	+	protected PDelay makeElement(int i) {
31	+	return new PDelay(i);
32	+	}
33	+	}
34	+
35		public static void main(String[] args) {
36		junit.textui.TestRunner.run(suite());
37		}
38
39		public static Test suite() {
40	<	return new TestSuite(DelayQueueTest.class);
40	>	return newTestSuite(DelayQueueTest.class,
41	>	new Generic().testSuite());
42		}
43
44		private static final int NOCAP = Integer.MAX_VALUE;
#	Line 29 | Line 50 | public class DelayQueueTest extends JSR1
50		*/
51		static class PDelay implements Delayed {
52		int pseudodelay;
53	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
54	<	public int compareTo(PDelay y) {
55	<	int i = pseudodelay;
56	<	int j = y.pseudodelay;
57	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
53	>	PDelay(int i) { pseudodelay = i; }
54	>	public int compareTo(PDelay other) {
55	>	int a = this.pseudodelay;
56	>	int b = other.pseudodelay;
57	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
58		}
40	–
59		public int compareTo(Delayed y) {
60		return compareTo((PDelay)y);
61		}
44	–
62		public boolean equals(Object other) {
63	<	return equals((PDelay)other);
63	>	return (other instanceof PDelay) &&
64	>	this.pseudodelay == ((PDelay)other).pseudodelay;
65		}
66	<	public boolean equals(PDelay other) {
67	<	return other.pseudodelay == pseudodelay;
50	<	}
51	<
66	>	// suppress [overrides] javac warning
67	>	public int hashCode() { return pseudodelay; }
68		public long getDelay(TimeUnit ignore) {
69	<	return pseudodelay;
54	<	}
55	<	public int intValue() {
56	<	return pseudodelay;
69	>	return Integer.MIN_VALUE + pseudodelay;
70		}
58	–
71		public String toString() {
72		return String.valueOf(pseudodelay);
73		}
#	Line 88 | Line 100 | public class DelayQueueTest extends JSR1
100		return other.trigger == trigger;
101		}
102
103	+	// suppress [overrides] javac warning
104	+	public int hashCode() { return (int) trigger; }
105	+
106		public long getDelay(TimeUnit unit) {
107		long n = trigger - System.nanoTime();
108		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 103 | Line 118 | public class DelayQueueTest extends JSR1
118		}
119
120		/**
121	<	* Create a queue of given size containing consecutive
121	>	* Returns a new queue of given size containing consecutive
122		* PDelays 0 ... n.
123		*/
124		private DelayQueue<PDelay> populatedQueue(int n) {
#	Line 206 | Line 221 | public class DelayQueueTest extends JSR1
221		}
222
223		/**
209	–	* offer(null) throws NPE
210	–	*/
211	–	public void testOfferNull() {
212	–	try {
213	–	DelayQueue q = new DelayQueue();
214	–	q.offer(null);
215	–	shouldThrow();
216	–	} catch (NullPointerException success) {}
217	–	}
218	–
219	–	/**
220	–	* add(null) throws NPE
221	–	*/
222	–	public void testAddNull() {
223	–	try {
224	–	DelayQueue q = new DelayQueue();
225	–	q.add(null);
226	–	shouldThrow();
227	–	} catch (NullPointerException success) {}
228	–	}
229	–
230	–	/**
224		* offer non-null succeeds
225		*/
226		public void testOffer() {
#	Line 248 | Line 241 | public class DelayQueueTest extends JSR1
241		}
242
243		/**
251	–	* addAll(null) throws NPE
252	–	*/
253	–	public void testAddAll1() {
254	–	try {
255	–	DelayQueue q = new DelayQueue();
256	–	q.addAll(null);
257	–	shouldThrow();
258	–	} catch (NullPointerException success) {}
259	–	}
260	–
261	–	/**
244		* addAll(this) throws IAE
245		*/
246		public void testAddAllSelf() {
#	Line 270 | Line 252 | public class DelayQueueTest extends JSR1
252		}
253
254		/**
273	–	* addAll of a collection with null elements throws NPE
274	–	*/
275	–	public void testAddAll2() {
276	–	try {
277	–	DelayQueue q = new DelayQueue();
278	–	PDelay[] ints = new PDelay[SIZE];
279	–	q.addAll(Arrays.asList(ints));
280	–	shouldThrow();
281	–	} catch (NullPointerException success) {}
282	–	}
283	–
284	–	/**
255		* addAll of a collection with any null elements throws NPE after
256		* possibly adding some elements
257		*/
#	Line 312 | Line 282 | public class DelayQueueTest extends JSR1
282		}
283
284		/**
315	–	* put(null) throws NPE
316	–	*/
317	–	public void testPutNull() {
318	–	try {
319	–	DelayQueue q = new DelayQueue();
320	–	q.put(null);
321	–	shouldThrow();
322	–	} catch (NullPointerException success) {}
323	–	}
324	–
325	–	/**
285		* all elements successfully put are contained
286		*/
287		public void testPut() {
#	Line 379 | Line 338 | public class DelayQueueTest extends JSR1
338		}
339
340		/**
382	–	* take blocks interruptibly when empty
383	–	*/
384	–	public void testTakeFromEmptyBlocksInterruptibly()
385	–	throws InterruptedException {
386	–	final BlockingQueue q = new DelayQueue();
387	–	final CountDownLatch threadStarted = new CountDownLatch(1);
388	–	Thread t = newStartedThread(new CheckedRunnable() {
389	–	public void realRun() {
390	–	threadStarted.countDown();
391	–	try {
392	–	q.take();
393	–	shouldThrow();
394	–	} catch (InterruptedException success) {}
395	–	assertFalse(Thread.interrupted());
396	–	}});
397	–
398	–	await(threadStarted);
399	–	assertThreadStaysAlive(t);
400	–	t.interrupt();
401	–	awaitTermination(t);
402	–	}
403	–
404	–	/**
341		* Take removes existing elements until empty, then blocks interruptibly
342		*/
343		public void testBlockingTake() throws InterruptedException {
#	Line 507 | Line 443 | public class DelayQueueTest extends JSR1
443		}
444
445		/**
510	–	* timed poll before a delayed offer fails; after offer succeeds;
511	–	* on interruption throws
512	–	*/
513	–	public void testTimedPollWithOffer() throws InterruptedException {
514	–	final DelayQueue q = new DelayQueue();
515	–	final PDelay pdelay = new PDelay(0);
516	–	final CheckedBarrier barrier = new CheckedBarrier(2);
517	–	Thread t = newStartedThread(new CheckedRunnable() {
518	–	public void realRun() throws InterruptedException {
519	–	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
520	–
521	–	barrier.await();
522	–	assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
523	–
524	–	Thread.currentThread().interrupt();
525	–	try {
526	–	q.poll(LONG_DELAY_MS, MILLISECONDS);
527	–	shouldThrow();
528	–	} catch (InterruptedException success) {}
529	–	assertFalse(Thread.interrupted());
530	–
531	–	barrier.await();
532	–	try {
533	–	q.poll(LONG_DELAY_MS, MILLISECONDS);
534	–	shouldThrow();
535	–	} catch (InterruptedException success) {}
536	–	assertFalse(Thread.interrupted());
537	–	}});
538	–
539	–	barrier.await();
540	–	long startTime = System.nanoTime();
541	–	assertTrue(q.offer(pdelay, LONG_DELAY_MS, MILLISECONDS));
542	–	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
543	–
544	–	barrier.await();
545	–	assertThreadStaysAlive(t);
546	–	t.interrupt();
547	–	awaitTermination(t);
548	–	}
549	–
550	–	/**
446		* peek returns next element, or null if empty
447		*/
448		public void testPeek() {
#	Line 593 | Line 488 | public class DelayQueueTest extends JSR1
488		}
489
490		/**
596	–	* remove(x) removes x and returns true if present
597	–	*/
598	–	public void testRemoveElement() {
599	–	DelayQueue q = populatedQueue(SIZE);
600	–	for (int i = 1; i < SIZE; i+=2) {
601	–	assertTrue(q.remove(new PDelay(i)));
602	–	}
603	–	for (int i = 0; i < SIZE; i+=2) {
604	–	assertTrue(q.remove(new PDelay(i)));
605	–	assertFalse(q.remove(new PDelay(i+1)));
606	–	}
607	–	assertTrue(q.isEmpty());
608	–	}
609	–
610	–	/**
491		* contains(x) reports true when elements added but not yet removed
492		*/
493		public void testContains() {
#	Line 710 | Line 590 | public class DelayQueueTest extends JSR1
590		}
591
592		/**
713	–	* toArray(null) throws NullPointerException
714	–	*/
715	–	public void testToArray_NullArg() {
716	–	DelayQueue q = populatedQueue(SIZE);
717	–	try {
718	–	q.toArray(null);
719	–	shouldThrow();
720	–	} catch (NullPointerException success) {}
721	–	}
722	–
723	–	/**
593		* toArray(incompatible array type) throws ArrayStoreException
594		*/
595		public void testToArray1_BadArg() {
#	Line 757 | Line 626 | public class DelayQueueTest extends JSR1
626		it.next();
627		it.remove();
628		it = q.iterator();
629	<	assertEquals(it.next(), new PDelay(2));
630	<	assertEquals(it.next(), new PDelay(3));
629	>	assertEquals(new PDelay(2), it.next());
630	>	assertEquals(new PDelay(3), it.next());
631		assertFalse(it.hasNext());
632		}
633
#	Line 768 | Line 637 | public class DelayQueueTest extends JSR1
637		public void testToString() {
638		DelayQueue q = populatedQueue(SIZE);
639		String s = q.toString();
640	<	for (int i = 0; i < SIZE; ++i) {
641	<	assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
773	<	}
640	>	for (Object e : q)
641	>	assertTrue(s.contains(e.toString()));
642		}
643
644		/**
#	Line 784 | Line 652 | public class DelayQueueTest extends JSR1
652		public void realRun() throws InterruptedException {
653		assertNull(q.poll());
654		threadsStarted.await();
655	<	assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
655	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
656		checkEmpty(q);
657		}});
658
#	Line 845 | Line 713 | public class DelayQueueTest extends JSR1
713		}
714
715		/**
848	–	* drainTo(null) throws NPE
849	–	*/
850	–	public void testDrainToNull() {
851	–	DelayQueue q = populatedQueue(SIZE);
852	–	try {
853	–	q.drainTo(null);
854	–	shouldThrow();
855	–	} catch (NullPointerException success) {}
856	–	}
857	–
858	–	/**
859	–	* drainTo(this) throws IAE
860	–	*/
861	–	public void testDrainToSelf() {
862	–	DelayQueue q = populatedQueue(SIZE);
863	–	try {
864	–	q.drainTo(q);
865	–	shouldThrow();
866	–	} catch (IllegalArgumentException success) {}
867	–	}
868	–
869	–	/**
716		* drainTo(c) empties queue into another collection c
717		*/
718		public void testDrainTo() {
#	Line 878 | Line 724 | public class DelayQueueTest extends JSR1
724		}
725		ArrayList l = new ArrayList();
726		q.drainTo(l);
727	<	assertEquals(q.size(), 0);
727	>	assertEquals(0, q.size());
728		for (int i = 0; i < SIZE; ++i)
729	<	assertEquals(l.get(i), elems[i]);
729	>	assertEquals(elems[i], l.get(i));
730		q.add(elems[0]);
731		q.add(elems[1]);
732		assertFalse(q.isEmpty());
#	Line 888 | Line 734 | public class DelayQueueTest extends JSR1
734		assertTrue(q.contains(elems[1]));
735		l.clear();
736		q.drainTo(l);
737	<	assertEquals(q.size(), 0);
738	<	assertEquals(l.size(), 2);
737	>	assertEquals(0, q.size());
738	>	assertEquals(2, l.size());
739		for (int i = 0; i < 2; ++i)
740	<	assertEquals(l.get(i), elems[i]);
740	>	assertEquals(elems[i], l.get(i));
741		}
742
743		/**
#	Line 913 | Line 759 | public class DelayQueueTest extends JSR1
759		}
760
761		/**
916	–	* drainTo(null, n) throws NPE
917	–	*/
918	–	public void testDrainToNullN() {
919	–	DelayQueue q = populatedQueue(SIZE);
920	–	try {
921	–	q.drainTo(null, 0);
922	–	shouldThrow();
923	–	} catch (NullPointerException success) {}
924	–	}
925	–
926	–	/**
927	–	* drainTo(this, n) throws IAE
928	–	*/
929	–	public void testDrainToSelfN() {
930	–	DelayQueue q = populatedQueue(SIZE);
931	–	try {
932	–	q.drainTo(q, 0);
933	–	shouldThrow();
934	–	} catch (IllegalArgumentException success) {}
935	–	}
936	–
937	–	/**
762		* drainTo(c, n) empties first min(n, size) elements of queue into c
763		*/
764		public void testDrainToN() {
#	Line 943 | Line 767 | public class DelayQueueTest extends JSR1
767		ArrayList l = new ArrayList();
768		q.drainTo(l, i);
769		int k = (i < SIZE) ? i : SIZE;
770	<	assertEquals(q.size(), SIZE-k);
771	<	assertEquals(l.size(), k);
770	>	assertEquals(SIZE-k, q.size());
771	>	assertEquals(k, l.size());
772		}
773		}
774
775	+	/**
776	+	* remove(null), contains(null) always return false
777	+	*/
778	+	public void testNeverContainsNull() {
779	+	Collection<?> q = populatedQueue(SIZE);
780	+	assertFalse(q.contains(null));
781	+	assertFalse(q.remove(null));
782	+	}
783		}

Diff Legend

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