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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.18 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.66 by jsr166, Sat Mar 11 18:20:47 2017 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines