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.22 by jsr166, Sun Nov 22 00:17:37 2009 UTC vs.
Revision 1.76 by jsr166, Fri Aug 4 03:30:21 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 285 | Line 268 | public class LinkedBlockingQueueTest ext
268       */
269      public void testBlockingPut() throws InterruptedException {
270          final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
271 <        Thread t = new Thread(new CheckedRunnable() {
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                      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() {
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 + 1; i++)
312 >                for (int i = 0; i < capacity; i++)
313                      q.put(i);
314 +                pleaseTake.countDown();
315 +                q.put(86);
316 +
317 +                Thread.currentThread().interrupt();
318 +                try {
319 +                    q.put(99);
320 +                    shouldThrow();
321 +                } catch (InterruptedException success) {}
322 +                assertFalse(Thread.interrupted());
323 +
324 +                pleaseInterrupt.countDown();
325                  try {
326                      q.put(99);
327                      shouldThrow();
328                  } catch (InterruptedException success) {}
329 +                assertFalse(Thread.interrupted());
330              }});
331  
332 <        t.start();
333 <        Thread.sleep(SHORT_DELAY_MS);
326 <        assertEquals(q.remainingCapacity(), 0);
332 >        await(pleaseTake);
333 >        assertEquals(0, q.remainingCapacity());
334          assertEquals(0, q.take());
335 <        Thread.sleep(SHORT_DELAY_MS);
335 >
336 >        await(pleaseInterrupt);
337 >        assertThreadBlocks(t, Thread.State.WAITING);
338          t.interrupt();
339 <        t.join();
340 <        assertEquals(q.remainingCapacity(), 0);
339 >        awaitTermination(t);
340 >        assertEquals(0, q.remainingCapacity());
341      }
342  
343      /**
344       * timed offer times out if full and elements not taken
345       */
346 <    public void testTimedOffer() throws InterruptedException {
346 >    public void testTimedOffer() {
347          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
348 <        Thread t = new Thread(new CheckedRunnable() {
348 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
349 >        Thread t = newStartedThread(new CheckedRunnable() {
350              public void realRun() throws InterruptedException {
351                  q.put(new Object());
352                  q.put(new Object());
353 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
353 >
354 >                long startTime = System.nanoTime();
355 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
356 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
357 >
358 >                Thread.currentThread().interrupt();
359                  try {
360 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
360 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
361                      shouldThrow();
362                  } catch (InterruptedException success) {}
363 +                assertFalse(Thread.interrupted());
364 +
365 +                pleaseInterrupt.countDown();
366 +                try {
367 +                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
368 +                    shouldThrow();
369 +                } catch (InterruptedException success) {}
370 +                assertFalse(Thread.interrupted());
371              }});
372  
373 <        t.start();
374 <        Thread.sleep(SMALL_DELAY_MS);
373 >        await(pleaseInterrupt);
374 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
375          t.interrupt();
376 <        t.join();
376 >        awaitTermination(t);
377      }
378  
379      /**
# Line 359 | Line 382 | public class LinkedBlockingQueueTest ext
382      public void testTake() throws InterruptedException {
383          LinkedBlockingQueue q = populatedQueue(SIZE);
384          for (int i = 0; i < SIZE; ++i) {
385 <            assertEquals(i, ((Integer)q.take()).intValue());
385 >            assertEquals(i, q.take());
386          }
387      }
388  
389      /**
367     * take blocks interruptibly when empty
368     */
369    public void testTakeFromEmpty() throws InterruptedException {
370        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
371        Thread t = new ThreadShouldThrow(InterruptedException.class) {
372            public void realRun() throws InterruptedException {
373                q.take();
374            }};
375
376        t.start();
377        Thread.sleep(SHORT_DELAY_MS);
378        t.interrupt();
379        t.join();
380    }
381
382    /**
390       * Take removes existing elements until empty, then blocks interruptibly
391       */
392      public void testBlockingTake() throws InterruptedException {
393 <        final LinkedBlockingQueue q = populatedQueue(SIZE);
394 <        Thread t = new Thread(new CheckedRunnable() {
393 >        final BlockingQueue q = populatedQueue(SIZE);
394 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
395 >        Thread t = newStartedThread(new CheckedRunnable() {
396              public void realRun() throws InterruptedException {
397 <                for (int i = 0; i < SIZE; ++i) {
398 <                    assertEquals(i, ((Integer)q.take()).intValue());
399 <                }
397 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
398 >
399 >                Thread.currentThread().interrupt();
400                  try {
401                      q.take();
402                      shouldThrow();
403                  } catch (InterruptedException success) {}
404 +                assertFalse(Thread.interrupted());
405 +
406 +                pleaseInterrupt.countDown();
407 +                try {
408 +                    q.take();
409 +                    shouldThrow();
410 +                } catch (InterruptedException success) {}
411 +                assertFalse(Thread.interrupted());
412              }});
413  
414 <        t.start();
415 <        Thread.sleep(SHORT_DELAY_MS);
414 >        await(pleaseInterrupt);
415 >        assertThreadBlocks(t, Thread.State.WAITING);
416          t.interrupt();
417 <        t.join();
417 >        awaitTermination(t);
418      }
419  
420      /**
# Line 407 | Line 423 | public class LinkedBlockingQueueTest ext
423      public void testPoll() {
424          LinkedBlockingQueue q = populatedQueue(SIZE);
425          for (int i = 0; i < SIZE; ++i) {
426 <            assertEquals(i, ((Integer)q.poll()).intValue());
426 >            assertEquals(i, q.poll());
427          }
428          assertNull(q.poll());
429      }
430  
431      /**
432 <     * timed pool with zero timeout succeeds when non-empty, else times out
432 >     * timed poll with zero timeout succeeds when non-empty, else times out
433       */
434      public void testTimedPoll0() throws InterruptedException {
435          LinkedBlockingQueue q = populatedQueue(SIZE);
436          for (int i = 0; i < SIZE; ++i) {
437 <            assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
437 >            assertEquals(i, q.poll(0, MILLISECONDS));
438          }
439          assertNull(q.poll(0, MILLISECONDS));
440      }
441  
442      /**
443 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
443 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
444       */
445      public void testTimedPoll() throws InterruptedException {
446 <        LinkedBlockingQueue q = populatedQueue(SIZE);
446 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
447          for (int i = 0; i < SIZE; ++i) {
448 <            assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
449 <        }
450 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
448 >            long startTime = System.nanoTime();
449 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
450 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
451 >        }
452 >        long startTime = System.nanoTime();
453 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
454 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
455 >        checkEmpty(q);
456      }
457  
458      /**
# Line 439 | Line 460 | public class LinkedBlockingQueueTest ext
460       * returning timeout status
461       */
462      public void testInterruptedTimedPoll() throws InterruptedException {
463 <        Thread t = new Thread(new CheckedRunnable() {
464 <            public void realRun() throws InterruptedException {
465 <                LinkedBlockingQueue q = populatedQueue(SIZE);
466 <                for (int i = 0; i < SIZE; ++i) {
467 <                    assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
468 <                }
463 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
464 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
465 >        Thread t = newStartedThread(new CheckedRunnable() {
466 >            public void realRun() throws InterruptedException {
467 >                long startTime = System.nanoTime();
468 >                for (int i = 0; i < SIZE; i++)
469 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
470 >
471 >                Thread.currentThread().interrupt();
472                  try {
473 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
473 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
474                      shouldThrow();
475                  } catch (InterruptedException success) {}
476 <            }});
476 >                assertFalse(Thread.interrupted());
477  
478 <        t.start();
455 <        Thread.sleep(SHORT_DELAY_MS);
456 <        t.interrupt();
457 <        t.join();
458 <    }
459 <
460 <    /**
461 <     *  timed poll before a delayed offer fails; after offer succeeds;
462 <     *  on interruption throws
463 <     */
464 <    public void testTimedPollWithOffer() throws InterruptedException {
465 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
466 <        Thread t = new Thread(new CheckedRunnable() {
467 <            public void realRun() throws InterruptedException {
468 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
469 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
478 >                pleaseInterrupt.countDown();
479                  try {
480                      q.poll(LONG_DELAY_MS, MILLISECONDS);
481                      shouldThrow();
482                  } catch (InterruptedException success) {}
483 +                assertFalse(Thread.interrupted());
484 +
485 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
486              }});
487  
488 <        t.start();
489 <        Thread.sleep(SMALL_DELAY_MS);
478 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
488 >        await(pleaseInterrupt);
489 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
490          t.interrupt();
491 <        t.join();
491 >        awaitTermination(t);
492 >        checkEmpty(q);
493      }
494  
495      /**
# Line 486 | Line 498 | public class LinkedBlockingQueueTest ext
498      public void testPeek() {
499          LinkedBlockingQueue q = populatedQueue(SIZE);
500          for (int i = 0; i < SIZE; ++i) {
501 <            assertEquals(i, ((Integer)q.peek()).intValue());
502 <            q.poll();
501 >            assertEquals(i, q.peek());
502 >            assertEquals(i, q.poll());
503              assertTrue(q.peek() == null ||
504 <                       i != ((Integer)q.peek()).intValue());
504 >                       !q.peek().equals(i));
505          }
506          assertNull(q.peek());
507      }
# Line 500 | Line 512 | public class LinkedBlockingQueueTest ext
512      public void testElement() {
513          LinkedBlockingQueue q = populatedQueue(SIZE);
514          for (int i = 0; i < SIZE; ++i) {
515 <            assertEquals(i, ((Integer)q.element()).intValue());
516 <            q.poll();
515 >            assertEquals(i, q.element());
516 >            assertEquals(i, q.poll());
517          }
518          try {
519              q.element();
# Line 515 | Line 527 | public class LinkedBlockingQueueTest ext
527      public void testRemove() {
528          LinkedBlockingQueue q = populatedQueue(SIZE);
529          for (int i = 0; i < SIZE; ++i) {
530 <            assertEquals(i, ((Integer)q.remove()).intValue());
530 >            assertEquals(i, q.remove());
531          }
532          try {
533              q.remove();
# Line 524 | Line 536 | public class LinkedBlockingQueueTest ext
536      }
537  
538      /**
527     * remove(x) removes x and returns true if present
528     */
529    public void testRemoveElement() {
530        LinkedBlockingQueue q = populatedQueue(SIZE);
531        for (int i = 1; i < SIZE; i+=2) {
532            assertTrue(q.remove(new Integer(i)));
533        }
534        for (int i = 0; i < SIZE; i+=2) {
535            assertTrue(q.remove(new Integer(i)));
536            assertFalse(q.remove(new Integer(i+1)));
537        }
538        assertTrue(q.isEmpty());
539    }
540
541    /**
539       * An add following remove(x) succeeds
540       */
541      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 548 | Line 545 | public class LinkedBlockingQueueTest ext
545          assertTrue(q.remove(new Integer(1)));
546          assertTrue(q.remove(new Integer(2)));
547          assertTrue(q.add(new Integer(3)));
548 <        assertTrue(q.take() != null);
548 >        assertNotNull(q.take());
549      }
550  
551      /**
# Line 607 | Line 604 | public class LinkedBlockingQueueTest ext
604                  assertTrue(changed);
605  
606              assertTrue(q.containsAll(p));
607 <            assertEquals(SIZE-i, q.size());
607 >            assertEquals(SIZE - i, q.size());
608              p.remove();
609          }
610      }
# Line 620 | Line 617 | public class LinkedBlockingQueueTest ext
617              LinkedBlockingQueue q = populatedQueue(SIZE);
618              LinkedBlockingQueue p = populatedQueue(i);
619              assertTrue(q.removeAll(p));
620 <            assertEquals(SIZE-i, q.size());
620 >            assertEquals(SIZE - i, q.size());
621              for (int j = 0; j < i; ++j) {
622 <                Integer I = (Integer)(p.remove());
623 <                assertFalse(q.contains(I));
622 >                Integer x = (Integer)(p.remove());
623 >                assertFalse(q.contains(x));
624              }
625          }
626      }
627  
628      /**
629 <     * toArray contains all elements
629 >     * toArray contains all elements in FIFO order
630       */
631 <    public void testToArray() throws InterruptedException {
631 >    public void testToArray() {
632          LinkedBlockingQueue q = populatedQueue(SIZE);
633          Object[] o = q.toArray();
634          for (int i = 0; i < o.length; i++)
635 <            assertEquals(o[i], q.take());
635 >            assertSame(o[i], q.poll());
636      }
637  
638      /**
639 <     * toArray(a) contains all elements
639 >     * toArray(a) contains all elements in FIFO order
640       */
641      public void testToArray2() throws InterruptedException {
642 <        LinkedBlockingQueue q = populatedQueue(SIZE);
642 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
643          Integer[] ints = new Integer[SIZE];
644 <        ints = (Integer[])q.toArray(ints);
644 >        Integer[] array = q.toArray(ints);
645 >        assertSame(ints, array);
646          for (int i = 0; i < ints.length; i++)
647 <            assertEquals(ints[i], q.take());
650 <    }
651 <
652 <    /**
653 <     * toArray(null) throws NPE
654 <     */
655 <    public void testToArray_BadArg() {
656 <        try {
657 <            LinkedBlockingQueue q = populatedQueue(SIZE);
658 <            Object o[] = q.toArray(null);
659 <            shouldThrow();
660 <        } catch (NullPointerException success) {}
647 >            assertSame(ints[i], q.poll());
648      }
649  
650      /**
651 <     * toArray with incompatible array type throws CCE
651 >     * toArray(incompatible array type) throws ArrayStoreException
652       */
653      public void testToArray1_BadArg() {
654 +        LinkedBlockingQueue q = populatedQueue(SIZE);
655          try {
656 <            LinkedBlockingQueue q = populatedQueue(SIZE);
669 <            Object o[] = q.toArray(new String[10] );
656 >            q.toArray(new String[10]);
657              shouldThrow();
658          } catch (ArrayStoreException success) {}
659      }
660  
674
661      /**
662       * iterator iterates through all elements
663       */
664      public void testIterator() throws InterruptedException {
665          LinkedBlockingQueue q = populatedQueue(SIZE);
666          Iterator it = q.iterator();
667 <        while (it.hasNext()) {
667 >        int i;
668 >        for (i = 0; it.hasNext(); i++)
669 >            assertTrue(q.contains(it.next()));
670 >        assertEquals(i, SIZE);
671 >        assertIteratorExhausted(it);
672 >
673 >        it = q.iterator();
674 >        for (i = 0; it.hasNext(); i++)
675              assertEquals(it.next(), q.take());
676 <        }
676 >        assertEquals(i, SIZE);
677 >        assertIteratorExhausted(it);
678 >    }
679 >
680 >    /**
681 >     * iterator of empty collection has no elements
682 >     */
683 >    public void testEmptyIterator() {
684 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
685      }
686  
687      /**
688       * iterator.remove removes current element
689       */
690 <    public void testIteratorRemove () {
690 >    public void testIteratorRemove() {
691          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
692          q.add(two);
693          q.add(one);
# Line 697 | Line 698 | public class LinkedBlockingQueueTest ext
698          it.remove();
699  
700          it = q.iterator();
701 <        assertEquals(it.next(), one);
702 <        assertEquals(it.next(), three);
701 >        assertSame(it.next(), one);
702 >        assertSame(it.next(), three);
703          assertFalse(it.hasNext());
704      }
705  
705
706      /**
707       * iterator ordering is FIFO
708       */
# Line 714 | Line 714 | public class LinkedBlockingQueueTest ext
714          assertEquals(0, q.remainingCapacity());
715          int k = 0;
716          for (Iterator it = q.iterator(); it.hasNext();) {
717 <            int i = ((Integer)(it.next())).intValue();
718 <            assertEquals(++k, i);
717 >            assertEquals(++k, it.next());
718          }
719          assertEquals(3, k);
720      }
# Line 723 | Line 722 | public class LinkedBlockingQueueTest ext
722      /**
723       * Modifications do not cause iterators to fail
724       */
725 <    public void testWeaklyConsistentIteration () {
725 >    public void testWeaklyConsistentIteration() {
726          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
727          q.add(one);
728          q.add(two);
# Line 735 | Line 734 | public class LinkedBlockingQueueTest ext
734          assertEquals(0, q.size());
735      }
736  
738
737      /**
738       * toString contains toStrings of elements
739       */
# Line 743 | Line 741 | public class LinkedBlockingQueueTest ext
741          LinkedBlockingQueue q = populatedQueue(SIZE);
742          String s = q.toString();
743          for (int i = 0; i < SIZE; ++i) {
744 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
744 >            assertTrue(s.contains(String.valueOf(i)));
745          }
746      }
747  
750
748      /**
749       * offer transfers elements across Executor tasks
750       */
# Line 755 | Line 752 | public class LinkedBlockingQueueTest ext
752          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
753          q.add(one);
754          q.add(two);
755 <        ExecutorService executor = Executors.newFixedThreadPool(2);
756 <        executor.execute(new CheckedRunnable() {
757 <            public void realRun() throws InterruptedException {
758 <                threadAssertFalse(q.offer(three));
759 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
760 <                threadAssertEquals(0, q.remainingCapacity());
761 <            }});
762 <
763 <        executor.execute(new CheckedRunnable() {
764 <            public void realRun() throws InterruptedException {
765 <                Thread.sleep(SMALL_DELAY_MS);
766 <                threadAssertEquals(one, q.take());
767 <            }});
768 <
769 <        joinPool(executor);
755 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
756 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
757 >        try (PoolCleaner cleaner = cleaner(executor)) {
758 >            executor.execute(new CheckedRunnable() {
759 >                public void realRun() throws InterruptedException {
760 >                    assertFalse(q.offer(three));
761 >                    threadsStarted.await();
762 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
763 >                    assertEquals(0, q.remainingCapacity());
764 >                }});
765 >
766 >            executor.execute(new CheckedRunnable() {
767 >                public void realRun() throws InterruptedException {
768 >                    threadsStarted.await();
769 >                    assertSame(one, q.take());
770 >                }});
771 >        }
772      }
773  
774      /**
775 <     * poll retrieves elements across Executor threads
775 >     * timed poll retrieves elements across Executor threads
776       */
777      public void testPollInExecutor() {
778          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
779 <        ExecutorService executor = Executors.newFixedThreadPool(2);
780 <        executor.execute(new CheckedRunnable() {
781 <            public void realRun() throws InterruptedException {
782 <                threadAssertNull(q.poll());
783 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
784 <                threadAssertTrue(q.isEmpty());
785 <            }});
786 <
787 <        executor.execute(new CheckedRunnable() {
788 <            public void realRun() throws InterruptedException {
789 <                Thread.sleep(SMALL_DELAY_MS);
790 <                q.put(one);
791 <            }});
792 <
793 <        joinPool(executor);
779 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
780 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
781 >        try (PoolCleaner cleaner = cleaner(executor)) {
782 >            executor.execute(new CheckedRunnable() {
783 >                public void realRun() throws InterruptedException {
784 >                    assertNull(q.poll());
785 >                    threadsStarted.await();
786 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
787 >                    checkEmpty(q);
788 >                }});
789 >
790 >            executor.execute(new CheckedRunnable() {
791 >                public void realRun() throws InterruptedException {
792 >                    threadsStarted.await();
793 >                    q.put(one);
794 >                }});
795 >        }
796      }
797  
798      /**
799 <     * A deserialized serialized queue has same elements in same order
799 >     * A deserialized/reserialized queue has same elements in same order
800       */
801      public void testSerialization() throws Exception {
802 <        LinkedBlockingQueue q = populatedQueue(SIZE);
803 <
803 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
804 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
805 <        out.writeObject(q);
806 <        out.close();
802 >        Queue x = populatedQueue(SIZE);
803 >        Queue y = serialClone(x);
804  
805 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
806 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
807 <        LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
808 <        assertEquals(q.size(), r.size());
809 <        while (!q.isEmpty())
810 <            assertEquals(q.remove(), r.remove());
811 <    }
812 <
813 <    /**
817 <     * drainTo(null) throws NPE
818 <     */
819 <    public void testDrainToNull() {
820 <        LinkedBlockingQueue q = populatedQueue(SIZE);
821 <        try {
822 <            q.drainTo(null);
823 <            shouldThrow();
824 <        } catch (NullPointerException success) {}
825 <    }
826 <
827 <    /**
828 <     * drainTo(this) throws IAE
829 <     */
830 <    public void testDrainToSelf() {
831 <        LinkedBlockingQueue q = populatedQueue(SIZE);
832 <        try {
833 <            q.drainTo(q);
834 <            shouldThrow();
835 <        } catch (IllegalArgumentException success) {}
805 >        assertNotSame(x, y);
806 >        assertEquals(x.size(), y.size());
807 >        assertEquals(x.toString(), y.toString());
808 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
809 >        while (!x.isEmpty()) {
810 >            assertFalse(y.isEmpty());
811 >            assertEquals(x.remove(), y.remove());
812 >        }
813 >        assertTrue(y.isEmpty());
814      }
815  
816      /**
# Line 842 | Line 820 | public class LinkedBlockingQueueTest ext
820          LinkedBlockingQueue q = populatedQueue(SIZE);
821          ArrayList l = new ArrayList();
822          q.drainTo(l);
823 <        assertEquals(q.size(), 0);
824 <        assertEquals(l.size(), SIZE);
823 >        assertEquals(0, q.size());
824 >        assertEquals(SIZE, l.size());
825          for (int i = 0; i < SIZE; ++i)
826              assertEquals(l.get(i), new Integer(i));
827          q.add(zero);
# Line 853 | Line 831 | public class LinkedBlockingQueueTest ext
831          assertTrue(q.contains(one));
832          l.clear();
833          q.drainTo(l);
834 <        assertEquals(q.size(), 0);
835 <        assertEquals(l.size(), 2);
834 >        assertEquals(0, q.size());
835 >        assertEquals(2, l.size());
836          for (int i = 0; i < 2; ++i)
837              assertEquals(l.get(i), new Integer(i));
838      }
# Line 866 | Line 844 | public class LinkedBlockingQueueTest ext
844          final LinkedBlockingQueue q = populatedQueue(SIZE);
845          Thread t = new Thread(new CheckedRunnable() {
846              public void realRun() throws InterruptedException {
847 <                q.put(new Integer(SIZE+1));
847 >                q.put(new Integer(SIZE + 1));
848              }});
849  
850          t.start();
# Line 880 | Line 858 | public class LinkedBlockingQueueTest ext
858      }
859  
860      /**
861 <     * drainTo(null, n) throws NPE
884 <     */
885 <    public void testDrainToNullN() {
886 <        LinkedBlockingQueue q = populatedQueue(SIZE);
887 <        try {
888 <            q.drainTo(null, 0);
889 <            shouldThrow();
890 <        } catch (NullPointerException success) {}
891 <    }
892 <
893 <    /**
894 <     * drainTo(this, n) throws IAE
895 <     */
896 <    public void testDrainToSelfN() {
897 <        LinkedBlockingQueue q = populatedQueue(SIZE);
898 <        try {
899 <            q.drainTo(q, 0);
900 <            shouldThrow();
901 <        } catch (IllegalArgumentException success) {}
902 <    }
903 <
904 <    /**
905 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
861 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
862       */
863      public void testDrainToN() {
864          LinkedBlockingQueue q = new LinkedBlockingQueue();
# Line 911 | Line 867 | public class LinkedBlockingQueueTest ext
867                  assertTrue(q.offer(new Integer(j)));
868              ArrayList l = new ArrayList();
869              q.drainTo(l, i);
870 <            int k = (i < SIZE)? i : SIZE;
871 <            assertEquals(l.size(), k);
872 <            assertEquals(q.size(), SIZE-k);
870 >            int k = (i < SIZE) ? i : SIZE;
871 >            assertEquals(k, l.size());
872 >            assertEquals(SIZE - k, q.size());
873              for (int j = 0; j < k; ++j)
874                  assertEquals(l.get(j), new Integer(j));
875 <            while (q.poll() != null) ;
875 >            do {} while (q.poll() != null);
876 >        }
877 >    }
878 >
879 >    /**
880 >     * remove(null), contains(null) always return false
881 >     */
882 >    public void testNeverContainsNull() {
883 >        Collection<?>[] qs = {
884 >            new LinkedBlockingQueue<Object>(),
885 >            populatedQueue(2),
886 >        };
887 >
888 >        for (Collection<?> q : qs) {
889 >            assertFalse(q.contains(null));
890 >            assertFalse(q.remove(null));
891          }
892      }
893  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines