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.76 by jsr166, Tue Oct 6 00:03:55 2015 UTC vs.
Revision 1.79 by jsr166, Mon Oct 17 01:54:51 2016 UTC

#	Line 39 | Line 39 | public class DelayQueueTest extends JSR1
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
54		/**
#	Line 94 | Line 102 | public class DelayQueueTest extends JSR1
102		}
103
104		public boolean equals(Object other) {
105	<	return equals((NanoDelay)other);
106	<	}
99	<	public boolean equals(NanoDelay other) {
100	<	return other.trigger == trigger;
105	>	return (other instanceof NanoDelay) &&
106	>	this.trigger == ((NanoDelay)other).trigger;
107		}
108
109		// suppress [overrides] javac warning
#	Line 119 | Line 125 | public class DelayQueueTest extends JSR1
125
126		/**
127		* Returns a new queue of given size containing consecutive
128	<	* PDelays 0 ... n.
128	>	* PDelays 0 ... n - 1.
129		*/
130		private DelayQueue<PDelay> populatedQueue(int n) {
131		DelayQueue<PDelay> q = new DelayQueue<PDelay>();
#	Line 131 | Line 137 | public class DelayQueueTest extends JSR1
137		assertFalse(q.isEmpty());
138		assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
139		assertEquals(n, q.size());
140	+	assertEquals(new PDelay(0), q.peek());
141		return q;
142		}
143

Diff Legend

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