ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/DelayQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.2 by dl, Sun Sep 7 20:39:11 2003 UTC vs.
Revision 1.95 by jsr166, Wed Jan 27 01:57:24 2021 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
12 <
13 < public class DelayQueueTest extends TestCase {
14 <
15 <    private static final int N = 10;
16 <    private static final long SHORT_DELAY_MS = 100;
17 <    private static final long MEDIUM_DELAY_MS = 1000;
18 <    private static final long LONG_DELAY_MS = 10000;
19 <    private static final int NOCAP = Integer.MAX_VALUE;
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;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Delayed;
19 > import java.util.concurrent.DelayQueue;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.TimeUnit;
23 >
24 > import junit.framework.Test;
25 >
26 > public class DelayQueueTest extends JSR166TestCase {
27 >
28 >    public static class Generic extends BlockingQueueTest {
29 >        protected BlockingQueue emptyCollection() {
30 >            return new DelayQueue();
31 >        }
32 >        protected PDelay makeElement(int i) {
33 >            return new PDelay(i);
34 >        }
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 <        return new TestSuite(DelayQueueTest.class);
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(),
51 >                            CollectionTest.testSuite(new Implementation()));
52 >    }
53 >
54 >    /**
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 >        final int pseudodelay;
61 >        PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62 >        public int compareTo(Delayed y) {
63 >            return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64 >        }
65 >        public boolean equals(Object other) {
66 >            return (other instanceof PDelay) &&
67 >                this.pseudodelay == ((PDelay)other).pseudodelay;
68 >        }
69 >        // suppress [overrides] javac warning
70 >        public int hashCode() { return pseudodelay; }
71 >        public long getDelay(TimeUnit ignore) {
72 >            return (long) Integer.MIN_VALUE + pseudodelay;
73 >        }
74 >        public String toString() {
75 >            return String.valueOf(pseudodelay);
76 >        }
77      }
78  
79 <    // Most Q/BQ tests use Pseudodelays, where delays are all elapsed
80 <    // (so, no blocking solely for delays) but are still ordered
79 >    /**
80 >     * Delayed implementation that actually delays
81 >     */
82 >    static class NanoDelay implements Delayed {
83 >        final long trigger;
84 >        NanoDelay(long i) {
85 >            trigger = System.nanoTime() + i;
86 >        }
87  
88 <    static class PDelay implements Delayed {
89 <        int pseudodelay;
33 <        PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
34 <        public int compareTo(Object y) {
35 <            int i = pseudodelay;
36 <            int j = ((PDelay)y).pseudodelay;
37 <            if (i < j) return -1;
38 <            if (i > j) return 1;
39 <            return 0;
40 <        }
41 <
42 <        public int compareTo(PDelay y) {
43 <            int i = pseudodelay;
44 <            int j = ((PDelay)y).pseudodelay;
45 <            if (i < j) return -1;
46 <            if (i > j) return 1;
47 <            return 0;
88 >        public int compareTo(Delayed y) {
89 >            return Long.compare(trigger, ((NanoDelay)y).trigger);
90          }
91  
92          public boolean equals(Object other) {
93 <            return ((PDelay)other).pseudodelay == pseudodelay;
94 <        }
53 <        public boolean equals(PDelay other) {
54 <            return ((PDelay)other).pseudodelay == pseudodelay;
93 >            return (other instanceof NanoDelay) &&
94 >                this.trigger == ((NanoDelay)other).trigger;
95          }
96  
97 +        // suppress [overrides] javac warning
98 +        public int hashCode() { return (int) trigger; }
99  
100 <        public long getDelay(TimeUnit ignore) {
101 <            return pseudodelay;
100 >        public long getDelay(TimeUnit unit) {
101 >            long n = trigger - System.nanoTime();
102 >            return unit.convert(n, TimeUnit.NANOSECONDS);
103          }
104 <        public int intValue() {
105 <            return pseudodelay;
104 >
105 >        public long getTriggerTime() {
106 >            return trigger;
107          }
108  
109          public String toString() {
110 <            return String.valueOf(pseudodelay);
110 >            return String.valueOf(trigger);
111          }
112      }
113  
70
71
72
114      /**
115 <     * Create a queue of given size containing consecutive
116 <     * PDelays 0 ... n.
115 >     * Returns a new queue of given size containing consecutive
116 >     * PDelays 0 ... n - 1.
117       */
118 <    private DelayQueue fullQueue(int n) {
119 <        DelayQueue q = new DelayQueue();
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)
122 <            assertTrue(q.offer(new PDelay(i)));
123 <        for(int i = (n & 1); i < n; i+=2)
124 <            assertTrue(q.offer(new PDelay(i)));
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());
127 <        assertEquals(n, q.size());
126 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
127 >        mustEqual(n, q.size());
128 >        mustEqual(new PDelay(0), q.peek());
129          return q;
130      }
89
90    public void testConstructor1(){
91        assertEquals(NOCAP, new DelayQueue().remainingCapacity());
92    }
131  
132 <    public void testConstructor3(){
132 >    /**
133 >     * A new queue has unbounded capacity
134 >     */
135 >    public void testConstructor1() {
136 >        mustEqual(Integer.MAX_VALUE, new DelayQueue<PDelay>().remainingCapacity());
137 >    }
138  
139 +    /**
140 +     * Initializing from null Collection throws NPE
141 +     */
142 +    public void testConstructor3() {
143          try {
144 <            DelayQueue q = new DelayQueue(null);
145 <            fail("Cannot make from null collection");
146 <        }
100 <        catch (NullPointerException success) {}
144 >            new DelayQueue<PDelay>(null);
145 >            shouldThrow();
146 >        } catch (NullPointerException success) {}
147      }
148  
149 <    public void testConstructor4(){
149 >    /**
150 >     * Initializing from Collection of null elements throws NPE
151 >     */
152 >    public void testConstructor4() {
153          try {
154 <            PDelay[] ints = new PDelay[N];
155 <            DelayQueue q = new DelayQueue(Arrays.asList(ints));
156 <            fail("Cannot make with null elements");
108 <        }
109 <        catch (NullPointerException success) {}
154 >            new DelayQueue<PDelay>(Arrays.asList(new PDelay[SIZE]));
155 >            shouldThrow();
156 >        } catch (NullPointerException success) {}
157      }
158  
159 <    public void testConstructor5(){
160 <        try {
161 <            PDelay[] ints = new PDelay[N];
162 <            for (int i = 0; i < N-1; ++i)
163 <                ints[i] = new PDelay(i);
164 <            DelayQueue q = new DelayQueue(Arrays.asList(ints));
165 <            fail("Cannot make with null elements");
166 <        }
167 <        catch (NullPointerException success) {}
159 >    /**
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 >            new DelayQueue<PDelay>(Arrays.asList(a));
168 >            shouldThrow();
169 >        } catch (NullPointerException success) {}
170      }
171  
172 <    public void testConstructor6(){
173 <        try {
174 <            PDelay[] ints = new PDelay[N];
175 <            for (int i = 0; i < N; ++i)
176 <                ints[i] = new PDelay(i);
177 <            DelayQueue q = new DelayQueue(Arrays.asList(ints));
178 <            for (int i = 0; i < N; ++i)
179 <                assertEquals(ints[i], q.poll());
180 <        }
181 <        finally {}
172 >    /**
173 >     * Queue contains all elements of collection used to initialize
174 >     */
175 >    public void testConstructor6() {
176 >        PDelay[] items = new PDelay[SIZE];
177 >        for (int i = 0; i < SIZE; ++i)
178 >            items[i] = new PDelay(i);
179 >        DelayQueue<PDelay> q = new DelayQueue<>(Arrays.asList(items));
180 >        for (int i = 0; i < SIZE; ++i)
181 >            mustEqual(items[i], q.poll());
182      }
183  
184 +    /**
185 +     * isEmpty is true before add, false after
186 +     */
187      public void testEmpty() {
188 <        DelayQueue q = new DelayQueue();
188 >        DelayQueue<PDelay> q = new DelayQueue<>();
189          assertTrue(q.isEmpty());
190 <        assertEquals(NOCAP, q.remainingCapacity());
190 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
191          q.add(new PDelay(1));
192          assertFalse(q.isEmpty());
193          q.add(new PDelay(2));
# Line 144 | Line 196 | public class DelayQueueTest extends Test
196          assertTrue(q.isEmpty());
197      }
198  
199 <    public void testRemainingCapacity(){
200 <        DelayQueue q = fullQueue(N);
201 <        for (int i = 0; i < N; ++i) {
202 <            assertEquals(NOCAP, q.remainingCapacity());
203 <            assertEquals(N-i, q.size());
204 <            q.remove();
205 <        }
206 <        for (int i = 0; i < N; ++i) {
207 <            assertEquals(NOCAP, q.remainingCapacity());
208 <            assertEquals(i, q.size());
209 <            q.add(new PDelay(i));
199 >    /**
200 >     * remainingCapacity() always returns Integer.MAX_VALUE
201 >     */
202 >    public void testRemainingCapacity() {
203 >        BlockingQueue<PDelay> q = populatedQueue(SIZE);
204 >        for (int i = 0; i < SIZE; ++i) {
205 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
206 >            mustEqual(SIZE - i, q.size());
207 >            assertTrue(q.remove() instanceof PDelay);
208 >        }
209 >        for (int i = 0; i < SIZE; ++i) {
210 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
211 >            mustEqual(i, q.size());
212 >            assertTrue(q.add(new PDelay(i)));
213          }
214      }
215  
216 <    public void testOfferNull(){
217 <        try {
218 <            DelayQueue q = new DelayQueue();
164 <            q.offer(null);
165 <            fail("should throw NPE");
166 <        } catch (NullPointerException success) { }  
167 <    }
168 <
216 >    /**
217 >     * offer non-null succeeds
218 >     */
219      public void testOffer() {
220 <        DelayQueue q = new DelayQueue();
220 >        DelayQueue<PDelay> q = new DelayQueue<>();
221          assertTrue(q.offer(new PDelay(0)));
222          assertTrue(q.offer(new PDelay(1)));
223      }
224  
225 <    public void testAdd(){
226 <        DelayQueue q = new DelayQueue();
227 <        for (int i = 0; i < N; ++i) {
228 <            assertEquals(i, q.size());
225 >    /**
226 >     * add succeeds
227 >     */
228 >    public void testAdd() {
229 >        DelayQueue<PDelay> q = new DelayQueue<>();
230 >        for (int i = 0; i < SIZE; ++i) {
231 >            mustEqual(i, q.size());
232              assertTrue(q.add(new PDelay(i)));
233          }
234      }
235  
236 <    public void testAddAll1(){
237 <        try {
238 <            DelayQueue q = new DelayQueue();
239 <            q.addAll(null);
240 <            fail("Cannot add null collection");
188 <        }
189 <        catch (NullPointerException success) {}
190 <    }
191 <    public void testAddAll2(){
192 <        try {
193 <            DelayQueue q = new DelayQueue();
194 <            PDelay[] ints = new PDelay[N];
195 <            q.addAll(Arrays.asList(ints));
196 <            fail("Cannot add null elements");
197 <        }
198 <        catch (NullPointerException success) {}
199 <    }
200 <    public void testAddAll3(){
236 >    /**
237 >     * addAll(this) throws IllegalArgumentException
238 >     */
239 >    public void testAddAllSelf() {
240 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
241          try {
242 <            DelayQueue q = new DelayQueue();
243 <            PDelay[] ints = new PDelay[N];
244 <            for (int i = 0; i < N-1; ++i)
205 <                ints[i] = new PDelay(i);
206 <            q.addAll(Arrays.asList(ints));
207 <            fail("Cannot add null elements");
208 <        }
209 <        catch (NullPointerException success) {}
242 >            q.addAll(q);
243 >            shouldThrow();
244 >        } catch (IllegalArgumentException success) {}
245      }
246  
247 <    public void testAddAll5(){
248 <        try {
249 <            PDelay[] empty = new PDelay[0];
250 <            PDelay[] ints = new PDelay[N];
251 <            for (int i = N-1; i >= 0; --i)
252 <                ints[i] = new PDelay(i);
253 <            DelayQueue q = new DelayQueue();
254 <            assertFalse(q.addAll(Arrays.asList(empty)));
255 <            assertTrue(q.addAll(Arrays.asList(ints)));
256 <            for (int i = 0; i < N; ++i)
257 <                assertEquals(ints[i], q.poll());
258 <        }
259 <        finally {}
225 <    }
226 <
227 <     public void testPutNull() {
228 <        try {
229 <            DelayQueue q = new DelayQueue();
230 <            q.put(null);
231 <            fail("put should throw NPE");
232 <        }
233 <        catch (NullPointerException success){
234 <        }  
235 <     }
236 <
237 <     public void testPut() {
238 <         try {
239 <             DelayQueue q = new DelayQueue();
240 <             for (int i = 0; i < N; ++i) {
241 <                 PDelay I = new PDelay(i);
242 <                 q.put(I);
243 <                 assertTrue(q.contains(I));
244 <             }
245 <             assertEquals(N, q.size());
246 <         }
247 <         finally {
248 <        }
247 >    /**
248 >     * addAll of a collection with any null elements throws NPE after
249 >     * possibly adding some elements
250 >     */
251 >    public void testAddAll3() {
252 >        DelayQueue<PDelay> 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 >            q.addAll(Arrays.asList(a));
258 >            shouldThrow();
259 >        } catch (NullPointerException success) {}
260      }
261  
262 <    public void testPutWithTake() {
263 <        final DelayQueue q = new DelayQueue();
264 <        Thread t = new Thread(new Runnable() {
265 <                public void run(){
266 <                    int added = 0;
267 <                    try {
268 <                        q.put(new PDelay(0));
269 <                        ++added;
270 <                        q.put(new PDelay(0));
271 <                        ++added;
272 <                        q.put(new PDelay(0));
273 <                        ++added;
274 <                        q.put(new PDelay(0));
264 <                        ++added;
265 <                        assertTrue(added == 4);
266 <                    } finally {
267 <                    }
268 <                }
269 <            });
270 <        try {
271 <            t.start();
272 <            Thread.sleep(SHORT_DELAY_MS);
273 <            q.take();
274 <            t.interrupt();
275 <            t.join();
276 <        } catch (Exception e){
277 <            fail("Unexpected exception");
278 <        }
262 >    /**
263 >     * Queue contains all elements of successful addAll
264 >     */
265 >    public void testAddAll5() {
266 >        PDelay[] empty = new PDelay[0];
267 >        PDelay[] items = new PDelay[SIZE];
268 >        for (int i = SIZE - 1; i >= 0; --i)
269 >            items[i] = new PDelay(i);
270 >        DelayQueue<PDelay> q = new DelayQueue<>();
271 >        assertFalse(q.addAll(Arrays.asList(empty)));
272 >        assertTrue(q.addAll(Arrays.asList(items)));
273 >        for (int i = 0; i < SIZE; ++i)
274 >            mustEqual(items[i], q.poll());
275      }
276  
277 <    public void testTimedOffer() {
278 <        final DelayQueue q = new DelayQueue();
279 <        Thread t = new Thread(new Runnable() {
280 <                public void run(){
281 <                    try {
282 <                        q.put(new PDelay(0));
283 <                        q.put(new PDelay(0));
284 <                        assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS/2, TimeUnit.MILLISECONDS));
285 <                        assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS));
290 <                    } finally { }
291 <                }
292 <            });
293 <        
294 <        try {
295 <            t.start();
296 <            Thread.sleep(SHORT_DELAY_MS);
297 <            t.interrupt();
298 <            t.join();
299 <        } catch (Exception e){
300 <            fail("Unexpected exception");
277 >    /**
278 >     * all elements successfully put are contained
279 >     */
280 >    public void testPut() {
281 >        DelayQueue<PDelay> q = new DelayQueue<>();
282 >        for (int i = 0; i < SIZE; ++i) {
283 >            PDelay x = new PDelay(i);
284 >            q.put(x);
285 >            assertTrue(q.contains(x));
286          }
287 +        mustEqual(SIZE, q.size());
288      }
289  
290 <    public void testTake(){
291 <        try {
292 <            DelayQueue q = fullQueue(N);
293 <            for (int i = 0; i < N; ++i) {
294 <                assertEquals(new PDelay(i), ((PDelay)q.take()));
295 <            }
296 <        } catch (InterruptedException e){
297 <            fail("Unexpected exception");
298 <        }  
290 >    /**
291 >     * put doesn't block waiting for take
292 >     */
293 >    public void testPutWithTake() throws InterruptedException {
294 >        final DelayQueue<PDelay> q = new DelayQueue<>();
295 >        Thread t = newStartedThread(new CheckedRunnable() {
296 >            public void realRun() {
297 >                q.put(new PDelay(0));
298 >                q.put(new PDelay(0));
299 >                q.put(new PDelay(0));
300 >                q.put(new PDelay(0));
301 >            }});
302 >
303 >        awaitTermination(t);
304 >        mustEqual(4, q.size());
305      }
306  
307 <    public void testTakeFromEmpty() {
308 <        final DelayQueue q = new DelayQueue();
309 <        Thread t = new Thread(new Runnable() {
310 <                public void run(){
311 <                    try {
312 <                        q.take();
313 <                        fail("Should block");
314 <                    } catch (InterruptedException success){ }                
315 <                }
316 <            });
317 <        try {
318 <            t.start();
319 <            Thread.sleep(SHORT_DELAY_MS);
320 <            t.interrupt();
329 <            t.join();
330 <        } catch (Exception e){
331 <            fail("Unexpected exception");
332 <        }
307 >    /**
308 >     * Queue is unbounded, so timed offer never times out
309 >     */
310 >    public void testTimedOffer() throws InterruptedException {
311 >        final DelayQueue<PDelay> q = new DelayQueue<>();
312 >        Thread t = newStartedThread(new CheckedRunnable() {
313 >            public void realRun() throws InterruptedException {
314 >                q.put(new PDelay(0));
315 >                q.put(new PDelay(0));
316 >                assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
317 >                assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
318 >            }});
319 >
320 >        awaitTermination(t);
321      }
322  
323 <    public void testBlockingTake(){
324 <        Thread t = new Thread(new Runnable() {
325 <                public void run() {
326 <                    try {
327 <                        DelayQueue q = fullQueue(N);
328 <                        for (int i = 0; i < N; ++i) {
329 <                            assertEquals(new PDelay(i), ((PDelay)q.take()));
342 <                        }
343 <                        q.take();
344 <                        fail("take should block");
345 <                    } catch (InterruptedException success){
346 <                    }  
347 <                }});
348 <        t.start();
349 <        try {
350 <           Thread.sleep(SHORT_DELAY_MS);
351 <           t.interrupt();
352 <           t.join();
353 <        }
354 <        catch (InterruptedException ie) {
355 <            fail("Unexpected exception");
323 >    /**
324 >     * take retrieves elements in priority order
325 >     */
326 >    public void testTake() throws InterruptedException {
327 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
328 >        for (int i = 0; i < SIZE; ++i) {
329 >            mustEqual(new PDelay(i), q.take());
330          }
331      }
332  
333 +    /**
334 +     * Take removes existing elements until empty, then blocks interruptibly
335 +     */
336 +    public void testBlockingTake() throws InterruptedException {
337 +        final DelayQueue<PDelay> q = populatedQueue(SIZE);
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++)
342 +                    mustEqual(new PDelay(i), q.take());
343  
344 <    public void testPoll(){
345 <        DelayQueue q = fullQueue(N);
346 <        for (int i = 0; i < N; ++i) {
347 <            assertEquals(new PDelay(i), ((PDelay)q.poll()));
348 <        }
349 <        assertNull(q.poll());
344 >                Thread.currentThread().interrupt();
345 >                try {
346 >                    q.take();
347 >                    shouldThrow();
348 >                } catch (InterruptedException success) {}
349 >                assertFalse(Thread.interrupted());
350 >
351 >                pleaseInterrupt.countDown();
352 >                try {
353 >                    q.take();
354 >                    shouldThrow();
355 >                } catch (InterruptedException success) {}
356 >                assertFalse(Thread.interrupted());
357 >            }});
358 >
359 >        await(pleaseInterrupt);
360 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
361 >        t.interrupt();
362 >        awaitTermination(t);
363      }
364  
365 <    public void testTimedPoll0() {
366 <        try {
367 <            DelayQueue q = fullQueue(N);
368 <            for (int i = 0; i < N; ++i) {
369 <                assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS)));
370 <            }
371 <            assertNull(q.poll(0, TimeUnit.MILLISECONDS));
372 <        } catch (InterruptedException e){
373 <            fail("Unexpected exception");
377 <        }  
365 >    /**
366 >     * poll succeeds unless empty
367 >     */
368 >    public void testPoll() {
369 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
370 >        for (int i = 0; i < SIZE; ++i) {
371 >            mustEqual(new PDelay(i), q.poll());
372 >        }
373 >        assertNull(q.poll());
374      }
375  
376 <    public void testTimedPoll() {
377 <        try {
378 <            DelayQueue q = fullQueue(N);
379 <            for (int i = 0; i < N; ++i) {
380 <                assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
381 <            }
382 <            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
387 <        } catch (InterruptedException e){
388 <            fail("Unexpected exception");
389 <        }  
390 <    }
391 <
392 <    public void testInterruptedTimedPoll(){
393 <        Thread t = new Thread(new Runnable() {
394 <                public void run() {
395 <                    try {
396 <                        DelayQueue q = fullQueue(N);
397 <                        for (int i = 0; i < N; ++i) {
398 <                            assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)));
399 <                        }
400 <                        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
401 <                    } catch (InterruptedException success){
402 <                    }  
403 <                }});
404 <        t.start();
405 <        try {
406 <           Thread.sleep(SHORT_DELAY_MS);
407 <           t.interrupt();
408 <           t.join();
409 <        }
410 <        catch (InterruptedException ie) {
411 <            fail("Unexpected exception");
376 >    /**
377 >     * timed poll with zero timeout succeeds when non-empty, else times out
378 >     */
379 >    public void testTimedPoll0() throws InterruptedException {
380 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
381 >        for (int i = 0; i < SIZE; ++i) {
382 >            mustEqual(new PDelay(i), q.poll(0, MILLISECONDS));
383          }
384 +        assertNull(q.poll(0, MILLISECONDS));
385      }
386  
387 <    public void testTimedPollWithOffer(){
388 <        final DelayQueue q = new DelayQueue();
389 <        Thread t = new Thread(new Runnable() {
390 <                public void run(){
391 <                    try {
392 <                        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
393 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
394 <                        q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
395 <                        fail("Should block");
396 <                    } catch (InterruptedException success) { }                
397 <                }
398 <            });
399 <        try {
400 <            t.start();
401 <            Thread.sleep(SHORT_DELAY_MS * 2);
402 <            assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
403 <            t.interrupt();
404 <            t.join();
405 <        } catch (Exception e){
406 <            fail("Unexpected exception");
407 <        }
408 <    }  
387 >    /**
388 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
389 >     */
390 >    public void testTimedPoll() throws InterruptedException {
391 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
392 >        for (int i = 0; i < SIZE; ++i) {
393 >            long startTime = System.nanoTime();
394 >            mustEqual(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
395 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
396 >        }
397 >        long startTime = System.nanoTime();
398 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
399 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
400 >        checkEmpty(q);
401 >    }
402 >
403 >    /**
404 >     * Interrupted timed poll throws InterruptedException instead of
405 >     * returning timeout status
406 >     */
407 >    public void testInterruptedTimedPoll() throws InterruptedException {
408 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
409 >        final DelayQueue<PDelay> q = populatedQueue(SIZE);
410 >        Thread t = newStartedThread(new CheckedRunnable() {
411 >            public void realRun() throws InterruptedException {
412 >                for (int i = 0; i < SIZE; i++)
413 >                    mustEqual(new PDelay(i),
414 >                              q.poll(LONG_DELAY_MS, MILLISECONDS));
415  
416 +                Thread.currentThread().interrupt();
417 +                try {
418 +                    q.poll(randomTimeout(), randomTimeUnit());
419 +                    shouldThrow();
420 +                } catch (InterruptedException success) {}
421 +                assertFalse(Thread.interrupted());
422  
423 <    public void testPeek(){
424 <        DelayQueue q = fullQueue(N);
425 <        for (int i = 0; i < N; ++i) {
426 <            assertEquals(new PDelay(i), ((PDelay)q.peek()));
427 <            q.poll();
428 <            assertTrue(q.peek() == null ||
429 <                       i != ((PDelay)q.peek()).intValue());
423 >                pleaseInterrupt.countDown();
424 >                try {
425 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
426 >                    shouldThrow();
427 >                } catch (InterruptedException success) {}
428 >                assertFalse(Thread.interrupted());
429 >            }});
430 >
431 >        await(pleaseInterrupt);
432 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
433 >        t.interrupt();
434 >        awaitTermination(t);
435 >        checkEmpty(q);
436 >    }
437 >
438 >    /**
439 >     * peek returns next element, or null if empty
440 >     */
441 >    public void testPeek() {
442 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
443 >        for (int i = 0; i < SIZE; ++i) {
444 >            mustEqual(new PDelay(i), q.peek());
445 >            mustEqual(new PDelay(i), q.poll());
446 >            if (q.isEmpty())
447 >                assertNull(q.peek());
448 >            else
449 >                assertFalse(new PDelay(i).equals(q.peek()));
450          }
451 <        assertNull(q.peek());
451 >        assertNull(q.peek());
452      }
453  
454 <    public void testElement(){
455 <        DelayQueue q = fullQueue(N);
456 <        for (int i = 0; i < N; ++i) {
457 <            assertEquals(new PDelay(i), ((PDelay)q.element()));
454 >    /**
455 >     * element returns next element, or throws NSEE if empty
456 >     */
457 >    public void testElement() {
458 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
459 >        for (int i = 0; i < SIZE; ++i) {
460 >            mustEqual(new PDelay(i), q.element());
461              q.poll();
462          }
463          try {
464              q.element();
465 <            fail("no such element");
466 <        }
460 <        catch (NoSuchElementException success) {}
465 >            shouldThrow();
466 >        } catch (NoSuchElementException success) {}
467      }
468  
469 <    public void testRemove(){
470 <        DelayQueue q = fullQueue(N);
471 <        for (int i = 0; i < N; ++i) {
472 <            assertEquals(new PDelay(i), ((PDelay)q.remove()));
469 >    /**
470 >     * remove removes next element, or throws NSEE if empty
471 >     */
472 >    public void testRemove() {
473 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
474 >        for (int i = 0; i < SIZE; ++i) {
475 >            mustEqual(new PDelay(i), q.remove());
476          }
477          try {
478              q.remove();
479 <            fail("remove should throw");
480 <        } catch (NoSuchElementException success){
472 <        }  
479 >            shouldThrow();
480 >        } catch (NoSuchElementException success) {}
481      }
482  
483 <    public void testRemoveElement(){
484 <        DelayQueue q = fullQueue(N);
485 <        for (int i = 1; i < N; i+=2) {
486 <            assertTrue(q.remove(new PDelay(i)));
487 <        }
488 <        for (int i = 0; i < N; i+=2) {
481 <            assertTrue(q.remove(new PDelay(i)));
482 <            assertFalse(q.remove(new PDelay(i+1)));
483 <        }
484 <        assertTrue(q.isEmpty());
485 <    }
486 <        
487 <    public void testContains(){
488 <        DelayQueue q = fullQueue(N);
489 <        for (int i = 0; i < N; ++i) {
483 >    /**
484 >     * contains(x) reports true when elements added but not yet removed
485 >     */
486 >    public void testContains() {
487 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
488 >        for (int i = 0; i < SIZE; ++i) {
489              assertTrue(q.contains(new PDelay(i)));
490              q.poll();
491              assertFalse(q.contains(new PDelay(i)));
492          }
493      }
494  
495 <    public void testClear(){
496 <        DelayQueue q = fullQueue(N);
495 >    /**
496 >     * clear removes all elements
497 >     */
498 >    public void testClear() {
499 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
500          q.clear();
501          assertTrue(q.isEmpty());
502 <        assertEquals(0, q.size());
503 <        assertEquals(NOCAP, q.remainingCapacity());
504 <        q.add(new PDelay(1));
502 >        mustEqual(0, q.size());
503 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
504 >        PDelay x = new PDelay(1);
505 >        q.add(x);
506          assertFalse(q.isEmpty());
507 +        assertTrue(q.contains(x));
508          q.clear();
509          assertTrue(q.isEmpty());
510      }
511  
512 <    public void testContainsAll(){
513 <        DelayQueue q = fullQueue(N);
514 <        DelayQueue p = new DelayQueue();
515 <        for (int i = 0; i < N; ++i) {
512 >    /**
513 >     * containsAll(c) is true when c contains a subset of elements
514 >     */
515 >    public void testContainsAll() {
516 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
517 >        DelayQueue<PDelay> p = new DelayQueue<>();
518 >        for (int i = 0; i < SIZE; ++i) {
519              assertTrue(q.containsAll(p));
520              assertFalse(p.containsAll(q));
521              p.add(new PDelay(i));
# Line 516 | Line 523 | public class DelayQueueTest extends Test
523          assertTrue(p.containsAll(q));
524      }
525  
526 <    public void testRetainAll(){
527 <        DelayQueue q = fullQueue(N);
528 <        DelayQueue p = fullQueue(N);
529 <        for (int i = 0; i < N; ++i) {
526 >    /**
527 >     * retainAll(c) retains only those elements of c and reports true if changed
528 >     */
529 >    public void testRetainAll() {
530 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
531 >        DelayQueue<PDelay> p = populatedQueue(SIZE);
532 >        for (int i = 0; i < SIZE; ++i) {
533              boolean changed = q.retainAll(p);
534              if (i == 0)
535                  assertFalse(changed);
# Line 527 | Line 537 | public class DelayQueueTest extends Test
537                  assertTrue(changed);
538  
539              assertTrue(q.containsAll(p));
540 <            assertEquals(N-i, q.size());
540 >            mustEqual(SIZE - i, q.size());
541              p.remove();
542          }
543      }
544  
545 <    public void testRemoveAll(){
546 <        for (int i = 1; i < N; ++i) {
547 <            DelayQueue q = fullQueue(N);
548 <            DelayQueue p = fullQueue(i);
545 >    /**
546 >     * removeAll(c) removes only those elements of c and reports true if changed
547 >     */
548 >    public void testRemoveAll() {
549 >        for (int i = 1; i < SIZE; ++i) {
550 >            DelayQueue<PDelay> q = populatedQueue(SIZE);
551 >            DelayQueue<PDelay> p = populatedQueue(i);
552              assertTrue(q.removeAll(p));
553 <            assertEquals(N-i, q.size());
553 >            mustEqual(SIZE - i, q.size());
554              for (int j = 0; j < i; ++j) {
555 <                PDelay I = (PDelay)(p.remove());
543 <                assertFalse(q.contains(I));
555 >                assertFalse(q.contains(p.remove()));
556              }
557          }
558      }
559  
560 <    /*
561 <    public void testEqualsAndHashCode(){
562 <        DelayQueue q1 = fullQueue(N);
563 <        DelayQueue q2 = fullQueue(N);
564 <        assertTrue(q1.equals(q2));
565 <        assertTrue(q2.equals(q1));
566 <        assertEquals(q1.hashCode(), q2.hashCode());
567 <        q1.remove();
568 <        assertFalse(q1.equals(q2));
569 <        assertFalse(q2.equals(q1));
570 <        assertFalse(q1.hashCode() == q2.hashCode());
571 <        q2.remove();
572 <        assertTrue(q1.equals(q2));
573 <        assertTrue(q2.equals(q1));
574 <        assertEquals(q1.hashCode(), q2.hashCode());
575 <    }
576 <    */
577 <
578 <    public void testToArray(){
579 <        DelayQueue q = fullQueue(N);
580 <        Object[] o = q.toArray();
581 <        Arrays.sort(o);
582 <        try {
583 <        for(int i = 0; i < o.length; i++)
584 <            assertEquals(o[i], q.take());
585 <        } catch (InterruptedException e){
586 <            fail("Unexpected exception");
587 <        }    
588 <    }
589 <
590 <    public void testToArray2(){
591 <        DelayQueue q = fullQueue(N);
592 <        PDelay[] ints = new PDelay[N];
593 <        ints = (PDelay[])q.toArray(ints);
594 <        Arrays.sort(ints);
595 <        try {
596 <            for(int i = 0; i < ints.length; i++)
597 <                assertEquals(ints[i], q.take());
598 <        } catch (InterruptedException e){
599 <            fail("Unexpected exception");
600 <        }    
601 <    }
602 <    
591 <    public void testIterator(){
592 <        DelayQueue q = fullQueue(N);
560 >    /**
561 >     * toArray contains all elements
562 >     */
563 >    public void testToArray() throws InterruptedException {
564 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
565 >        Object[] a = q.toArray();
566 >        assertSame(Object[].class, a.getClass());
567 >        Arrays.sort(a);
568 >        for (Object o : a)
569 >            assertSame(o, q.take());
570 >        assertTrue(q.isEmpty());
571 >    }
572 >
573 >    /**
574 >     * toArray(a) contains all elements
575 >     */
576 >    public void testToArray2() {
577 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
578 >        PDelay[] items = new PDelay[SIZE];
579 >        PDelay[] array = q.toArray(items);
580 >        assertSame(items, array);
581 >        Arrays.sort(items);
582 >        for (PDelay o : items)
583 >            assertSame(o, q.remove());
584 >        assertTrue(q.isEmpty());
585 >    }
586 >
587 >    /**
588 >     * toArray(incompatible array type) throws ArrayStoreException
589 >     */
590 >    public void testToArray1_BadArg() {
591 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
592 >        try {
593 >            q.toArray(new String[10]);
594 >            shouldThrow();
595 >        } catch (ArrayStoreException success) {}
596 >    }
597 >
598 >    /**
599 >     * iterator iterates through all elements
600 >     */
601 >    public void testIterator() {
602 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
603          int i = 0;
604 <        Iterator it = q.iterator();
605 <        while(it.hasNext()) {
604 >        Iterator<PDelay> it = q.iterator();
605 >        while (it.hasNext()) {
606              assertTrue(q.contains(it.next()));
607              ++i;
608          }
609 <        assertEquals(i, N);
609 >        mustEqual(i, SIZE);
610 >        assertIteratorExhausted(it);
611      }
612  
613 <    public void testIteratorRemove () {
614 <
615 <        final DelayQueue q = new DelayQueue();
613 >    /**
614 >     * iterator of empty collection has no elements
615 >     */
616 >    public void testEmptyIterator() {
617 >        assertIteratorExhausted(new DelayQueue<PDelay>().iterator());
618 >    }
619  
620 +    /**
621 +     * iterator.remove removes current element
622 +     */
623 +    public void testIteratorRemove() {
624 +        final DelayQueue<PDelay> q = new DelayQueue<>();
625          q.add(new PDelay(2));
626          q.add(new PDelay(1));
627          q.add(new PDelay(3));
628 <
610 <        Iterator it = q.iterator();
628 >        Iterator<PDelay> it = q.iterator();
629          it.next();
630          it.remove();
613
631          it = q.iterator();
632 <        assertEquals(it.next(), new PDelay(2));
633 <        assertEquals(it.next(), new PDelay(3));
632 >        mustEqual(new PDelay(2), it.next());
633 >        mustEqual(new PDelay(3), it.next());
634          assertFalse(it.hasNext());
635      }
636  
637 <
638 <    public void testToString(){
639 <        DelayQueue q = fullQueue(N);
637 >    /**
638 >     * toString contains toStrings of elements
639 >     */
640 >    public void testToString() {
641 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
642          String s = q.toString();
643 <        for (int i = 0; i < N; ++i) {
644 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
645 <        }
627 <    }        
643 >        for (Object e : q)
644 >            assertTrue(s.contains(e.toString()));
645 >    }
646  
647 +    /**
648 +     * timed poll transfers elements across Executor tasks
649 +     */
650      public void testPollInExecutor() {
651 +        final DelayQueue<PDelay> q = new DelayQueue<>();
652 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
653 +        final ExecutorService executor = Executors.newFixedThreadPool(2);
654 +        try (PoolCleaner cleaner = cleaner(executor)) {
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 <        final DelayQueue q = new DelayQueue();
664 <
665 <        ExecutorService executor = Executors.newFixedThreadPool(2);
634 <
635 <        executor.execute(new Runnable() {
636 <            public void run() {
637 <                assertNull("poll should fail", q.poll());
638 <                try {
639 <                    assertTrue(null != q.poll(MEDIUM_DELAY_MS * 2, TimeUnit.MILLISECONDS));
640 <                    assertTrue(q.isEmpty());
641 <                }
642 <                catch (InterruptedException e) {
643 <                    fail("should not be interrupted");
644 <                }
645 <            }
646 <        });
647 <
648 <        executor.execute(new Runnable() {
649 <            public void run() {
650 <                try {
651 <                    Thread.sleep(MEDIUM_DELAY_MS);
663 >            executor.execute(new CheckedRunnable() {
664 >                public void realRun() throws InterruptedException {
665 >                    threadsStarted.await();
666                      q.put(new PDelay(1));
667 <                }
654 <                catch (InterruptedException e) {
655 <                    fail("should not be interrupted");
656 <                }
657 <            }
658 <        });
659 <        
660 <        executor.shutdown();
661 <
662 <    }
663 <
664 <    static class NanoDelay implements Delayed {
665 <        long trigger;
666 <        NanoDelay(long i) {
667 <            trigger = System.nanoTime() + i;
668 <        }
669 <        public int compareTo(Object y) {
670 <            long i = trigger;
671 <            long j = ((NanoDelay)y).trigger;
672 <            if (i < j) return -1;
673 <            if (i > j) return 1;
674 <            return 0;
667 >                }});
668          }
669 +    }
670  
671 <        public int compareTo(NanoDelay y) {
672 <            long i = trigger;
673 <            long j = ((NanoDelay)y).trigger;
674 <            if (i < j) return -1;
675 <            if (i > j) return 1;
676 <            return 0;
671 >    /**
672 >     * Delayed actions do not occur until their delay elapses
673 >     */
674 >    public void testDelay() throws InterruptedException {
675 >        DelayQueue<NanoDelay> q = new DelayQueue<>();
676 >        for (int i = 0; i < SIZE; ++i)
677 >            q.add(new NanoDelay(1000000L * (SIZE - i)));
678 >
679 >        long last = 0;
680 >        for (int i = 0; i < SIZE; ++i) {
681 >            NanoDelay e = q.take();
682 >            long tt = e.getTriggerTime();
683 >            assertTrue(System.nanoTime() - tt >= 0);
684 >            if (i != 0)
685 >                assertTrue(tt >= last);
686 >            last = tt;
687          }
688 +        assertTrue(q.isEmpty());
689 +    }
690  
691 <        public boolean equals(Object other) {
692 <            return ((NanoDelay)other).trigger == trigger;
693 <        }
694 <        public boolean equals(NanoDelay other) {
695 <            return ((NanoDelay)other).trigger == trigger;
696 <        }
691 >    /**
692 >     * peek of a non-empty queue returns non-null even if not expired
693 >     */
694 >    public void testPeekDelayed() {
695 >        DelayQueue<NanoDelay> q = new DelayQueue<>();
696 >        q.add(new NanoDelay(Long.MAX_VALUE));
697 >        assertNotNull(q.peek());
698 >    }
699  
700 <        public long getDelay(TimeUnit unit) {
701 <            long n = trigger - System.nanoTime();
702 <            return unit.convert(n, TimeUnit.NANOSECONDS);
703 <        }
700 >    /**
701 >     * poll of a non-empty queue returns null if no expired elements.
702 >     */
703 >    public void testPollDelayed() {
704 >        DelayQueue<NanoDelay> q = new DelayQueue<>();
705 >        q.add(new NanoDelay(Long.MAX_VALUE));
706 >        assertNull(q.poll());
707 >    }
708  
709 <        public long getTriggerTime() {
710 <            return trigger;
711 <        }
709 >    /**
710 >     * timed poll of a non-empty queue returns null if no expired elements.
711 >     */
712 >    public void testTimedPollDelayed() throws InterruptedException {
713 >        DelayQueue<NanoDelay> q = new DelayQueue<>();
714 >        q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
715 >        long startTime = System.nanoTime();
716 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
717 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
718 >    }
719  
720 <        public String toString() {
721 <            return String.valueOf(trigger);
722 <        }
720 >    /**
721 >     * drainTo(c) empties queue into another collection c
722 >     */
723 >    public void testDrainTo() {
724 >        DelayQueue<PDelay> q = new DelayQueue<>();
725 >        PDelay[] elems = new PDelay[SIZE];
726 >        for (int i = 0; i < SIZE; ++i) {
727 >            elems[i] = new PDelay(i);
728 >            q.add(elems[i]);
729 >        }
730 >        ArrayList<PDelay> l = new ArrayList<>();
731 >        q.drainTo(l);
732 >        mustEqual(0, q.size());
733 >        for (int i = 0; i < SIZE; ++i)
734 >            mustEqual(elems[i], l.get(i));
735 >        q.add(elems[0]);
736 >        q.add(elems[1]);
737 >        assertFalse(q.isEmpty());
738 >        assertTrue(q.contains(elems[0]));
739 >        assertTrue(q.contains(elems[1]));
740 >        l.clear();
741 >        q.drainTo(l);
742 >        mustEqual(0, q.size());
743 >        mustEqual(2, l.size());
744 >        for (int i = 0; i < 2; ++i)
745 >            mustEqual(elems[i], l.get(i));
746      }
747  
748 <    public void testDelay() {
749 <        DelayQueue q = new DelayQueue();
750 <        NanoDelay[] elements = new NanoDelay[N];
751 <        for (int i = 0; i < N; ++i) {
752 <            elements[i] = new NanoDelay(1000000000L + 1000000L * (N - i));
753 <        }
754 <        for (int i = 0; i < N; ++i) {
755 <            q.add(elements[i]);
756 <        }
748 >    /**
749 >     * drainTo empties queue
750 >     */
751 >    public void testDrainToWithActivePut() throws InterruptedException {
752 >        final DelayQueue<PDelay> q = populatedQueue(SIZE);
753 >        Thread t = new Thread(new CheckedRunnable() {
754 >            public void realRun() {
755 >                q.put(new PDelay(SIZE + 1));
756 >            }});
757  
758 <        try {
759 <            long last = 0;
760 <            for (int i = 0; i < N; ++i) {
761 <                NanoDelay e = (NanoDelay)(q.take());
762 <                long tt = e.getTriggerTime();
763 <                assertTrue(tt <= System.nanoTime());
764 <                if (i != 0)
765 <                    assertTrue(tt >= last);
766 <                last = tt;
767 <            }
768 <        }
769 <        catch(InterruptedException ie) {
770 <            fail("Unexpected Exception");
758 >        t.start();
759 >        ArrayList<PDelay> l = new ArrayList<>();
760 >        q.drainTo(l);
761 >        assertTrue(l.size() >= SIZE);
762 >        t.join();
763 >        assertTrue(q.size() + l.size() >= SIZE);
764 >    }
765 >
766 >    /**
767 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
768 >     */
769 >    public void testDrainToN() {
770 >        for (int i = 0; i < SIZE + 2; ++i) {
771 >            DelayQueue<PDelay> q = populatedQueue(SIZE);
772 >            ArrayList<PDelay> l = new ArrayList<>();
773 >            q.drainTo(l, i);
774 >            int k = (i < SIZE) ? i : SIZE;
775 >            mustEqual(SIZE - k, q.size());
776 >            mustEqual(k, l.size());
777          }
778      }
779  
780 +    /**
781 +     * remove(null), contains(null) always return false
782 +     */
783 +    public void testNeverContainsNull() {
784 +        Collection<?> q = populatedQueue(SIZE);
785 +        assertFalse(q.contains(null));
786 +        assertFalse(q.remove(null));
787 +    }
788   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines