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.61 by jsr166, Fri Apr 5 19:27:23 2013 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.Iterator;
13	>	import java.util.NoSuchElementException;
14	>	import java.util.concurrent.BlockingQueue;
15	>	import java.util.concurrent.CountDownLatch;
16	>	import java.util.concurrent.Delayed;
17	>	import java.util.concurrent.DelayQueue;
18	>	import java.util.concurrent.Executors;
19	>	import java.util.concurrent.ExecutorService;
20	>	import java.util.concurrent.TimeUnit;
21		import static java.util.concurrent.TimeUnit.MILLISECONDS;
12	–	import java.util.concurrent.*;
22
23		public class DelayQueueTest extends JSR166TestCase {
24	+
25	+	public static class Generic extends BlockingQueueTest {
26	+	protected BlockingQueue emptyCollection() {
27	+	return new DelayQueue();
28	+	}
29	+	protected PDelay makeElement(int i) {
30	+	return new PDelay(i);
31	+	}
32	+	}
33	+
34		public static void main(String[] args) {
35		junit.textui.TestRunner.run(suite());
36		}
37
38		public static Test suite() {
39	<	return new TestSuite(DelayQueueTest.class);
39	>	return newTestSuite(DelayQueueTest.class,
40	>	new Generic().testSuite());
41		}
42
43		private static final int NOCAP = Integer.MAX_VALUE;
#	Line 29 | Line 49 | public class DelayQueueTest extends JSR1
49		*/
50		static class PDelay implements Delayed {
51		int pseudodelay;
52	<	PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
53	<	public int compareTo(PDelay y) {
54	<	int i = pseudodelay;
55	<	int j = y.pseudodelay;
56	<	if (i < j) return -1;
37	<	if (i > j) return 1;
38	<	return 0;
52	>	PDelay(int i) { pseudodelay = i; }
53	>	public int compareTo(PDelay other) {
54	>	int a = this.pseudodelay;
55	>	int b = other.pseudodelay;
56	>	return (a < b) ? -1 : (a > b) ? 1 : 0;
57		}
40	–
58		public int compareTo(Delayed y) {
59		return compareTo((PDelay)y);
60		}
44	–
61		public boolean equals(Object other) {
62	<	return equals((PDelay)other);
62	>	return (other instanceof PDelay) &&
63	>	this.pseudodelay == ((PDelay)other).pseudodelay;
64		}
65	<	public boolean equals(PDelay other) {
66	<	return other.pseudodelay == pseudodelay;
50	<	}
51	<
65	>	// suppress [overrides] javac warning
66	>	public int hashCode() { return pseudodelay; }
67		public long getDelay(TimeUnit ignore) {
68	<	return pseudodelay;
54	<	}
55	<	public int intValue() {
56	<	return pseudodelay;
68	>	return Integer.MIN_VALUE + pseudodelay;
69		}
58	–
70		public String toString() {
71		return String.valueOf(pseudodelay);
72		}
#	Line 88 | Line 99 | public class DelayQueueTest extends JSR1
99		return other.trigger == trigger;
100		}
101
102	+	// suppress [overrides] javac warning
103	+	public int hashCode() { return (int) trigger; }
104	+
105		public long getDelay(TimeUnit unit) {
106		long n = trigger - System.nanoTime();
107		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 103 | Line 117 | public class DelayQueueTest extends JSR1
117		}
118
119		/**
120	<	* Create a queue of given size containing consecutive
120	>	* Returns a new queue of given size containing consecutive
121		* PDelays 0 ... n.
122		*/
123		private DelayQueue<PDelay> populatedQueue(int n) {
#	Line 206 | Line 220 | public class DelayQueueTest extends JSR1
220		}
221
222		/**
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	–	/**
223		* offer non-null succeeds
224		*/
225		public void testOffer() {
#	Line 248 | Line 240 | public class DelayQueueTest extends JSR1
240		}
241
242		/**
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	–	/**
243		* addAll(this) throws IAE
244		*/
245		public void testAddAllSelf() {
#	Line 270 | Line 251 | public class DelayQueueTest extends JSR1
251		}
252
253		/**
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	–	/**
254		* addAll of a collection with any null elements throws NPE after
255		* possibly adding some elements
256		*/
#	Line 312 | Line 281 | public class DelayQueueTest extends JSR1
281		}
282
283		/**
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	–	/**
284		* all elements successfully put are contained
285		*/
286		public void testPut() {
#	Line 379 | Line 337 | public class DelayQueueTest extends JSR1
337		}
338
339		/**
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	–	/**
340		* Take removes existing elements until empty, then blocks interruptibly
341		*/
342		public void testBlockingTake() throws InterruptedException {
#	Line 507 | Line 442 | public class DelayQueueTest extends JSR1
442		}
443
444		/**
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	–	/**
445		* peek returns next element, or null if empty
446		*/
447		public void testPeek() {
#	Line 593 | Line 487 | public class DelayQueueTest extends JSR1
487		}
488
489		/**
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	–	/**
490		* contains(x) reports true when elements added but not yet removed
491		*/
492		public void testContains() {
#	Line 710 | Line 589 | public class DelayQueueTest extends JSR1
589		}
590
591		/**
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	–	/**
592		* toArray(incompatible array type) throws ArrayStoreException
593		*/
594		public void testToArray1_BadArg() {
#	Line 757 | Line 625 | public class DelayQueueTest extends JSR1
625		it.next();
626		it.remove();
627		it = q.iterator();
628	<	assertEquals(it.next(), new PDelay(2));
629	<	assertEquals(it.next(), new PDelay(3));
628	>	assertEquals(new PDelay(2), it.next());
629	>	assertEquals(new PDelay(3), it.next());
630		assertFalse(it.hasNext());
631		}
632
#	Line 768 | Line 636 | public class DelayQueueTest extends JSR1
636		public void testToString() {
637		DelayQueue q = populatedQueue(SIZE);
638		String s = q.toString();
639	<	for (int i = 0; i < SIZE; ++i) {
640	<	assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
773	<	}
639	>	for (Object e : q)
640	>	assertTrue(s.contains(e.toString()));
641		}
642
643		/**
#	Line 845 | Line 712 | public class DelayQueueTest extends JSR1
712		}
713
714		/**
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	–	/**
715		* drainTo(c) empties queue into another collection c
716		*/
717		public void testDrainTo() {
#	Line 878 | Line 723 | public class DelayQueueTest extends JSR1
723		}
724		ArrayList l = new ArrayList();
725		q.drainTo(l);
726	<	assertEquals(q.size(), 0);
726	>	assertEquals(0, q.size());
727		for (int i = 0; i < SIZE; ++i)
728	<	assertEquals(l.get(i), elems[i]);
728	>	assertEquals(elems[i], l.get(i));
729		q.add(elems[0]);
730		q.add(elems[1]);
731		assertFalse(q.isEmpty());
#	Line 888 | Line 733 | public class DelayQueueTest extends JSR1
733		assertTrue(q.contains(elems[1]));
734		l.clear();
735		q.drainTo(l);
736	<	assertEquals(q.size(), 0);
737	<	assertEquals(l.size(), 2);
736	>	assertEquals(0, q.size());
737	>	assertEquals(2, l.size());
738		for (int i = 0; i < 2; ++i)
739	<	assertEquals(l.get(i), elems[i]);
739	>	assertEquals(elems[i], l.get(i));
740		}
741
742		/**
#	Line 913 | Line 758 | public class DelayQueueTest extends JSR1
758		}
759
760		/**
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	–	/**
761		* drainTo(c, n) empties first min(n, size) elements of queue into c
762		*/
763		public void testDrainToN() {
#	Line 943 | Line 766 | public class DelayQueueTest extends JSR1
766		ArrayList l = new ArrayList();
767		q.drainTo(l, i);
768		int k = (i < SIZE) ? i : SIZE;
769	<	assertEquals(q.size(), SIZE-k);
770	<	assertEquals(l.size(), k);
769	>	assertEquals(SIZE-k, q.size());
770	>	assertEquals(k, l.size());
771		}
772		}
773

Diff Legend

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