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.27 by jsr166, Wed Aug 25 01:44:48 2010 UTC vs.
Revision 1.68 by jsr166, Sat May 13 21:52:59 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
218    /**
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);
225 <            Integer[] ints = new Integer[SIZE];
226 <            for (int i = 0; i < SIZE-1; ++i)
227 <                ints[i] = new Integer(i);
228 <            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);
239 <            Integer[] ints = new Integer[SIZE];
240 <            for (int i = 0; i < SIZE; ++i)
241 <                ints[i] = new Integer(i);
242 <            q.addAll(Arrays.asList(ints));
233 >            q.addAll(elements);
234              shouldThrow();
235          } catch (IllegalStateException success) {}
236      }
# Line 260 | Line 251 | public class LinkedBlockingQueueTest ext
251      }
252  
253      /**
263     * put(null) throws NPE
264     */
265     public void testPutNull() throws InterruptedException {
266        try {
267            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
268            q.put(null);
269            shouldThrow();
270        } catch (NullPointerException success) {}
271     }
272
273    /**
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 288 | 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 >        assertThreadStaysAlive(t);
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 +                pleaseInterrupt.countDown();
318                  try {
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);
329 <        assertEquals(q.remainingCapacity(), 0);
325 >        await(pleaseTake);
326 >        assertEquals(0, q.remainingCapacity());
327          assertEquals(0, q.take());
328 <        Thread.sleep(SHORT_DELAY_MS);
328 >
329 >        await(pleaseInterrupt);
330 >        assertThreadBlocks(t, Thread.State.WAITING);
331          t.interrupt();
332 <        t.join();
333 <        assertEquals(q.remainingCapacity(), 0);
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 Thread(new CheckedRunnable() {
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 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
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(), LONG_DELAY_MS, MILLISECONDS);
351 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
352                      shouldThrow();
353                  } catch (InterruptedException success) {}
354              }});
355  
356 <        t.start();
357 <        Thread.sleep(SMALL_DELAY_MS);
356 >        await(pleaseInterrupt);
357 >        assertThreadStaysAlive(t);
358          t.interrupt();
359 <        t.join();
359 >        awaitTermination(t);
360      }
361  
362      /**
# Line 367 | Line 370 | public class LinkedBlockingQueueTest ext
370      }
371  
372      /**
370     * take blocks interruptibly when empty
371     */
372    public void testTakeFromEmpty() throws InterruptedException {
373        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
374        Thread t = new ThreadShouldThrow(InterruptedException.class) {
375            public void realRun() throws InterruptedException {
376                q.take();
377            }};
378
379        t.start();
380        Thread.sleep(SHORT_DELAY_MS);
381        t.interrupt();
382        t.join();
383    }
384
385    /**
373       * Take removes existing elements until empty, then blocks interruptibly
374       */
375      public void testBlockingTake() throws InterruptedException {
376 <        final LinkedBlockingQueue q = populatedQueue(SIZE);
377 <        Thread t = new Thread(new CheckedRunnable() {
376 >        final BlockingQueue q = populatedQueue(SIZE);
377 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
378 >        Thread t = newStartedThread(new CheckedRunnable() {
379              public void realRun() throws InterruptedException {
380 <                for (int i = 0; i < SIZE; ++i) {
381 <                    assertEquals(i, q.take());
382 <                }
380 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
381 >
382 >                Thread.currentThread().interrupt();
383                  try {
384                      q.take();
385                      shouldThrow();
386                  } catch (InterruptedException success) {}
387 +                assertFalse(Thread.interrupted());
388 +
389 +                pleaseInterrupt.countDown();
390 +                try {
391 +                    q.take();
392 +                    shouldThrow();
393 +                } catch (InterruptedException success) {}
394 +                assertFalse(Thread.interrupted());
395              }});
396  
397 <        t.start();
398 <        Thread.sleep(SHORT_DELAY_MS);
397 >        await(pleaseInterrupt);
398 >        assertThreadBlocks(t, Thread.State.WAITING);
399          t.interrupt();
400 <        t.join();
400 >        awaitTermination(t);
401      }
402  
403      /**
# Line 416 | Line 412 | public class LinkedBlockingQueueTest ext
412      }
413  
414      /**
415 <     * timed pool with zero timeout succeeds when non-empty, else times out
415 >     * timed poll with zero timeout succeeds when non-empty, else times out
416       */
417      public void testTimedPoll0() throws InterruptedException {
418          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 427 | Line 423 | public class LinkedBlockingQueueTest ext
423      }
424  
425      /**
426 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
426 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
427       */
428      public void testTimedPoll() throws InterruptedException {
429 <        LinkedBlockingQueue q = populatedQueue(SIZE);
429 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
430          for (int i = 0; i < SIZE; ++i) {
431 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
432 <        }
433 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
431 >            long startTime = System.nanoTime();
432 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
433 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
434 >        }
435 >        long startTime = System.nanoTime();
436 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
437 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
438 >        checkEmpty(q);
439      }
440  
441      /**
# Line 442 | Line 443 | public class LinkedBlockingQueueTest ext
443       * returning timeout status
444       */
445      public void testInterruptedTimedPoll() throws InterruptedException {
446 <        Thread t = new Thread(new CheckedRunnable() {
446 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
447 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
448 >        Thread t = newStartedThread(new CheckedRunnable() {
449              public void realRun() throws InterruptedException {
450 <                LinkedBlockingQueue q = populatedQueue(SIZE);
450 >                long startTime = System.nanoTime();
451                  for (int i = 0; i < SIZE; ++i) {
452 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
452 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
453                  }
454 <                try {
452 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
453 <                    shouldThrow();
454 <                } catch (InterruptedException success) {}
455 <            }});
456 <
457 <        t.start();
458 <        Thread.sleep(SHORT_DELAY_MS);
459 <        t.interrupt();
460 <        t.join();
461 <    }
462 <
463 <    /**
464 <     *  timed poll before a delayed offer fails; after offer succeeds;
465 <     *  on interruption throws
466 <     */
467 <    public void testTimedPollWithOffer() throws InterruptedException {
468 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
469 <        Thread t = new Thread(new CheckedRunnable() {
470 <            public void realRun() throws InterruptedException {
471 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
472 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
454 >                aboutToWait.countDown();
455                  try {
456                      q.poll(LONG_DELAY_MS, MILLISECONDS);
457                      shouldThrow();
458 <                } catch (InterruptedException success) {}
458 >                } catch (InterruptedException success) {
459 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
460 >                }
461              }});
462  
463 <        t.start();
464 <        Thread.sleep(SMALL_DELAY_MS);
481 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
463 >        await(aboutToWait);
464 >        waitForThreadToEnterWaitState(t);
465          t.interrupt();
466 <        t.join();
466 >        awaitTermination(t);
467 >        checkEmpty(q);
468      }
469  
470      /**
# Line 527 | Line 511 | public class LinkedBlockingQueueTest ext
511      }
512  
513      /**
530     * remove(x) removes x and returns true if present
531     */
532    public void testRemoveElement() {
533        LinkedBlockingQueue q = populatedQueue(SIZE);
534        for (int i = 1; i < SIZE; i+=2) {
535            assertTrue(q.remove(new Integer(i)));
536        }
537        for (int i = 0; i < SIZE; i+=2) {
538            assertTrue(q.remove(new Integer(i)));
539            assertFalse(q.remove(new Integer(i+1)));
540        }
541        assertTrue(q.isEmpty());
542    }
543
544    /**
514       * An add following remove(x) succeeds
515       */
516      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 551 | Line 520 | public class LinkedBlockingQueueTest ext
520          assertTrue(q.remove(new Integer(1)));
521          assertTrue(q.remove(new Integer(2)));
522          assertTrue(q.add(new Integer(3)));
523 <        assertTrue(q.take() != null);
523 >        assertNotNull(q.take());
524      }
525  
526      /**
# Line 610 | Line 579 | public class LinkedBlockingQueueTest ext
579                  assertTrue(changed);
580  
581              assertTrue(q.containsAll(p));
582 <            assertEquals(SIZE-i, q.size());
582 >            assertEquals(SIZE - i, q.size());
583              p.remove();
584          }
585      }
# Line 623 | Line 592 | public class LinkedBlockingQueueTest ext
592              LinkedBlockingQueue q = populatedQueue(SIZE);
593              LinkedBlockingQueue p = populatedQueue(i);
594              assertTrue(q.removeAll(p));
595 <            assertEquals(SIZE-i, q.size());
595 >            assertEquals(SIZE - i, q.size());
596              for (int j = 0; j < i; ++j) {
597 <                Integer I = (Integer)(p.remove());
598 <                assertFalse(q.contains(I));
597 >                Integer x = (Integer)(p.remove());
598 >                assertFalse(q.contains(x));
599              }
600          }
601      }
602  
603      /**
604 <     * toArray contains all elements
604 >     * toArray contains all elements in FIFO order
605       */
606 <    public void testToArray() throws InterruptedException {
606 >    public void testToArray() {
607          LinkedBlockingQueue q = populatedQueue(SIZE);
608          Object[] o = q.toArray();
609          for (int i = 0; i < o.length; i++)
610 <            assertEquals(o[i], q.take());
610 >            assertSame(o[i], q.poll());
611      }
612  
613      /**
614 <     * toArray(a) contains all elements
614 >     * toArray(a) contains all elements in FIFO order
615       */
616      public void testToArray2() throws InterruptedException {
617 <        LinkedBlockingQueue q = populatedQueue(SIZE);
617 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
618          Integer[] ints = new Integer[SIZE];
619 <        ints = (Integer[])q.toArray(ints);
619 >        Integer[] array = q.toArray(ints);
620 >        assertSame(ints, array);
621          for (int i = 0; i < ints.length; i++)
622 <            assertEquals(ints[i], q.take());
622 >            assertSame(ints[i], q.poll());
623      }
624  
625      /**
626 <     * toArray(null) throws NPE
657 <     */
658 <    public void testToArray_BadArg() {
659 <        LinkedBlockingQueue q = populatedQueue(SIZE);
660 <        try {
661 <            Object o[] = q.toArray(null);
662 <            shouldThrow();
663 <        } catch (NullPointerException success) {}
664 <    }
665 <
666 <    /**
667 <     * toArray with incompatible array type throws CCE
626 >     * toArray(incompatible array type) throws ArrayStoreException
627       */
628      public void testToArray1_BadArg() {
629          LinkedBlockingQueue q = populatedQueue(SIZE);
630          try {
631 <            Object o[] = q.toArray(new String[10]);
631 >            q.toArray(new String[10]);
632              shouldThrow();
633          } catch (ArrayStoreException success) {}
634      }
635  
677
636      /**
637       * iterator iterates through all elements
638       */
639      public void testIterator() throws InterruptedException {
640          LinkedBlockingQueue q = populatedQueue(SIZE);
641          Iterator it = q.iterator();
642 <        while (it.hasNext()) {
642 >        int i;
643 >        for (i = 0; it.hasNext(); i++)
644 >            assertTrue(q.contains(it.next()));
645 >        assertEquals(i, SIZE);
646 >        assertIteratorExhausted(it);
647 >
648 >        it = q.iterator();
649 >        for (i = 0; it.hasNext(); i++)
650              assertEquals(it.next(), q.take());
651 <        }
651 >        assertEquals(i, SIZE);
652 >        assertIteratorExhausted(it);
653 >    }
654 >
655 >    /**
656 >     * iterator of empty collection has no elements
657 >     */
658 >    public void testEmptyIterator() {
659 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
660      }
661  
662      /**
# Line 705 | Line 678 | public class LinkedBlockingQueueTest ext
678          assertFalse(it.hasNext());
679      }
680  
708
681      /**
682       * iterator ordering is FIFO
683       */
# Line 737 | Line 709 | public class LinkedBlockingQueueTest ext
709          assertEquals(0, q.size());
710      }
711  
740
712      /**
713       * toString contains toStrings of elements
714       */
# Line 745 | Line 716 | public class LinkedBlockingQueueTest ext
716          LinkedBlockingQueue q = populatedQueue(SIZE);
717          String s = q.toString();
718          for (int i = 0; i < SIZE; ++i) {
719 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
719 >            assertTrue(s.contains(String.valueOf(i)));
720          }
721      }
722  
752
723      /**
724       * offer transfers elements across Executor tasks
725       */
# Line 757 | Line 727 | public class LinkedBlockingQueueTest ext
727          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
728          q.add(one);
729          q.add(two);
730 <        ExecutorService executor = Executors.newFixedThreadPool(2);
731 <        executor.execute(new CheckedRunnable() {
732 <            public void realRun() throws InterruptedException {
733 <                assertFalse(q.offer(three));
734 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
735 <                assertEquals(0, q.remainingCapacity());
736 <            }});
737 <
738 <        executor.execute(new CheckedRunnable() {
739 <            public void realRun() throws InterruptedException {
740 <                Thread.sleep(SMALL_DELAY_MS);
741 <                assertSame(one, q.take());
742 <            }});
743 <
744 <        joinPool(executor);
730 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
731 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
732 >        try (PoolCleaner cleaner = cleaner(executor)) {
733 >            executor.execute(new CheckedRunnable() {
734 >                public void realRun() throws InterruptedException {
735 >                    assertFalse(q.offer(three));
736 >                    threadsStarted.await();
737 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
738 >                    assertEquals(0, q.remainingCapacity());
739 >                }});
740 >
741 >            executor.execute(new CheckedRunnable() {
742 >                public void realRun() throws InterruptedException {
743 >                    threadsStarted.await();
744 >                    assertSame(one, q.take());
745 >                }});
746 >        }
747      }
748  
749      /**
750 <     * poll retrieves elements across Executor threads
750 >     * timed poll retrieves elements across Executor threads
751       */
752      public void testPollInExecutor() {
753          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
754 <        ExecutorService executor = Executors.newFixedThreadPool(2);
755 <        executor.execute(new CheckedRunnable() {
756 <            public void realRun() throws InterruptedException {
757 <                assertNull(q.poll());
758 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
759 <                assertTrue(q.isEmpty());
760 <            }});
761 <
762 <        executor.execute(new CheckedRunnable() {
763 <            public void realRun() throws InterruptedException {
764 <                Thread.sleep(SMALL_DELAY_MS);
765 <                q.put(one);
766 <            }});
767 <
768 <        joinPool(executor);
754 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
755 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
756 >        try (PoolCleaner cleaner = cleaner(executor)) {
757 >            executor.execute(new CheckedRunnable() {
758 >                public void realRun() throws InterruptedException {
759 >                    assertNull(q.poll());
760 >                    threadsStarted.await();
761 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
762 >                    checkEmpty(q);
763 >                }});
764 >
765 >            executor.execute(new CheckedRunnable() {
766 >                public void realRun() throws InterruptedException {
767 >                    threadsStarted.await();
768 >                    q.put(one);
769 >                }});
770 >        }
771      }
772  
773      /**
774       * A deserialized serialized queue has same elements in same order
775       */
776      public void testSerialization() throws Exception {
777 <        LinkedBlockingQueue q = populatedQueue(SIZE);
778 <
805 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
806 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
807 <        out.writeObject(q);
808 <        out.close();
809 <
810 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
811 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
812 <        LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
813 <        assertEquals(q.size(), r.size());
814 <        while (!q.isEmpty())
815 <            assertEquals(q.remove(), r.remove());
816 <    }
777 >        Queue x = populatedQueue(SIZE);
778 >        Queue y = serialClone(x);
779  
780 <    /**
781 <     * drainTo(null) throws NPE
782 <     */
783 <    public void testDrainToNull() {
784 <        LinkedBlockingQueue q = populatedQueue(SIZE);
785 <        try {
786 <            q.drainTo(null);
787 <            shouldThrow();
788 <        } catch (NullPointerException success) {}
827 <    }
828 <
829 <    /**
830 <     * drainTo(this) throws IAE
831 <     */
832 <    public void testDrainToSelf() {
833 <        LinkedBlockingQueue q = populatedQueue(SIZE);
834 <        try {
835 <            q.drainTo(q);
836 <            shouldThrow();
837 <        } catch (IllegalArgumentException success) {}
780 >        assertNotSame(x, y);
781 >        assertEquals(x.size(), y.size());
782 >        assertEquals(x.toString(), y.toString());
783 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
784 >        while (!x.isEmpty()) {
785 >            assertFalse(y.isEmpty());
786 >            assertEquals(x.remove(), y.remove());
787 >        }
788 >        assertTrue(y.isEmpty());
789      }
790  
791      /**
# Line 844 | Line 795 | public class LinkedBlockingQueueTest ext
795          LinkedBlockingQueue q = populatedQueue(SIZE);
796          ArrayList l = new ArrayList();
797          q.drainTo(l);
798 <        assertEquals(q.size(), 0);
799 <        assertEquals(l.size(), SIZE);
798 >        assertEquals(0, q.size());
799 >        assertEquals(SIZE, l.size());
800          for (int i = 0; i < SIZE; ++i)
801              assertEquals(l.get(i), new Integer(i));
802          q.add(zero);
# Line 855 | Line 806 | public class LinkedBlockingQueueTest ext
806          assertTrue(q.contains(one));
807          l.clear();
808          q.drainTo(l);
809 <        assertEquals(q.size(), 0);
810 <        assertEquals(l.size(), 2);
809 >        assertEquals(0, q.size());
810 >        assertEquals(2, l.size());
811          for (int i = 0; i < 2; ++i)
812              assertEquals(l.get(i), new Integer(i));
813      }
# Line 868 | Line 819 | public class LinkedBlockingQueueTest ext
819          final LinkedBlockingQueue q = populatedQueue(SIZE);
820          Thread t = new Thread(new CheckedRunnable() {
821              public void realRun() throws InterruptedException {
822 <                q.put(new Integer(SIZE+1));
822 >                q.put(new Integer(SIZE + 1));
823              }});
824  
825          t.start();
# Line 882 | Line 833 | public class LinkedBlockingQueueTest ext
833      }
834  
835      /**
836 <     * drainTo(null, n) throws NPE
886 <     */
887 <    public void testDrainToNullN() {
888 <        LinkedBlockingQueue q = populatedQueue(SIZE);
889 <        try {
890 <            q.drainTo(null, 0);
891 <            shouldThrow();
892 <        } catch (NullPointerException success) {}
893 <    }
894 <
895 <    /**
896 <     * drainTo(this, n) throws IAE
897 <     */
898 <    public void testDrainToSelfN() {
899 <        LinkedBlockingQueue q = populatedQueue(SIZE);
900 <        try {
901 <            q.drainTo(q, 0);
902 <            shouldThrow();
903 <        } catch (IllegalArgumentException success) {}
904 <    }
905 <
906 <    /**
907 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
836 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
837       */
838      public void testDrainToN() {
839          LinkedBlockingQueue q = new LinkedBlockingQueue();
# Line 913 | Line 842 | public class LinkedBlockingQueueTest ext
842                  assertTrue(q.offer(new Integer(j)));
843              ArrayList l = new ArrayList();
844              q.drainTo(l, i);
845 <            int k = (i < SIZE)? i : SIZE;
846 <            assertEquals(l.size(), k);
847 <            assertEquals(q.size(), SIZE-k);
845 >            int k = (i < SIZE) ? i : SIZE;
846 >            assertEquals(k, l.size());
847 >            assertEquals(SIZE - k, q.size());
848              for (int j = 0; j < k; ++j)
849                  assertEquals(l.get(j), new Integer(j));
850 <            while (q.poll() != null) ;
850 >            do {} while (q.poll() != null);
851 >        }
852 >    }
853 >
854 >    /**
855 >     * remove(null), contains(null) always return false
856 >     */
857 >    public void testNeverContainsNull() {
858 >        Collection<?>[] qs = {
859 >            new LinkedBlockingQueue<Object>(),
860 >            populatedQueue(2),
861 >        };
862 >
863 >        for (Collection<?> q : qs) {
864 >            assertFalse(q.contains(null));
865 >            assertFalse(q.remove(null));
866          }
867      }
868  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines