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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines