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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.18 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.72 by jsr166, Sun May 14 00:56:43 2017 UTC

# Line 1 | Line 1
1   /*
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/licenses/publicdomain
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 < import java.io.*;
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.Queue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedBlockingQueue;
22 >
23 > import junit.framework.Test;
24  
25   public class LinkedBlockingQueueTest extends JSR166TestCase {
26  
27 +    public static class Unbounded extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedBlockingQueue();
30 +        }
31 +    }
32 +
33 +    public static class Bounded extends BlockingQueueTest {
34 +        protected BlockingQueue emptyCollection() {
35 +            return new LinkedBlockingQueue(SIZE);
36 +        }
37 +    }
38 +
39      public static void main(String[] args) {
40 <        junit.textui.TestRunner.run (suite());
40 >        main(suite(), args);
41      }
42  
43      public static Test suite() {
44 <        return new TestSuite(LinkedBlockingQueueTest.class);
44 >        class Implementation implements CollectionImplementation {
45 >            public Class<?> klazz() { return LinkedBlockingQueue.class; }
46 >            public Collection emptyCollection() { return new LinkedBlockingQueue(); }
47 >            public Object makeElement(int i) { return i; }
48 >            public boolean isConcurrent() { return true; }
49 >            public boolean permitsNulls() { return false; }
50 >        }
51 >        return newTestSuite(LinkedBlockingQueueTest.class,
52 >                            new Unbounded().testSuite(),
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
25
57      /**
58 <     * Create a queue of given size containing consecutive
59 <     * Integers 0 ... n.
60 <     */
61 <    private LinkedBlockingQueue populatedQueue(int n) {
62 <        LinkedBlockingQueue q = new LinkedBlockingQueue(n);
58 >     * Returns a new queue of given size containing consecutive
59 >     * Integers 0 ... n - 1.
60 >     */
61 >    private static LinkedBlockingQueue<Integer> populatedQueue(int n) {
62 >        LinkedBlockingQueue<Integer> q =
63 >            new LinkedBlockingQueue<Integer>(n);
64          assertTrue(q.isEmpty());
65          for (int i = 0; i < n; i++)
66              assertTrue(q.offer(new Integer(i)));
67          assertFalse(q.isEmpty());
68          assertEquals(0, q.remainingCapacity());
69          assertEquals(n, q.size());
70 +        assertEquals((Integer) 0, q.peek());
71          return q;
72      }
73  
# Line 48 | Line 81 | public class LinkedBlockingQueueTest ext
81      }
82  
83      /**
84 <     * Constructor throws IAE if capacity argument nonpositive
84 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
85       */
86      public void testConstructor2() {
87          try {
88 <            LinkedBlockingQueue q = new LinkedBlockingQueue(0);
88 >            new LinkedBlockingQueue(0);
89              shouldThrow();
90          } catch (IllegalArgumentException success) {}
91      }
92  
93      /**
94 <     * Initializing from null Collection throws NPE
94 >     * Initializing from null Collection throws NullPointerException
95       */
96      public void testConstructor3() {
97          try {
98 <            LinkedBlockingQueue q = new LinkedBlockingQueue(null);
98 >            new LinkedBlockingQueue(null);
99              shouldThrow();
100          } catch (NullPointerException success) {}
101      }
102  
103      /**
104 <     * Initializing from Collection of null elements throws NPE
104 >     * Initializing from Collection of null elements throws NullPointerException
105       */
106      public void testConstructor4() {
107 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
108          try {
109 <            Integer[] ints = new Integer[SIZE];
76 <            LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
109 >            new LinkedBlockingQueue(elements);
110              shouldThrow();
111          } catch (NullPointerException success) {}
112      }
113  
114      /**
115 <     * Initializing from Collection with some null elements throws NPE
115 >     * Initializing from Collection with some null elements throws
116 >     * NullPointerException
117       */
118      public void testConstructor5() {
119 +        Integer[] ints = new Integer[SIZE];
120 +        for (int i = 0; i < SIZE - 1; ++i)
121 +            ints[i] = new Integer(i);
122 +        Collection<Integer> elements = Arrays.asList(ints);
123          try {
124 <            Integer[] ints = new Integer[SIZE];
87 <            for (int i = 0; i < SIZE-1; ++i)
88 <                ints[i] = new Integer(i);
89 <            LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
124 >            new LinkedBlockingQueue(elements);
125              shouldThrow();
126          } catch (NullPointerException success) {}
127      }
# Line 122 | Line 157 | public class LinkedBlockingQueueTest ext
157       * remainingCapacity decreases on add, increases on remove
158       */
159      public void testRemainingCapacity() {
160 <        LinkedBlockingQueue q = populatedQueue(SIZE);
160 >        BlockingQueue q = populatedQueue(SIZE);
161          for (int i = 0; i < SIZE; ++i) {
162              assertEquals(i, q.remainingCapacity());
163 <            assertEquals(SIZE-i, q.size());
164 <            q.remove();
163 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
164 >            assertEquals(i, q.remove());
165          }
166          for (int i = 0; i < SIZE; ++i) {
167 <            assertEquals(SIZE-i, q.remainingCapacity());
168 <            assertEquals(i, q.size());
169 <            q.add(new Integer(i));
167 >            assertEquals(SIZE - i, q.remainingCapacity());
168 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
169 >            assertTrue(q.add(i));
170          }
171      }
172  
173      /**
139     * offer(null) throws NPE
140     */
141    public void testOfferNull() {
142        try {
143            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
144            q.offer(null);
145            shouldThrow();
146        } catch (NullPointerException success) {}
147    }
148
149    /**
150     * add(null) throws NPE
151     */
152    public void testAddNull() {
153        try {
154            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
155            q.add(null);
156            shouldThrow();
157        } catch (NullPointerException success) {}
158    }
159
160    /**
174       * Offer succeeds if not full; fails if full
175       */
176      public void testOffer() {
# Line 167 | Line 180 | public class LinkedBlockingQueueTest ext
180      }
181  
182      /**
183 <     * add succeeds if not full; throws ISE if full
183 >     * add succeeds if not full; throws IllegalStateException if full
184       */
185      public void testAdd() {
186 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
187 +        for (int i = 0; i < SIZE; ++i)
188 +            assertTrue(q.add(new Integer(i)));
189 +        assertEquals(0, q.remainingCapacity());
190          try {
174            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
175            for (int i = 0; i < SIZE; ++i) {
176                assertTrue(q.add(new Integer(i)));
177            }
178            assertEquals(0, q.remainingCapacity());
191              q.add(new Integer(SIZE));
192              shouldThrow();
193          } catch (IllegalStateException success) {}
194      }
195  
196      /**
197 <     * addAll(null) throws NPE
186 <     */
187 <    public void testAddAll1() {
188 <        try {
189 <            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
190 <            q.addAll(null);
191 <            shouldThrow();
192 <        } catch (NullPointerException success) {}
193 <    }
194 <
195 <    /**
196 <     * addAll(this) throws IAE
197 >     * addAll(this) throws IllegalArgumentException
198       */
199      public void testAddAllSelf() {
200 +        LinkedBlockingQueue q = populatedQueue(SIZE);
201          try {
200            LinkedBlockingQueue q = populatedQueue(SIZE);
202              q.addAll(q);
203              shouldThrow();
204          } catch (IllegalArgumentException success) {}
205      }
206  
207      /**
207     * addAll of a collection with null elements throws NPE
208     */
209    public void testAddAll2() {
210        try {
211            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
212            Integer[] ints = new Integer[SIZE];
213            q.addAll(Arrays.asList(ints));
214            shouldThrow();
215        } catch (NullPointerException success) {}
216    }
217    /**
208       * addAll of a collection with any null elements throws NPE after
209       * possibly adding some elements
210       */
211      public void testAddAll3() {
212 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
213 +        Integer[] ints = new Integer[SIZE];
214 +        for (int i = 0; i < SIZE - 1; ++i)
215 +            ints[i] = new Integer(i);
216 +        Collection<Integer> elements = Arrays.asList(ints);
217          try {
218 <            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
224 <            Integer[] ints = new Integer[SIZE];
225 <            for (int i = 0; i < SIZE-1; ++i)
226 <                ints[i] = new Integer(i);
227 <            q.addAll(Arrays.asList(ints));
218 >            q.addAll(elements);
219              shouldThrow();
220          } catch (NullPointerException success) {}
221      }
222 +
223      /**
224 <     * addAll throws ISE if not enough room
224 >     * addAll throws IllegalStateException if not enough room
225       */
226      public void testAddAll4() {
227 +        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE - 1);
228 +        Integer[] ints = new Integer[SIZE];
229 +        for (int i = 0; i < SIZE; ++i)
230 +            ints[i] = new Integer(i);
231 +        Collection<Integer> elements = Arrays.asList(ints);
232          try {
233 <            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
237 <            Integer[] ints = new Integer[SIZE];
238 <            for (int i = 0; i < SIZE; ++i)
239 <                ints[i] = new Integer(i);
240 <            q.addAll(Arrays.asList(ints));
233 >            q.addAll(elements);
234              shouldThrow();
235          } catch (IllegalStateException success) {}
236      }
237 +
238      /**
239       * Queue contains all elements, in traversal order, of successful addAll
240       */
# Line 257 | Line 251 | public class LinkedBlockingQueueTest ext
251      }
252  
253      /**
260     * put(null) throws NPE
261     */
262     public void testPutNull() throws InterruptedException {
263        try {
264            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
265            q.put(null);
266            shouldThrow();
267        } catch (NullPointerException success) {}
268     }
269
270    /**
254       * all elements successfully put are contained
255       */
256      public void testPut() throws InterruptedException {
257          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            Integer I = new Integer(i);
260 <            q.put(I);
261 <            assertTrue(q.contains(I));
259 >            Integer x = new Integer(i);
260 >            q.put(x);
261 >            assertTrue(q.contains(x));
262          }
263          assertEquals(0, q.remainingCapacity());
264      }
# Line 284 | Line 267 | public class LinkedBlockingQueueTest ext
267       * put blocks interruptibly if full
268       */
269      public void testBlockingPut() throws InterruptedException {
270 <        Thread t = new Thread(new CheckedRunnable() {
271 <            public void realRun() {
272 <                int added = 0;
270 >        final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
271 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
272 >        Thread t = newStartedThread(new CheckedRunnable() {
273 >            public void realRun() throws InterruptedException {
274 >                for (int i = 0; i < SIZE; ++i)
275 >                    q.put(i);
276 >                assertEquals(SIZE, q.size());
277 >                assertEquals(0, q.remainingCapacity());
278 >
279 >                Thread.currentThread().interrupt();
280                  try {
281 <                    LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
282 <                    for (int i = 0; i < SIZE; ++i) {
283 <                        q.put(new Integer(i));
284 <                        ++added;
285 <                    }
286 <                    q.put(new Integer(SIZE));
287 <                    threadShouldThrow();
288 <                } catch (InterruptedException success) {
289 <                    threadAssertEquals(added, SIZE);
290 <                }
281 >                    q.put(99);
282 >                    shouldThrow();
283 >                } catch (InterruptedException success) {}
284 >                assertFalse(Thread.interrupted());
285 >
286 >                pleaseInterrupt.countDown();
287 >                try {
288 >                    q.put(99);
289 >                    shouldThrow();
290 >                } catch (InterruptedException success) {}
291 >                assertFalse(Thread.interrupted());
292              }});
293  
294 <        t.start();
295 <        Thread.sleep(SHORT_DELAY_MS);
294 >        await(pleaseInterrupt);
295 >        assertThreadBlocks(t, Thread.State.WAITING);
296          t.interrupt();
297 <        t.join();
297 >        awaitTermination(t);
298 >        assertEquals(SIZE, q.size());
299 >        assertEquals(0, q.remainingCapacity());
300      }
301  
302      /**
303 <     * put blocks waiting for take when full
303 >     * put blocks interruptibly waiting for take when full
304       */
305      public void testPutWithTake() throws InterruptedException {
306 +        final int capacity = 2;
307          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
308 <        Thread t = new Thread(new CheckedRunnable() {
309 <            public void realRun() {
310 <                int added = 0;
308 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
309 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
310 >        Thread t = newStartedThread(new CheckedRunnable() {
311 >            public void realRun() throws InterruptedException {
312 >                for (int i = 0; i < capacity; i++)
313 >                    q.put(i);
314 >                pleaseTake.countDown();
315 >                q.put(86);
316 >
317 >                pleaseInterrupt.countDown();
318                  try {
319 <                    q.put(new Object());
320 <                    ++added;
321 <                    q.put(new Object());
322 <                    ++added;
322 <                    q.put(new Object());
323 <                    ++added;
324 <                    q.put(new Object());
325 <                    ++added;
326 <                    threadShouldThrow();
327 <                } catch (InterruptedException success) {
328 <                    threadAssertTrue(added >= 2);
329 <                }
319 >                    q.put(99);
320 >                    shouldThrow();
321 >                } catch (InterruptedException success) {}
322 >                assertFalse(Thread.interrupted());
323              }});
324  
325 <        t.start();
326 <        Thread.sleep(SHORT_DELAY_MS);
327 <        q.take();
325 >        await(pleaseTake);
326 >        assertEquals(0, q.remainingCapacity());
327 >        assertEquals(0, q.take());
328 >
329 >        await(pleaseInterrupt);
330 >        assertThreadBlocks(t, Thread.State.WAITING);
331          t.interrupt();
332 <        t.join();
332 >        awaitTermination(t);
333 >        assertEquals(0, q.remainingCapacity());
334      }
335  
336      /**
337       * timed offer times out if full and elements not taken
338       */
339 <    public void testTimedOffer() throws InterruptedException {
339 >    public void testTimedOffer() {
340          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
341 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
341 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
342 >        Thread t = newStartedThread(new CheckedRunnable() {
343              public void realRun() throws InterruptedException {
344                  q.put(new Object());
345                  q.put(new Object());
346 <                threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
347 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
348 <            }};
346 >                long startTime = System.nanoTime();
347 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
348 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
349 >                pleaseInterrupt.countDown();
350 >                try {
351 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
352 >                    shouldThrow();
353 >                } catch (InterruptedException success) {}
354 >                assertFalse(Thread.interrupted());
355 >            }});
356  
357 <        t.start();
358 <        Thread.sleep(SMALL_DELAY_MS);
357 >        await(pleaseInterrupt);
358 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
359          t.interrupt();
360 <        t.join();
360 >        awaitTermination(t);
361      }
362  
363      /**
# Line 361 | Line 366 | public class LinkedBlockingQueueTest ext
366      public void testTake() throws InterruptedException {
367          LinkedBlockingQueue q = populatedQueue(SIZE);
368          for (int i = 0; i < SIZE; ++i) {
369 <            assertEquals(i, ((Integer)q.take()).intValue());
369 >            assertEquals(i, q.take());
370          }
371      }
372  
373      /**
369     * take blocks interruptibly when empty
370     */
371    public void testTakeFromEmpty() throws InterruptedException {
372        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
373        Thread t = new ThreadShouldThrow(InterruptedException.class) {
374            public void realRun() throws InterruptedException {
375                q.take();
376            }};
377
378        t.start();
379        Thread.sleep(SHORT_DELAY_MS);
380        t.interrupt();
381        t.join();
382    }
383
384    /**
374       * Take removes existing elements until empty, then blocks interruptibly
375       */
376      public void testBlockingTake() throws InterruptedException {
377 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
377 >        final BlockingQueue q = populatedQueue(SIZE);
378 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
379 >        Thread t = newStartedThread(new CheckedRunnable() {
380              public void realRun() throws InterruptedException {
381 <                LinkedBlockingQueue q = populatedQueue(SIZE);
391 <                for (int i = 0; i < SIZE; ++i) {
392 <                    assertEquals(i, ((Integer)q.take()).intValue());
393 <                }
394 <                q.take();
395 <            }};
381 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
382  
383 <        t.start();
384 <        Thread.sleep(SHORT_DELAY_MS);
383 >                Thread.currentThread().interrupt();
384 >                try {
385 >                    q.take();
386 >                    shouldThrow();
387 >                } catch (InterruptedException success) {}
388 >                assertFalse(Thread.interrupted());
389 >
390 >                pleaseInterrupt.countDown();
391 >                try {
392 >                    q.take();
393 >                    shouldThrow();
394 >                } catch (InterruptedException success) {}
395 >                assertFalse(Thread.interrupted());
396 >            }});
397 >
398 >        await(pleaseInterrupt);
399 >        assertThreadBlocks(t, Thread.State.WAITING);
400          t.interrupt();
401 <        t.join();
401 >        awaitTermination(t);
402      }
403  
403
404      /**
405       * poll succeeds unless empty
406       */
407      public void testPoll() {
408          LinkedBlockingQueue q = populatedQueue(SIZE);
409          for (int i = 0; i < SIZE; ++i) {
410 <            assertEquals(i, ((Integer)q.poll()).intValue());
410 >            assertEquals(i, q.poll());
411          }
412          assertNull(q.poll());
413      }
414  
415      /**
416 <     * timed pool with zero timeout succeeds when non-empty, else times out
416 >     * timed poll with zero timeout succeeds when non-empty, else times out
417       */
418      public void testTimedPoll0() throws InterruptedException {
419          LinkedBlockingQueue q = populatedQueue(SIZE);
420          for (int i = 0; i < SIZE; ++i) {
421 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
421 >            assertEquals(i, q.poll(0, MILLISECONDS));
422          }
423          assertNull(q.poll(0, MILLISECONDS));
424      }
425  
426      /**
427 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
427 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
428       */
429      public void testTimedPoll() throws InterruptedException {
430 <        LinkedBlockingQueue q = populatedQueue(SIZE);
430 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
431          for (int i = 0; i < SIZE; ++i) {
432 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
433 <        }
434 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
432 >            long startTime = System.nanoTime();
433 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
434 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
435 >        }
436 >        long startTime = System.nanoTime();
437 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
438 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
439 >        checkEmpty(q);
440      }
441  
442      /**
# Line 439 | Line 444 | public class LinkedBlockingQueueTest ext
444       * returning timeout status
445       */
446      public void testInterruptedTimedPoll() throws InterruptedException {
447 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
447 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
448 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
449 >        Thread t = newStartedThread(new CheckedRunnable() {
450              public void realRun() throws InterruptedException {
451 <                LinkedBlockingQueue q = populatedQueue(SIZE);
451 >                long startTime = System.nanoTime();
452                  for (int i = 0; i < SIZE; ++i) {
453 <                    threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
453 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
454                  }
448                q.poll(SMALL_DELAY_MS, MILLISECONDS);
449            }};
455  
456 <        t.start();
457 <        Thread.sleep(SHORT_DELAY_MS);
458 <        t.interrupt();
459 <        t.join();
460 <    }
456 >                pleaseInterrupt.countDown();
457 >                try {
458 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
459 >                    shouldThrow();
460 >                } catch (InterruptedException success) {}
461 >                assertFalse(Thread.interrupted());
462  
463 <    /**
464 <     *  timed poll before a delayed offer fails; after offer succeeds;
459 <     *  on interruption throws
460 <     */
461 <    public void testTimedPollWithOffer() throws InterruptedException {
462 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
463 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
464 <            public void realRun() throws InterruptedException {
465 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
466 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
467 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
468 <            }};
463 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
464 >            }});
465  
466 <        t.start();
467 <        Thread.sleep(SMALL_DELAY_MS);
472 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
466 >        await(pleaseInterrupt);
467 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
468          t.interrupt();
469 <        t.join();
469 >        awaitTermination(t);
470 >        checkEmpty(q);
471      }
472  
473      /**
# Line 480 | Line 476 | public class LinkedBlockingQueueTest ext
476      public void testPeek() {
477          LinkedBlockingQueue q = populatedQueue(SIZE);
478          for (int i = 0; i < SIZE; ++i) {
479 <            assertEquals(i, ((Integer)q.peek()).intValue());
480 <            q.poll();
479 >            assertEquals(i, q.peek());
480 >            assertEquals(i, q.poll());
481              assertTrue(q.peek() == null ||
482 <                       i != ((Integer)q.peek()).intValue());
482 >                       !q.peek().equals(i));
483          }
484          assertNull(q.peek());
485      }
# Line 494 | Line 490 | public class LinkedBlockingQueueTest ext
490      public void testElement() {
491          LinkedBlockingQueue q = populatedQueue(SIZE);
492          for (int i = 0; i < SIZE; ++i) {
493 <            assertEquals(i, ((Integer)q.element()).intValue());
494 <            q.poll();
493 >            assertEquals(i, q.element());
494 >            assertEquals(i, q.poll());
495          }
496          try {
497              q.element();
# Line 509 | Line 505 | public class LinkedBlockingQueueTest ext
505      public void testRemove() {
506          LinkedBlockingQueue q = populatedQueue(SIZE);
507          for (int i = 0; i < SIZE; ++i) {
508 <            assertEquals(i, ((Integer)q.remove()).intValue());
508 >            assertEquals(i, q.remove());
509          }
510          try {
511              q.remove();
# Line 518 | Line 514 | public class LinkedBlockingQueueTest ext
514      }
515  
516      /**
521     * remove(x) removes x and returns true if present
522     */
523    public void testRemoveElement() {
524        LinkedBlockingQueue q = populatedQueue(SIZE);
525        for (int i = 1; i < SIZE; i+=2) {
526            assertTrue(q.remove(new Integer(i)));
527        }
528        for (int i = 0; i < SIZE; i+=2) {
529            assertTrue(q.remove(new Integer(i)));
530            assertFalse(q.remove(new Integer(i+1)));
531        }
532        assertTrue(q.isEmpty());
533    }
534
535    /**
517       * An add following remove(x) succeeds
518       */
519      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 542 | Line 523 | public class LinkedBlockingQueueTest ext
523          assertTrue(q.remove(new Integer(1)));
524          assertTrue(q.remove(new Integer(2)));
525          assertTrue(q.add(new Integer(3)));
526 <        assertTrue(q.take() != null);
526 >        assertNotNull(q.take());
527      }
528  
529      /**
# Line 601 | Line 582 | public class LinkedBlockingQueueTest ext
582                  assertTrue(changed);
583  
584              assertTrue(q.containsAll(p));
585 <            assertEquals(SIZE-i, q.size());
585 >            assertEquals(SIZE - i, q.size());
586              p.remove();
587          }
588      }
# Line 614 | Line 595 | public class LinkedBlockingQueueTest ext
595              LinkedBlockingQueue q = populatedQueue(SIZE);
596              LinkedBlockingQueue p = populatedQueue(i);
597              assertTrue(q.removeAll(p));
598 <            assertEquals(SIZE-i, q.size());
598 >            assertEquals(SIZE - i, q.size());
599              for (int j = 0; j < i; ++j) {
600 <                Integer I = (Integer)(p.remove());
601 <                assertFalse(q.contains(I));
600 >                Integer x = (Integer)(p.remove());
601 >                assertFalse(q.contains(x));
602              }
603          }
604      }
605  
606      /**
607 <     * toArray contains all elements
607 >     * toArray contains all elements in FIFO order
608       */
609 <    public void testToArray() throws InterruptedException {
609 >    public void testToArray() {
610          LinkedBlockingQueue q = populatedQueue(SIZE);
611          Object[] o = q.toArray();
612          for (int i = 0; i < o.length; i++)
613 <            assertEquals(o[i], q.take());
613 >            assertSame(o[i], q.poll());
614      }
615  
616      /**
617 <     * toArray(a) contains all elements
617 >     * toArray(a) contains all elements in FIFO order
618       */
619      public void testToArray2() throws InterruptedException {
620 <        LinkedBlockingQueue q = populatedQueue(SIZE);
620 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
621          Integer[] ints = new Integer[SIZE];
622 <        ints = (Integer[])q.toArray(ints);
622 >        Integer[] array = q.toArray(ints);
623 >        assertSame(ints, array);
624          for (int i = 0; i < ints.length; i++)
625 <            assertEquals(ints[i], q.take());
644 <    }
645 <
646 <    /**
647 <     * toArray(null) throws NPE
648 <     */
649 <    public void testToArray_BadArg() {
650 <        try {
651 <            LinkedBlockingQueue q = populatedQueue(SIZE);
652 <            Object o[] = q.toArray(null);
653 <            shouldThrow();
654 <        } catch (NullPointerException success) {}
625 >            assertSame(ints[i], q.poll());
626      }
627  
628      /**
629 <     * toArray with incompatible array type throws CCE
629 >     * toArray(incompatible array type) throws ArrayStoreException
630       */
631      public void testToArray1_BadArg() {
632 +        LinkedBlockingQueue q = populatedQueue(SIZE);
633          try {
634 <            LinkedBlockingQueue q = populatedQueue(SIZE);
663 <            Object o[] = q.toArray(new String[10] );
634 >            q.toArray(new String[10]);
635              shouldThrow();
636          } catch (ArrayStoreException success) {}
637      }
638  
668
639      /**
640       * iterator iterates through all elements
641       */
642      public void testIterator() throws InterruptedException {
643          LinkedBlockingQueue q = populatedQueue(SIZE);
644          Iterator it = q.iterator();
645 <        while (it.hasNext()) {
645 >        int i;
646 >        for (i = 0; it.hasNext(); i++)
647 >            assertTrue(q.contains(it.next()));
648 >        assertEquals(i, SIZE);
649 >        assertIteratorExhausted(it);
650 >
651 >        it = q.iterator();
652 >        for (i = 0; it.hasNext(); i++)
653              assertEquals(it.next(), q.take());
654 <        }
654 >        assertEquals(i, SIZE);
655 >        assertIteratorExhausted(it);
656 >    }
657 >
658 >    /**
659 >     * iterator of empty collection has no elements
660 >     */
661 >    public void testEmptyIterator() {
662 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
663      }
664  
665      /**
666       * iterator.remove removes current element
667       */
668 <    public void testIteratorRemove () {
668 >    public void testIteratorRemove() {
669          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
670          q.add(two);
671          q.add(one);
# Line 691 | Line 676 | public class LinkedBlockingQueueTest ext
676          it.remove();
677  
678          it = q.iterator();
679 <        assertEquals(it.next(), one);
680 <        assertEquals(it.next(), three);
679 >        assertSame(it.next(), one);
680 >        assertSame(it.next(), three);
681          assertFalse(it.hasNext());
682      }
683  
699
684      /**
685       * iterator ordering is FIFO
686       */
# Line 708 | Line 692 | public class LinkedBlockingQueueTest ext
692          assertEquals(0, q.remainingCapacity());
693          int k = 0;
694          for (Iterator it = q.iterator(); it.hasNext();) {
695 <            int i = ((Integer)(it.next())).intValue();
712 <            assertEquals(++k, i);
695 >            assertEquals(++k, it.next());
696          }
697          assertEquals(3, k);
698      }
# Line 717 | Line 700 | public class LinkedBlockingQueueTest ext
700      /**
701       * Modifications do not cause iterators to fail
702       */
703 <    public void testWeaklyConsistentIteration () {
703 >    public void testWeaklyConsistentIteration() {
704          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
705          q.add(one);
706          q.add(two);
# Line 729 | Line 712 | public class LinkedBlockingQueueTest ext
712          assertEquals(0, q.size());
713      }
714  
732
715      /**
716       * toString contains toStrings of elements
717       */
# Line 737 | Line 719 | public class LinkedBlockingQueueTest ext
719          LinkedBlockingQueue q = populatedQueue(SIZE);
720          String s = q.toString();
721          for (int i = 0; i < SIZE; ++i) {
722 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
722 >            assertTrue(s.contains(String.valueOf(i)));
723          }
724      }
725  
744
726      /**
727       * offer transfers elements across Executor tasks
728       */
# Line 749 | Line 730 | public class LinkedBlockingQueueTest ext
730          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
731          q.add(one);
732          q.add(two);
733 <        ExecutorService executor = Executors.newFixedThreadPool(2);
734 <        executor.execute(new CheckedRunnable() {
735 <            public void realRun() throws InterruptedException {
736 <                threadAssertFalse(q.offer(three));
737 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
738 <                threadAssertEquals(0, q.remainingCapacity());
739 <            }});
740 <
741 <        executor.execute(new CheckedRunnable() {
742 <            public void realRun() throws InterruptedException {
743 <                Thread.sleep(SMALL_DELAY_MS);
744 <                threadAssertEquals(one, q.take());
745 <            }});
746 <
747 <        joinPool(executor);
733 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
734 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
735 >        try (PoolCleaner cleaner = cleaner(executor)) {
736 >            executor.execute(new CheckedRunnable() {
737 >                public void realRun() throws InterruptedException {
738 >                    assertFalse(q.offer(three));
739 >                    threadsStarted.await();
740 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
741 >                    assertEquals(0, q.remainingCapacity());
742 >                }});
743 >
744 >            executor.execute(new CheckedRunnable() {
745 >                public void realRun() throws InterruptedException {
746 >                    threadsStarted.await();
747 >                    assertSame(one, q.take());
748 >                }});
749 >        }
750      }
751  
752      /**
753 <     * poll retrieves elements across Executor threads
753 >     * timed poll retrieves elements across Executor threads
754       */
755      public void testPollInExecutor() {
756          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
757 <        ExecutorService executor = Executors.newFixedThreadPool(2);
758 <        executor.execute(new CheckedRunnable() {
759 <            public void realRun() throws InterruptedException {
760 <                threadAssertNull(q.poll());
761 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
762 <                threadAssertTrue(q.isEmpty());
763 <            }});
764 <
765 <        executor.execute(new CheckedRunnable() {
766 <            public void realRun() throws InterruptedException {
767 <                Thread.sleep(SMALL_DELAY_MS);
768 <                q.put(one);
769 <            }});
770 <
771 <        joinPool(executor);
757 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
758 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
759 >        try (PoolCleaner cleaner = cleaner(executor)) {
760 >            executor.execute(new CheckedRunnable() {
761 >                public void realRun() throws InterruptedException {
762 >                    assertNull(q.poll());
763 >                    threadsStarted.await();
764 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
765 >                    checkEmpty(q);
766 >                }});
767 >
768 >            executor.execute(new CheckedRunnable() {
769 >                public void realRun() throws InterruptedException {
770 >                    threadsStarted.await();
771 >                    q.put(one);
772 >                }});
773 >        }
774      }
775  
776      /**
777       * A deserialized serialized queue has same elements in same order
778       */
779      public void testSerialization() throws Exception {
780 <        LinkedBlockingQueue q = populatedQueue(SIZE);
781 <
797 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
798 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
799 <        out.writeObject(q);
800 <        out.close();
801 <
802 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
803 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
804 <        LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
805 <        assertEquals(q.size(), r.size());
806 <        while (!q.isEmpty())
807 <            assertEquals(q.remove(), r.remove());
808 <    }
809 <
810 <    /**
811 <     * drainTo(null) throws NPE
812 <     */
813 <    public void testDrainToNull() {
814 <        LinkedBlockingQueue q = populatedQueue(SIZE);
815 <        try {
816 <            q.drainTo(null);
817 <            shouldThrow();
818 <        } catch (NullPointerException success) {}
819 <    }
780 >        Queue x = populatedQueue(SIZE);
781 >        Queue y = serialClone(x);
782  
783 <    /**
784 <     * drainTo(this) throws IAE
785 <     */
786 <    public void testDrainToSelf() {
787 <        LinkedBlockingQueue q = populatedQueue(SIZE);
788 <        try {
789 <            q.drainTo(q);
790 <            shouldThrow();
791 <        } catch (IllegalArgumentException success) {}
783 >        assertNotSame(x, y);
784 >        assertEquals(x.size(), y.size());
785 >        assertEquals(x.toString(), y.toString());
786 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
787 >        while (!x.isEmpty()) {
788 >            assertFalse(y.isEmpty());
789 >            assertEquals(x.remove(), y.remove());
790 >        }
791 >        assertTrue(y.isEmpty());
792      }
793  
794      /**
# Line 836 | Line 798 | public class LinkedBlockingQueueTest ext
798          LinkedBlockingQueue q = populatedQueue(SIZE);
799          ArrayList l = new ArrayList();
800          q.drainTo(l);
801 <        assertEquals(q.size(), 0);
802 <        assertEquals(l.size(), SIZE);
801 >        assertEquals(0, q.size());
802 >        assertEquals(SIZE, l.size());
803          for (int i = 0; i < SIZE; ++i)
804              assertEquals(l.get(i), new Integer(i));
805          q.add(zero);
# Line 847 | Line 809 | public class LinkedBlockingQueueTest ext
809          assertTrue(q.contains(one));
810          l.clear();
811          q.drainTo(l);
812 <        assertEquals(q.size(), 0);
813 <        assertEquals(l.size(), 2);
812 >        assertEquals(0, q.size());
813 >        assertEquals(2, l.size());
814          for (int i = 0; i < 2; ++i)
815              assertEquals(l.get(i), new Integer(i));
816      }
# Line 860 | Line 822 | public class LinkedBlockingQueueTest ext
822          final LinkedBlockingQueue q = populatedQueue(SIZE);
823          Thread t = new Thread(new CheckedRunnable() {
824              public void realRun() throws InterruptedException {
825 <                q.put(new Integer(SIZE+1));
825 >                q.put(new Integer(SIZE + 1));
826              }});
827  
828          t.start();
# Line 874 | Line 836 | public class LinkedBlockingQueueTest ext
836      }
837  
838      /**
839 <     * drainTo(null, n) throws NPE
878 <     */
879 <    public void testDrainToNullN() {
880 <        LinkedBlockingQueue q = populatedQueue(SIZE);
881 <        try {
882 <            q.drainTo(null, 0);
883 <            shouldThrow();
884 <        } catch (NullPointerException success) {}
885 <    }
886 <
887 <    /**
888 <     * drainTo(this, n) throws IAE
889 <     */
890 <    public void testDrainToSelfN() {
891 <        LinkedBlockingQueue q = populatedQueue(SIZE);
892 <        try {
893 <            q.drainTo(q, 0);
894 <            shouldThrow();
895 <        } catch (IllegalArgumentException success) {}
896 <    }
897 <
898 <    /**
899 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
839 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
840       */
841      public void testDrainToN() {
842          LinkedBlockingQueue q = new LinkedBlockingQueue();
# Line 905 | Line 845 | public class LinkedBlockingQueueTest ext
845                  assertTrue(q.offer(new Integer(j)));
846              ArrayList l = new ArrayList();
847              q.drainTo(l, i);
848 <            int k = (i < SIZE)? i : SIZE;
849 <            assertEquals(l.size(), k);
850 <            assertEquals(q.size(), SIZE-k);
848 >            int k = (i < SIZE) ? i : SIZE;
849 >            assertEquals(k, l.size());
850 >            assertEquals(SIZE - k, q.size());
851              for (int j = 0; j < k; ++j)
852                  assertEquals(l.get(j), new Integer(j));
853 <            while (q.poll() != null) ;
853 >            do {} while (q.poll() != null);
854 >        }
855 >    }
856 >
857 >    /**
858 >     * remove(null), contains(null) always return false
859 >     */
860 >    public void testNeverContainsNull() {
861 >        Collection<?>[] qs = {
862 >            new LinkedBlockingQueue<Object>(),
863 >            populatedQueue(2),
864 >        };
865 >
866 >        for (Collection<?> q : qs) {
867 >            assertFalse(q.contains(null));
868 >            assertFalse(q.remove(null));
869          }
870      }
871  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines