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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines