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.55 by jsr166, Mon Jun 27 20:37:32 2011 UTC vs.
Revision 1.66 by jsr166, Wed Dec 31 20:17:39 2014 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	<	import junit.framework.*;
10	<	import java.util.Arrays;
9	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	>
11		import java.util.ArrayList;
12	+	import java.util.Arrays;
13	+	import java.util.Collection;
14		import java.util.Iterator;
15		import java.util.NoSuchElementException;
16		import java.util.concurrent.BlockingQueue;
#	Line 18 | Line 20 | import java.util.concurrent.DelayQueue;
20		import java.util.concurrent.Executors;
21		import java.util.concurrent.ExecutorService;
22		import java.util.concurrent.TimeUnit;
23	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
23	>
24	>	import junit.framework.Test;
25
26		public class DelayQueueTest extends JSR166TestCase {
27
#	Line 62 | Line 65 | public class DelayQueueTest extends JSR1
65		return (other instanceof PDelay) &&
66		this.pseudodelay == ((PDelay)other).pseudodelay;
67		}
68	+	// suppress [overrides] javac warning
69	+	public int hashCode() { return pseudodelay; }
70		public long getDelay(TimeUnit ignore) {
71		return Integer.MIN_VALUE + pseudodelay;
72		}
#	Line 97 | Line 102 | public class DelayQueueTest extends JSR1
102		return other.trigger == trigger;
103		}
104
105	+	// suppress [overrides] javac warning
106	+	public int hashCode() { return (int) trigger; }
107	+
108		public long getDelay(TimeUnit unit) {
109		long n = trigger - System.nanoTime();
110		return unit.convert(n, TimeUnit.NANOSECONDS);
#	Line 112 | Line 120 | public class DelayQueueTest extends JSR1
120		}
121
122		/**
123	<	* Create a queue of given size containing consecutive
123	>	* Returns a new queue of given size containing consecutive
124		* PDelays 0 ... n.
125		*/
126		private DelayQueue<PDelay> populatedQueue(int n) {
127		DelayQueue<PDelay> q = new DelayQueue<PDelay>();
128		assertTrue(q.isEmpty());
129	<	for (int i = n-1; i >= 0; i-=2)
129	>	for (int i = n-1; i >= 0; i -= 2)
130		assertTrue(q.offer(new PDelay(i)));
131	<	for (int i = (n & 1); i < n; i+=2)
131	>	for (int i = (n & 1); i < n; i += 2)
132		assertTrue(q.offer(new PDelay(i)));
133		assertFalse(q.isEmpty());
134		assertEquals(NOCAP, q.remainingCapacity());
#	Line 281 | Line 289 | public class DelayQueueTest extends JSR1
289		public void testPut() {
290		DelayQueue q = new DelayQueue();
291		for (int i = 0; i < SIZE; ++i) {
292	<	PDelay I = new PDelay(i);
293	<	q.put(I);
294	<	assertTrue(q.contains(I));
292	>	PDelay x = new PDelay(i);
293	>	q.put(x);
294	>	assertTrue(q.contains(x));
295		}
296		assertEquals(SIZE, q.size());
297		}
#	Line 482 | Line 490 | public class DelayQueueTest extends JSR1
490		}
491
492		/**
485	–	* remove(x) removes x and returns true if present
486	–	*/
487	–	public void testRemoveElement() {
488	–	DelayQueue q = populatedQueue(SIZE);
489	–	for (int i = 1; i < SIZE; i+=2) {
490	–	assertTrue(q.remove(new PDelay(i)));
491	–	}
492	–	for (int i = 0; i < SIZE; i+=2) {
493	–	assertTrue(q.remove(new PDelay(i)));
494	–	assertFalse(q.remove(new PDelay(i+1)));
495	–	}
496	–	assertTrue(q.isEmpty());
497	–	}
498	–
499	–	/**
493		* contains(x) reports true when elements added but not yet removed
494		*/
495		public void testContains() {
#	Line 568 | Line 561 | public class DelayQueueTest extends JSR1
561		assertTrue(q.removeAll(p));
562		assertEquals(SIZE-i, q.size());
563		for (int j = 0; j < i; ++j) {
564	<	PDelay I = (PDelay)(p.remove());
565	<	assertFalse(q.contains(I));
564	>	PDelay x = (PDelay)(p.remove());
565	>	assertFalse(q.contains(x));
566		}
567		}
568		}
#	Line 635 | Line 628 | public class DelayQueueTest extends JSR1
628		it.next();
629		it.remove();
630		it = q.iterator();
631	<	assertEquals(it.next(), new PDelay(2));
632	<	assertEquals(it.next(), new PDelay(3));
631	>	assertEquals(new PDelay(2), it.next());
632	>	assertEquals(new PDelay(3), it.next());
633		assertFalse(it.hasNext());
634		}
635
#	Line 661 | Line 654 | public class DelayQueueTest extends JSR1
654		public void realRun() throws InterruptedException {
655		assertNull(q.poll());
656		threadsStarted.await();
657	<	assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
657	>	assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
658		checkEmpty(q);
659		}});
660
#	Line 733 | Line 726 | public class DelayQueueTest extends JSR1
726		}
727		ArrayList l = new ArrayList();
728		q.drainTo(l);
729	<	assertEquals(q.size(), 0);
729	>	assertEquals(0, q.size());
730		for (int i = 0; i < SIZE; ++i)
731	<	assertEquals(l.get(i), elems[i]);
731	>	assertEquals(elems[i], l.get(i));
732		q.add(elems[0]);
733		q.add(elems[1]);
734		assertFalse(q.isEmpty());
#	Line 743 | Line 736 | public class DelayQueueTest extends JSR1
736		assertTrue(q.contains(elems[1]));
737		l.clear();
738		q.drainTo(l);
739	<	assertEquals(q.size(), 0);
740	<	assertEquals(l.size(), 2);
739	>	assertEquals(0, q.size());
740	>	assertEquals(2, l.size());
741		for (int i = 0; i < 2; ++i)
742	<	assertEquals(l.get(i), elems[i]);
742	>	assertEquals(elems[i], l.get(i));
743		}
744
745		/**
#	Line 776 | Line 769 | public class DelayQueueTest extends JSR1
769		ArrayList l = new ArrayList();
770		q.drainTo(l, i);
771		int k = (i < SIZE) ? i : SIZE;
772	<	assertEquals(q.size(), SIZE-k);
773	<	assertEquals(l.size(), k);
772	>	assertEquals(SIZE-k, q.size());
773	>	assertEquals(k, l.size());
774		}
775		}
776
777	+	/**
778	+	* remove(null), contains(null) always return false
779	+	*/
780	+	public void testNeverContainsNull() {
781	+	Collection<?> q = populatedQueue(SIZE);
782	+	assertFalse(q.contains(null));
783	+	assertFalse(q.remove(null));
784	+	}
785		}

Diff Legend

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