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.24 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.74 by jsr166, Sun May 14 04:02:06 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 >                long startTime = System.nanoTime();
354 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
355 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
356 >                pleaseInterrupt.countDown();
357                  try {
358 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
358 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
359                      shouldThrow();
360                  } catch (InterruptedException success) {}
361 +                assertFalse(Thread.interrupted());
362              }});
363  
364 <        t.start();
365 <        Thread.sleep(SMALL_DELAY_MS);
364 >        await(pleaseInterrupt);
365 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
366          t.interrupt();
367 <        t.join();
367 >        awaitTermination(t);
368      }
369  
370      /**
# Line 364 | Line 378 | public class LinkedBlockingQueueTest ext
378      }
379  
380      /**
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    /**
381       * Take removes existing elements until empty, then blocks interruptibly
382       */
383      public void testBlockingTake() throws InterruptedException {
384 <        final LinkedBlockingQueue q = populatedQueue(SIZE);
385 <        Thread t = new Thread(new CheckedRunnable() {
384 >        final BlockingQueue q = populatedQueue(SIZE);
385 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
386 >        Thread t = newStartedThread(new CheckedRunnable() {
387              public void realRun() throws InterruptedException {
388 <                for (int i = 0; i < SIZE; ++i) {
389 <                    assertEquals(i, q.take());
390 <                }
388 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
389 >
390 >                Thread.currentThread().interrupt();
391                  try {
392                      q.take();
393                      shouldThrow();
394                  } catch (InterruptedException success) {}
395 +                assertFalse(Thread.interrupted());
396 +
397 +                pleaseInterrupt.countDown();
398 +                try {
399 +                    q.take();
400 +                    shouldThrow();
401 +                } catch (InterruptedException success) {}
402 +                assertFalse(Thread.interrupted());
403              }});
404  
405 <        t.start();
406 <        Thread.sleep(SHORT_DELAY_MS);
405 >        await(pleaseInterrupt);
406 >        assertThreadBlocks(t, Thread.State.WAITING);
407          t.interrupt();
408 <        t.join();
408 >        awaitTermination(t);
409      }
410  
411      /**
# Line 413 | Line 420 | public class LinkedBlockingQueueTest ext
420      }
421  
422      /**
423 <     * timed pool with zero timeout succeeds when non-empty, else times out
423 >     * timed poll with zero timeout succeeds when non-empty, else times out
424       */
425      public void testTimedPoll0() throws InterruptedException {
426          LinkedBlockingQueue q = populatedQueue(SIZE);
# Line 424 | Line 431 | public class LinkedBlockingQueueTest ext
431      }
432  
433      /**
434 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
434 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
435       */
436      public void testTimedPoll() throws InterruptedException {
437 <        LinkedBlockingQueue q = populatedQueue(SIZE);
437 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
438          for (int i = 0; i < SIZE; ++i) {
439 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
440 <        }
441 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
439 >            long startTime = System.nanoTime();
440 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
441 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
442 >        }
443 >        long startTime = System.nanoTime();
444 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
445 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
446 >        checkEmpty(q);
447      }
448  
449      /**
# Line 439 | Line 451 | public class LinkedBlockingQueueTest ext
451       * returning timeout status
452       */
453      public void testInterruptedTimedPoll() throws InterruptedException {
454 <        Thread t = new Thread(new CheckedRunnable() {
455 <            public void realRun() throws InterruptedException {
456 <                LinkedBlockingQueue q = populatedQueue(SIZE);
457 <                for (int i = 0; i < SIZE; ++i) {
458 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
459 <                }
454 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
455 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
456 >        Thread t = newStartedThread(new CheckedRunnable() {
457 >            public void realRun() throws InterruptedException {
458 >                long startTime = System.nanoTime();
459 >                for (int i = 0; i < SIZE; i++)
460 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
461 >
462 >                Thread.currentThread().interrupt();
463                  try {
464 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
464 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
465                      shouldThrow();
466                  } catch (InterruptedException success) {}
467 <            }});
467 >                assertFalse(Thread.interrupted());
468  
469 <        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));
469 >                pleaseInterrupt.countDown();
470                  try {
471                      q.poll(LONG_DELAY_MS, MILLISECONDS);
472                      shouldThrow();
473                  } catch (InterruptedException success) {}
474 +                assertFalse(Thread.interrupted());
475 +
476 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
477              }});
478  
479 <        t.start();
480 <        Thread.sleep(SMALL_DELAY_MS);
478 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
479 >        await(pleaseInterrupt);
480 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
481          t.interrupt();
482 <        t.join();
482 >        awaitTermination(t);
483 >        checkEmpty(q);
484      }
485  
486      /**
# Line 524 | Line 527 | public class LinkedBlockingQueueTest ext
527      }
528  
529      /**
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    /**
530       * An add following remove(x) succeeds
531       */
532      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 548 | Line 536 | public class LinkedBlockingQueueTest ext
536          assertTrue(q.remove(new Integer(1)));
537          assertTrue(q.remove(new Integer(2)));
538          assertTrue(q.add(new Integer(3)));
539 <        assertTrue(q.take() != null);
539 >        assertNotNull(q.take());
540      }
541  
542      /**
# Line 607 | Line 595 | public class LinkedBlockingQueueTest ext
595                  assertTrue(changed);
596  
597              assertTrue(q.containsAll(p));
598 <            assertEquals(SIZE-i, q.size());
598 >            assertEquals(SIZE - i, q.size());
599              p.remove();
600          }
601      }
# Line 620 | Line 608 | public class LinkedBlockingQueueTest ext
608              LinkedBlockingQueue q = populatedQueue(SIZE);
609              LinkedBlockingQueue p = populatedQueue(i);
610              assertTrue(q.removeAll(p));
611 <            assertEquals(SIZE-i, q.size());
611 >            assertEquals(SIZE - i, q.size());
612              for (int j = 0; j < i; ++j) {
613 <                Integer I = (Integer)(p.remove());
614 <                assertFalse(q.contains(I));
613 >                Integer x = (Integer)(p.remove());
614 >                assertFalse(q.contains(x));
615              }
616          }
617      }
618  
619      /**
620 <     * toArray contains all elements
620 >     * toArray contains all elements in FIFO order
621       */
622 <    public void testToArray() throws InterruptedException {
622 >    public void testToArray() {
623          LinkedBlockingQueue q = populatedQueue(SIZE);
624          Object[] o = q.toArray();
625          for (int i = 0; i < o.length; i++)
626 <            assertEquals(o[i], q.take());
626 >            assertSame(o[i], q.poll());
627      }
628  
629      /**
630 <     * toArray(a) contains all elements
630 >     * toArray(a) contains all elements in FIFO order
631       */
632      public void testToArray2() throws InterruptedException {
633 <        LinkedBlockingQueue q = populatedQueue(SIZE);
633 >        LinkedBlockingQueue<Integer> q = populatedQueue(SIZE);
634          Integer[] ints = new Integer[SIZE];
635 <        ints = (Integer[])q.toArray(ints);
635 >        Integer[] array = q.toArray(ints);
636 >        assertSame(ints, array);
637          for (int i = 0; i < ints.length; i++)
638 <            assertEquals(ints[i], q.take());
638 >            assertSame(ints[i], q.poll());
639      }
640  
641      /**
642 <     * toArray(null) throws NPE
654 <     */
655 <    public void testToArray_BadArg() {
656 <        LinkedBlockingQueue q = populatedQueue(SIZE);
657 <        try {
658 <            Object o[] = q.toArray(null);
659 <            shouldThrow();
660 <        } catch (NullPointerException success) {}
661 <    }
662 <
663 <    /**
664 <     * toArray with incompatible array type throws CCE
642 >     * toArray(incompatible array type) throws ArrayStoreException
643       */
644      public void testToArray1_BadArg() {
645          LinkedBlockingQueue q = populatedQueue(SIZE);
646          try {
647 <            Object o[] = q.toArray(new String[10]);
647 >            q.toArray(new String[10]);
648              shouldThrow();
649          } catch (ArrayStoreException success) {}
650      }
651  
674
652      /**
653       * iterator iterates through all elements
654       */
655      public void testIterator() throws InterruptedException {
656          LinkedBlockingQueue q = populatedQueue(SIZE);
657          Iterator it = q.iterator();
658 <        while (it.hasNext()) {
658 >        int i;
659 >        for (i = 0; it.hasNext(); i++)
660 >            assertTrue(q.contains(it.next()));
661 >        assertEquals(i, SIZE);
662 >        assertIteratorExhausted(it);
663 >
664 >        it = q.iterator();
665 >        for (i = 0; it.hasNext(); i++)
666              assertEquals(it.next(), q.take());
667 <        }
667 >        assertEquals(i, SIZE);
668 >        assertIteratorExhausted(it);
669 >    }
670 >
671 >    /**
672 >     * iterator of empty collection has no elements
673 >     */
674 >    public void testEmptyIterator() {
675 >        assertIteratorExhausted(new LinkedBlockingQueue().iterator());
676      }
677  
678      /**
679       * iterator.remove removes current element
680       */
681 <    public void testIteratorRemove () {
681 >    public void testIteratorRemove() {
682          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
683          q.add(two);
684          q.add(one);
# Line 697 | Line 689 | public class LinkedBlockingQueueTest ext
689          it.remove();
690  
691          it = q.iterator();
692 <        assertEquals(it.next(), one);
693 <        assertEquals(it.next(), three);
692 >        assertSame(it.next(), one);
693 >        assertSame(it.next(), three);
694          assertFalse(it.hasNext());
695      }
696  
705
697      /**
698       * iterator ordering is FIFO
699       */
# Line 722 | Line 713 | public class LinkedBlockingQueueTest ext
713      /**
714       * Modifications do not cause iterators to fail
715       */
716 <    public void testWeaklyConsistentIteration () {
716 >    public void testWeaklyConsistentIteration() {
717          final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
718          q.add(one);
719          q.add(two);
# Line 734 | Line 725 | public class LinkedBlockingQueueTest ext
725          assertEquals(0, q.size());
726      }
727  
737
728      /**
729       * toString contains toStrings of elements
730       */
# Line 742 | Line 732 | public class LinkedBlockingQueueTest ext
732          LinkedBlockingQueue q = populatedQueue(SIZE);
733          String s = q.toString();
734          for (int i = 0; i < SIZE; ++i) {
735 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
735 >            assertTrue(s.contains(String.valueOf(i)));
736          }
737      }
738  
749
739      /**
740       * offer transfers elements across Executor tasks
741       */
# Line 754 | Line 743 | public class LinkedBlockingQueueTest ext
743          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
744          q.add(one);
745          q.add(two);
746 <        ExecutorService executor = Executors.newFixedThreadPool(2);
747 <        executor.execute(new CheckedRunnable() {
748 <            public void realRun() throws InterruptedException {
749 <                assertFalse(q.offer(three));
750 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
751 <                assertEquals(0, q.remainingCapacity());
752 <            }});
753 <
754 <        executor.execute(new CheckedRunnable() {
755 <            public void realRun() throws InterruptedException {
756 <                Thread.sleep(SMALL_DELAY_MS);
757 <                assertSame(one, q.take());
758 <            }});
759 <
760 <        joinPool(executor);
746 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
747 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
748 >        try (PoolCleaner cleaner = cleaner(executor)) {
749 >            executor.execute(new CheckedRunnable() {
750 >                public void realRun() throws InterruptedException {
751 >                    assertFalse(q.offer(three));
752 >                    threadsStarted.await();
753 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
754 >                    assertEquals(0, q.remainingCapacity());
755 >                }});
756 >
757 >            executor.execute(new CheckedRunnable() {
758 >                public void realRun() throws InterruptedException {
759 >                    threadsStarted.await();
760 >                    assertSame(one, q.take());
761 >                }});
762 >        }
763      }
764  
765      /**
766 <     * poll retrieves elements across Executor threads
766 >     * timed poll retrieves elements across Executor threads
767       */
768      public void testPollInExecutor() {
769          final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
770 <        ExecutorService executor = Executors.newFixedThreadPool(2);
771 <        executor.execute(new CheckedRunnable() {
772 <            public void realRun() throws InterruptedException {
773 <                assertNull(q.poll());
774 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
775 <                assertTrue(q.isEmpty());
776 <            }});
777 <
778 <        executor.execute(new CheckedRunnable() {
779 <            public void realRun() throws InterruptedException {
780 <                Thread.sleep(SMALL_DELAY_MS);
781 <                q.put(one);
782 <            }});
783 <
784 <        joinPool(executor);
770 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
771 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
772 >        try (PoolCleaner cleaner = cleaner(executor)) {
773 >            executor.execute(new CheckedRunnable() {
774 >                public void realRun() throws InterruptedException {
775 >                    assertNull(q.poll());
776 >                    threadsStarted.await();
777 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
778 >                    checkEmpty(q);
779 >                }});
780 >
781 >            executor.execute(new CheckedRunnable() {
782 >                public void realRun() throws InterruptedException {
783 >                    threadsStarted.await();
784 >                    q.put(one);
785 >                }});
786 >        }
787      }
788  
789      /**
790       * A deserialized serialized queue has same elements in same order
791       */
792      public void testSerialization() throws Exception {
793 <        LinkedBlockingQueue q = populatedQueue(SIZE);
794 <
802 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
803 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
804 <        out.writeObject(q);
805 <        out.close();
806 <
807 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
808 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
809 <        LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
810 <        assertEquals(q.size(), r.size());
811 <        while (!q.isEmpty())
812 <            assertEquals(q.remove(), r.remove());
813 <    }
793 >        Queue x = populatedQueue(SIZE);
794 >        Queue y = serialClone(x);
795  
796 <    /**
797 <     * drainTo(null) throws NPE
798 <     */
799 <    public void testDrainToNull() {
800 <        LinkedBlockingQueue q = populatedQueue(SIZE);
801 <        try {
802 <            q.drainTo(null);
803 <            shouldThrow();
804 <        } catch (NullPointerException success) {}
824 <    }
825 <
826 <    /**
827 <     * drainTo(this) throws IAE
828 <     */
829 <    public void testDrainToSelf() {
830 <        LinkedBlockingQueue q = populatedQueue(SIZE);
831 <        try {
832 <            q.drainTo(q);
833 <            shouldThrow();
834 <        } catch (IllegalArgumentException success) {}
796 >        assertNotSame(x, y);
797 >        assertEquals(x.size(), y.size());
798 >        assertEquals(x.toString(), y.toString());
799 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
800 >        while (!x.isEmpty()) {
801 >            assertFalse(y.isEmpty());
802 >            assertEquals(x.remove(), y.remove());
803 >        }
804 >        assertTrue(y.isEmpty());
805      }
806  
807      /**
# Line 841 | Line 811 | public class LinkedBlockingQueueTest ext
811          LinkedBlockingQueue q = populatedQueue(SIZE);
812          ArrayList l = new ArrayList();
813          q.drainTo(l);
814 <        assertEquals(q.size(), 0);
815 <        assertEquals(l.size(), SIZE);
814 >        assertEquals(0, q.size());
815 >        assertEquals(SIZE, l.size());
816          for (int i = 0; i < SIZE; ++i)
817              assertEquals(l.get(i), new Integer(i));
818          q.add(zero);
# Line 852 | Line 822 | public class LinkedBlockingQueueTest ext
822          assertTrue(q.contains(one));
823          l.clear();
824          q.drainTo(l);
825 <        assertEquals(q.size(), 0);
826 <        assertEquals(l.size(), 2);
825 >        assertEquals(0, q.size());
826 >        assertEquals(2, l.size());
827          for (int i = 0; i < 2; ++i)
828              assertEquals(l.get(i), new Integer(i));
829      }
# Line 865 | Line 835 | public class LinkedBlockingQueueTest ext
835          final LinkedBlockingQueue q = populatedQueue(SIZE);
836          Thread t = new Thread(new CheckedRunnable() {
837              public void realRun() throws InterruptedException {
838 <                q.put(new Integer(SIZE+1));
838 >                q.put(new Integer(SIZE + 1));
839              }});
840  
841          t.start();
# Line 879 | Line 849 | public class LinkedBlockingQueueTest ext
849      }
850  
851      /**
852 <     * drainTo(null, n) throws NPE
883 <     */
884 <    public void testDrainToNullN() {
885 <        LinkedBlockingQueue q = populatedQueue(SIZE);
886 <        try {
887 <            q.drainTo(null, 0);
888 <            shouldThrow();
889 <        } catch (NullPointerException success) {}
890 <    }
891 <
892 <    /**
893 <     * drainTo(this, n) throws IAE
894 <     */
895 <    public void testDrainToSelfN() {
896 <        LinkedBlockingQueue q = populatedQueue(SIZE);
897 <        try {
898 <            q.drainTo(q, 0);
899 <            shouldThrow();
900 <        } catch (IllegalArgumentException success) {}
901 <    }
902 <
903 <    /**
904 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
852 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
853       */
854      public void testDrainToN() {
855          LinkedBlockingQueue q = new LinkedBlockingQueue();
# Line 910 | Line 858 | public class LinkedBlockingQueueTest ext
858                  assertTrue(q.offer(new Integer(j)));
859              ArrayList l = new ArrayList();
860              q.drainTo(l, i);
861 <            int k = (i < SIZE)? i : SIZE;
862 <            assertEquals(l.size(), k);
863 <            assertEquals(q.size(), SIZE-k);
861 >            int k = (i < SIZE) ? i : SIZE;
862 >            assertEquals(k, l.size());
863 >            assertEquals(SIZE - k, q.size());
864              for (int j = 0; j < k; ++j)
865                  assertEquals(l.get(j), new Integer(j));
866 <            while (q.poll() != null) ;
866 >            do {} while (q.poll() != null);
867 >        }
868 >    }
869 >
870 >    /**
871 >     * remove(null), contains(null) always return false
872 >     */
873 >    public void testNeverContainsNull() {
874 >        Collection<?>[] qs = {
875 >            new LinkedBlockingQueue<Object>(),
876 >            populatedQueue(2),
877 >        };
878 >
879 >        for (Collection<?> q : qs) {
880 >            assertFalse(q.contains(null));
881 >            assertFalse(q.remove(null));
882          }
883      }
884  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines