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.35 by jsr166, Wed Nov 3 16:46:34 2010 UTC vs.
Revision 1.83 by jsr166, Wed Jan 27 01:57:24 2021 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  
# Line 22 | Line 32 | public class LinkedBlockingQueueTest ext
32  
33      public static class Bounded extends BlockingQueueTest {
34          protected BlockingQueue emptyCollection() {
35 <            return new LinkedBlockingQueue(20);
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 +        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 JSR166TestCase.itemFor(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());
53 >                            new Bounded().testSuite(),
54 >                            CollectionTest.testSuite(new Implementation()));
55      }
56  
39
57      /**
58 <     * Create a queue of given size containing consecutive
59 <     * Integers 0 ... n.
58 >     * Returns a new queue of given size containing consecutive
59 >     * Items 0 ... n - 1.
60       */
61 <    private LinkedBlockingQueue populatedQueue(int n) {
62 <        LinkedBlockingQueue q = new LinkedBlockingQueue(n);
61 >    private static LinkedBlockingQueue<Item> populatedQueue(int n) {
62 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(n);
63          assertTrue(q.isEmpty());
64          for (int i = 0; i < n; i++)
65 <            assertTrue(q.offer(new Integer(i)));
65 >            mustOffer(q, i);
66          assertFalse(q.isEmpty());
67 <        assertEquals(0, q.remainingCapacity());
68 <        assertEquals(n, q.size());
67 >        mustEqual(0, q.remainingCapacity());
68 >        mustEqual(n, q.size());
69 >        mustEqual(0, q.peek());
70          return q;
71      }
72  
# Line 57 | Line 75 | public class LinkedBlockingQueueTest ext
75       * none given
76       */
77      public void testConstructor1() {
78 <        assertEquals(SIZE, new LinkedBlockingQueue(SIZE).remainingCapacity());
79 <        assertEquals(Integer.MAX_VALUE, new LinkedBlockingQueue().remainingCapacity());
78 >        mustEqual(SIZE, new LinkedBlockingQueue<Item>(SIZE).remainingCapacity());
79 >        mustEqual(Integer.MAX_VALUE, new LinkedBlockingQueue<Item>().remainingCapacity());
80      }
81  
82      /**
83 <     * Constructor throws IAE if capacity argument nonpositive
83 >     * Constructor throws IllegalArgumentException if capacity argument nonpositive
84       */
85      public void testConstructor2() {
86          try {
87 <            LinkedBlockingQueue q = new LinkedBlockingQueue(0);
87 >            new LinkedBlockingQueue<Item>(0);
88              shouldThrow();
89          } catch (IllegalArgumentException success) {}
90      }
91  
92      /**
93 <     * Initializing from null Collection throws NPE
93 >     * Initializing from null Collection throws NullPointerException
94       */
95      public void testConstructor3() {
96          try {
97 <            LinkedBlockingQueue q = new LinkedBlockingQueue(null);
97 >            new LinkedBlockingQueue<Item>(null);
98              shouldThrow();
99          } catch (NullPointerException success) {}
100      }
101  
102      /**
103 <     * Initializing from Collection of null elements throws NPE
103 >     * Initializing from Collection of null elements throws NullPointerException
104       */
105      public void testConstructor4() {
106 +        Collection<Item> elements = Arrays.asList(new Item[SIZE]);
107          try {
108 <            Integer[] ints = new Integer[SIZE];
90 <            LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
108 >            new LinkedBlockingQueue<Item>(elements);
109              shouldThrow();
110          } catch (NullPointerException success) {}
111      }
112  
113      /**
114 <     * Initializing from Collection with some null elements throws NPE
114 >     * Initializing from Collection with some null elements throws
115 >     * NullPointerException
116       */
117      public void testConstructor5() {
118 +        Item[] items = new Item[2];
119 +        items[0] = zero;
120 +        Collection<Item> elements = Arrays.asList(items);
121          try {
122 <            Integer[] ints = new Integer[SIZE];
101 <            for (int i = 0; i < SIZE-1; ++i)
102 <                ints[i] = new Integer(i);
103 <            LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
122 >            new LinkedBlockingQueue<Item>(elements);
123              shouldThrow();
124          } catch (NullPointerException success) {}
125      }
# Line 109 | Line 128 | public class LinkedBlockingQueueTest ext
128       * Queue contains all elements of collection used to initialize
129       */
130      public void testConstructor6() {
131 <        Integer[] ints = new Integer[SIZE];
132 <        for (int i = 0; i < SIZE; ++i)
114 <            ints[i] = new Integer(i);
115 <        LinkedBlockingQueue q = new LinkedBlockingQueue(Arrays.asList(ints));
131 >        Item[] items = defaultItems;
132 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(Arrays.asList(items));
133          for (int i = 0; i < SIZE; ++i)
134 <            assertEquals(ints[i], q.poll());
134 >            mustEqual(items[i], q.poll());
135      }
136  
137      /**
138       * Queue transitions from empty to full when elements added
139       */
140      public void testEmptyFull() {
141 <        LinkedBlockingQueue q = new LinkedBlockingQueue(2);
141 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
142          assertTrue(q.isEmpty());
143 <        assertEquals("should have room for 2", 2, q.remainingCapacity());
143 >        mustEqual(2, q.remainingCapacity());
144          q.add(one);
145          assertFalse(q.isEmpty());
146          q.add(two);
147          assertFalse(q.isEmpty());
148 <        assertEquals(0, q.remainingCapacity());
148 >        mustEqual(0, q.remainingCapacity());
149          assertFalse(q.offer(three));
150      }
151  
# Line 136 | Line 153 | public class LinkedBlockingQueueTest ext
153       * remainingCapacity decreases on add, increases on remove
154       */
155      public void testRemainingCapacity() {
156 <        LinkedBlockingQueue q = populatedQueue(SIZE);
156 >        BlockingQueue<Item> q = populatedQueue(SIZE);
157          for (int i = 0; i < SIZE; ++i) {
158 <            assertEquals(i, q.remainingCapacity());
159 <            assertEquals(SIZE-i, q.size());
160 <            q.remove();
158 >            mustEqual(i, q.remainingCapacity());
159 >            mustEqual(SIZE, q.size() + q.remainingCapacity());
160 >            mustEqual(i, q.remove());
161          }
162          for (int i = 0; i < SIZE; ++i) {
163 <            assertEquals(SIZE-i, q.remainingCapacity());
164 <            assertEquals(i, q.size());
165 <            q.add(new Integer(i));
163 >            mustEqual(SIZE - i, q.remainingCapacity());
164 >            mustEqual(SIZE, q.size() + q.remainingCapacity());
165 >            mustAdd(q, i);
166          }
167      }
168  
169      /**
153     * offer(null) throws NPE
154     */
155    public void testOfferNull() {
156        try {
157            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
158            q.offer(null);
159            shouldThrow();
160        } catch (NullPointerException success) {}
161    }
162
163    /**
164     * add(null) throws NPE
165     */
166    public void testAddNull() {
167        try {
168            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
169            q.add(null);
170            shouldThrow();
171        } catch (NullPointerException success) {}
172    }
173
174    /**
170       * Offer succeeds if not full; fails if full
171       */
172      public void testOffer() {
173 <        LinkedBlockingQueue q = new LinkedBlockingQueue(1);
173 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(1);
174          assertTrue(q.offer(zero));
175          assertFalse(q.offer(one));
176      }
177  
178      /**
179 <     * add succeeds if not full; throws ISE if full
179 >     * add succeeds if not full; throws IllegalStateException if full
180       */
181      public void testAdd() {
182 +        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
183 +        for (int i = 0; i < SIZE; ++i)
184 +            mustAdd(q, i);
185 +        mustEqual(0, q.remainingCapacity());
186          try {
187 <            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
189 <            for (int i = 0; i < SIZE; ++i) {
190 <                assertTrue(q.add(new Integer(i)));
191 <            }
192 <            assertEquals(0, q.remainingCapacity());
193 <            q.add(new Integer(SIZE));
187 >            q.add(new Item(SIZE));
188              shouldThrow();
189          } catch (IllegalStateException success) {}
190      }
191  
192      /**
193 <     * addAll(null) throws NPE
200 <     */
201 <    public void testAddAll1() {
202 <        try {
203 <            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
204 <            q.addAll(null);
205 <            shouldThrow();
206 <        } catch (NullPointerException success) {}
207 <    }
208 <
209 <    /**
210 <     * addAll(this) throws IAE
193 >     * addAll(this) throws IllegalArgumentException
194       */
195      public void testAddAllSelf() {
196 +        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
197          try {
214            LinkedBlockingQueue q = populatedQueue(SIZE);
198              q.addAll(q);
199              shouldThrow();
200          } catch (IllegalArgumentException success) {}
201      }
202  
203      /**
221     * addAll of a collection with null elements throws NPE
222     */
223    public void testAddAll2() {
224        try {
225            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
226            Integer[] ints = new Integer[SIZE];
227            q.addAll(Arrays.asList(ints));
228            shouldThrow();
229        } catch (NullPointerException success) {}
230    }
231
232    /**
204       * addAll of a collection with any null elements throws NPE after
205       * possibly adding some elements
206       */
207      public void testAddAll3() {
208 +        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
209 +        Item[] items = new Item[2]; items[0] = zero;
210 +        Collection<Item> elements = Arrays.asList(items);
211          try {
212 <            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
239 <            Integer[] ints = new Integer[SIZE];
240 <            for (int i = 0; i < SIZE-1; ++i)
241 <                ints[i] = new Integer(i);
242 <            q.addAll(Arrays.asList(ints));
212 >            q.addAll(elements);
213              shouldThrow();
214          } catch (NullPointerException success) {}
215      }
216  
217      /**
218 <     * addAll throws ISE if not enough room
218 >     * addAll throws IllegalStateException if not enough room
219       */
220      public void testAddAll4() {
221 +        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE - 1);
222 +        Item[] items = defaultItems;
223 +        Collection<Item> elements = Arrays.asList(items);
224          try {
225 <            LinkedBlockingQueue q = new LinkedBlockingQueue(1);
253 <            Integer[] ints = new Integer[SIZE];
254 <            for (int i = 0; i < SIZE; ++i)
255 <                ints[i] = new Integer(i);
256 <            q.addAll(Arrays.asList(ints));
225 >            q.addAll(elements);
226              shouldThrow();
227          } catch (IllegalStateException success) {}
228      }
# Line 262 | Line 231 | public class LinkedBlockingQueueTest ext
231       * Queue contains all elements, in traversal order, of successful addAll
232       */
233      public void testAddAll5() {
234 <        Integer[] empty = new Integer[0];
235 <        Integer[] ints = new Integer[SIZE];
236 <        for (int i = 0; i < SIZE; ++i)
268 <            ints[i] = new Integer(i);
269 <        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
234 >        Item[] empty = new Item[0];
235 >        Item[] items = defaultItems;
236 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
237          assertFalse(q.addAll(Arrays.asList(empty)));
238 <        assertTrue(q.addAll(Arrays.asList(ints)));
238 >        assertTrue(q.addAll(Arrays.asList(items)));
239          for (int i = 0; i < SIZE; ++i)
240 <            assertEquals(ints[i], q.poll());
240 >            mustEqual(items[i], q.poll());
241      }
242  
243      /**
277     * put(null) throws NPE
278     */
279     public void testPutNull() throws InterruptedException {
280        try {
281            LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
282            q.put(null);
283            shouldThrow();
284        } catch (NullPointerException success) {}
285     }
286
287    /**
244       * all elements successfully put are contained
245       */
246      public void testPut() throws InterruptedException {
247 <        LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
247 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
248          for (int i = 0; i < SIZE; ++i) {
249 <            Integer I = new Integer(i);
250 <            q.put(I);
251 <            assertTrue(q.contains(I));
249 >            Item x = itemFor(i);
250 >            q.put(x);
251 >            mustContain(q, x);
252          }
253 <        assertEquals(0, q.remainingCapacity());
253 >        mustEqual(0, q.remainingCapacity());
254      }
255  
256      /**
257       * put blocks interruptibly if full
258       */
259      public void testBlockingPut() throws InterruptedException {
260 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
261 <        Thread t = new Thread(new CheckedRunnable() {
260 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
261 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
262 >        Thread t = newStartedThread(new CheckedRunnable() {
263              public void realRun() throws InterruptedException {
264                  for (int i = 0; i < SIZE; ++i)
265 <                    q.put(i);
266 <                assertEquals(SIZE, q.size());
267 <                assertEquals(0, q.remainingCapacity());
265 >                    q.put(itemFor(i));
266 >                mustEqual(SIZE, q.size());
267 >                mustEqual(0, q.remainingCapacity());
268 >
269 >                Thread.currentThread().interrupt();
270                  try {
271 <                    q.put(99);
271 >                    q.put(ninetynine);
272                      shouldThrow();
273                  } catch (InterruptedException success) {}
274 +                assertFalse(Thread.interrupted());
275 +
276 +                pleaseInterrupt.countDown();
277 +                try {
278 +                    q.put(ninetynine);
279 +                    shouldThrow();
280 +                } catch (InterruptedException success) {}
281 +                assertFalse(Thread.interrupted());
282              }});
283  
284 <        t.start();
285 <        Thread.sleep(SHORT_DELAY_MS);
284 >        await(pleaseInterrupt);
285 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
286          t.interrupt();
287 <        t.join();
288 <        assertEquals(SIZE, q.size());
289 <        assertEquals(0, q.remainingCapacity());
287 >        awaitTermination(t);
288 >        mustEqual(SIZE, q.size());
289 >        mustEqual(0, q.remainingCapacity());
290      }
291  
292      /**
293 <     * put blocks waiting for take when full
293 >     * put blocks interruptibly waiting for take when full
294       */
295      public void testPutWithTake() throws InterruptedException {
296          final int capacity = 2;
297 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
298 <        Thread t = new Thread(new CheckedRunnable() {
297 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
298 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
299 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
300 >        Thread t = newStartedThread(new CheckedRunnable() {
301              public void realRun() throws InterruptedException {
302 <                for (int i = 0; i < capacity + 1; i++)
303 <                    q.put(i);
302 >                for (int i = 0; i < capacity; i++)
303 >                    q.put(itemFor(i));
304 >                pleaseTake.countDown();
305 >                q.put(eightysix);
306 >
307 >                Thread.currentThread().interrupt();
308                  try {
309 <                    q.put(99);
309 >                    q.put(ninetynine);
310                      shouldThrow();
311                  } catch (InterruptedException success) {}
312 +                assertFalse(Thread.interrupted());
313 +
314 +                pleaseInterrupt.countDown();
315 +                try {
316 +                    q.put(ninetynine);
317 +                    shouldThrow();
318 +                } catch (InterruptedException success) {}
319 +                assertFalse(Thread.interrupted());
320              }});
321  
322 <        t.start();
323 <        Thread.sleep(SHORT_DELAY_MS);
324 <        assertEquals(q.remainingCapacity(), 0);
325 <        assertEquals(0, q.take());
326 <        Thread.sleep(SHORT_DELAY_MS);
322 >        await(pleaseTake);
323 >        mustEqual(0, q.remainingCapacity());
324 >        mustEqual(0, q.take());
325 >
326 >        await(pleaseInterrupt);
327 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
328          t.interrupt();
329 <        t.join();
330 <        assertEquals(q.remainingCapacity(), 0);
329 >        awaitTermination(t);
330 >        mustEqual(0, q.remainingCapacity());
331      }
332  
333      /**
334       * timed offer times out if full and elements not taken
335       */
336 <    public void testTimedOffer() throws InterruptedException {
337 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
338 <        Thread t = new Thread(new CheckedRunnable() {
336 >    public void testTimedOffer() {
337 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
338 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339 >        Thread t = newStartedThread(new CheckedRunnable() {
340              public void realRun() throws InterruptedException {
341 <                q.put(new Object());
342 <                q.put(new Object());
343 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
341 >                q.put(zero);
342 >                q.put(one);
343 >                long startTime = System.nanoTime();
344 >
345 >                assertFalse(q.offer(two, timeoutMillis(), MILLISECONDS));
346 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
347 >
348 >                Thread.currentThread().interrupt();
349 >                try {
350 >                    q.offer(three, randomTimeout(), randomTimeUnit());
351 >                    shouldThrow();
352 >                } catch (InterruptedException success) {}
353 >                assertFalse(Thread.interrupted());
354 >
355 >                pleaseInterrupt.countDown();
356                  try {
357 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
357 >                    q.offer(two, LONGER_DELAY_MS, MILLISECONDS);
358                      shouldThrow();
359                  } catch (InterruptedException success) {}
360 +                assertFalse(Thread.interrupted());
361              }});
362  
363 <        t.start();
364 <        Thread.sleep(SMALL_DELAY_MS);
363 >        await(pleaseInterrupt);
364 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
365          t.interrupt();
366 <        t.join();
366 >        awaitTermination(t);
367      }
368  
369      /**
370       * take retrieves elements in FIFO order
371       */
372      public void testTake() throws InterruptedException {
373 <        LinkedBlockingQueue q = populatedQueue(SIZE);
373 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
374          for (int i = 0; i < SIZE; ++i) {
375 <            assertEquals(i, q.take());
375 >            mustEqual(i, q.take());
376          }
377      }
378  
# Line 384 | Line 380 | public class LinkedBlockingQueueTest ext
380       * Take removes existing elements until empty, then blocks interruptibly
381       */
382      public void testBlockingTake() throws InterruptedException {
383 <        final LinkedBlockingQueue q = populatedQueue(SIZE);
384 <        Thread t = new Thread(new CheckedRunnable() {
383 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
384 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
385 >        Thread t = newStartedThread(new CheckedRunnable() {
386              public void realRun() throws InterruptedException {
387 <                for (int i = 0; i < SIZE; ++i) {
388 <                    assertEquals(i, q.take());
389 <                }
387 >                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
388 >
389 >                Thread.currentThread().interrupt();
390 >                try {
391 >                    q.take();
392 >                    shouldThrow();
393 >                } catch (InterruptedException success) {}
394 >                assertFalse(Thread.interrupted());
395 >
396 >                pleaseInterrupt.countDown();
397                  try {
398                      q.take();
399                      shouldThrow();
400                  } catch (InterruptedException success) {}
401 +                assertFalse(Thread.interrupted());
402              }});
403  
404 <        t.start();
405 <        Thread.sleep(SHORT_DELAY_MS);
404 >        await(pleaseInterrupt);
405 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
406          t.interrupt();
407 <        t.join();
407 >        awaitTermination(t);
408      }
409  
410      /**
411       * poll succeeds unless empty
412       */
413      public void testPoll() {
414 <        LinkedBlockingQueue q = populatedQueue(SIZE);
414 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
415          for (int i = 0; i < SIZE; ++i) {
416 <            assertEquals(i, q.poll());
416 >            mustEqual(i, q.poll());
417          }
418          assertNull(q.poll());
419      }
# Line 417 | Line 422 | public class LinkedBlockingQueueTest ext
422       * timed poll with zero timeout succeeds when non-empty, else times out
423       */
424      public void testTimedPoll0() throws InterruptedException {
425 <        LinkedBlockingQueue q = populatedQueue(SIZE);
425 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
426          for (int i = 0; i < SIZE; ++i) {
427 <            assertEquals(i, q.poll(0, MILLISECONDS));
427 >            mustEqual(i, q.poll(0, MILLISECONDS));
428          }
429          assertNull(q.poll(0, MILLISECONDS));
430      }
# Line 428 | Line 433 | public class LinkedBlockingQueueTest ext
433       * timed poll with nonzero timeout succeeds when non-empty, else times out
434       */
435      public void testTimedPoll() throws InterruptedException {
436 <        LinkedBlockingQueue q = populatedQueue(SIZE);
436 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
437          for (int i = 0; i < SIZE; ++i) {
438 <            assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
439 <        }
440 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
438 >            long startTime = System.nanoTime();
439 >            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
440 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
441 >        }
442 >        long startTime = System.nanoTime();
443 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
444 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
445 >        checkEmpty(q);
446      }
447  
448      /**
# Line 440 | Line 450 | public class LinkedBlockingQueueTest ext
450       * returning timeout status
451       */
452      public void testInterruptedTimedPoll() throws InterruptedException {
453 <        Thread t = new Thread(new CheckedRunnable() {
453 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
454 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
455 >        Thread t = newStartedThread(new CheckedRunnable() {
456              public void realRun() throws InterruptedException {
457 <                LinkedBlockingQueue q = populatedQueue(SIZE);
458 <                for (int i = 0; i < SIZE; ++i) {
459 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
460 <                }
457 >                for (int i = 0; i < SIZE; i++)
458 >                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
459 >
460 >                Thread.currentThread().interrupt();
461 >                try {
462 >                    q.poll(randomTimeout(), randomTimeUnit());
463 >                    shouldThrow();
464 >                } catch (InterruptedException success) {}
465 >                assertFalse(Thread.interrupted());
466 >
467 >                pleaseInterrupt.countDown();
468                  try {
469 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
469 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
470                      shouldThrow();
471                  } catch (InterruptedException success) {}
472 +                assertFalse(Thread.interrupted());
473              }});
474  
475 <        t.start();
476 <        Thread.sleep(SHORT_DELAY_MS);
475 >        await(pleaseInterrupt);
476 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
477          t.interrupt();
478 <        t.join();
478 >        awaitTermination(t);
479 >        checkEmpty(q);
480      }
481  
482      /**
483       * peek returns next element, or null if empty
484       */
485      public void testPeek() {
486 <        LinkedBlockingQueue q = populatedQueue(SIZE);
486 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
487          for (int i = 0; i < SIZE; ++i) {
488 <            assertEquals(i, q.peek());
489 <            assertEquals(i, q.poll());
488 >            mustEqual(i, q.peek());
489 >            mustEqual(i, q.poll());
490              assertTrue(q.peek() == null ||
491                         !q.peek().equals(i));
492          }
# Line 476 | Line 497 | public class LinkedBlockingQueueTest ext
497       * element returns next element, or throws NSEE if empty
498       */
499      public void testElement() {
500 <        LinkedBlockingQueue q = populatedQueue(SIZE);
500 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
501          for (int i = 0; i < SIZE; ++i) {
502 <            assertEquals(i, q.element());
503 <            assertEquals(i, q.poll());
502 >            mustEqual(i, q.element());
503 >            mustEqual(i, q.poll());
504          }
505          try {
506              q.element();
# Line 491 | Line 512 | public class LinkedBlockingQueueTest ext
512       * remove removes next element, or throws NSEE if empty
513       */
514      public void testRemove() {
515 <        LinkedBlockingQueue q = populatedQueue(SIZE);
515 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
516          for (int i = 0; i < SIZE; ++i) {
517 <            assertEquals(i, q.remove());
517 >            mustEqual(i, q.remove());
518          }
519          try {
520              q.remove();
# Line 502 | Line 523 | public class LinkedBlockingQueueTest ext
523      }
524  
525      /**
505     * remove(x) removes x and returns true if present
506     */
507    public void testRemoveElement() {
508        LinkedBlockingQueue q = populatedQueue(SIZE);
509        for (int i = 1; i < SIZE; i+=2) {
510            assertTrue(q.remove(new Integer(i)));
511        }
512        for (int i = 0; i < SIZE; i+=2) {
513            assertTrue(q.remove(new Integer(i)));
514            assertFalse(q.remove(new Integer(i+1)));
515        }
516        assertTrue(q.isEmpty());
517    }
518
519    /**
526       * An add following remove(x) succeeds
527       */
528      public void testRemoveElementAndAdd() throws InterruptedException {
529 <        LinkedBlockingQueue q = new LinkedBlockingQueue();
530 <        assertTrue(q.add(new Integer(1)));
531 <        assertTrue(q.add(new Integer(2)));
532 <        assertTrue(q.remove(new Integer(1)));
533 <        assertTrue(q.remove(new Integer(2)));
534 <        assertTrue(q.add(new Integer(3)));
535 <        assertTrue(q.take() != null);
529 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>();
530 >        assertTrue(q.add(one));
531 >        assertTrue(q.add(two));
532 >        mustRemove(q, one);
533 >        mustRemove(q, two);
534 >        mustAdd(q, three);
535 >        assertNotNull(q.take());
536      }
537  
538      /**
539       * contains(x) reports true when elements added but not yet removed
540       */
541      public void testContains() {
542 <        LinkedBlockingQueue q = populatedQueue(SIZE);
542 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
543          for (int i = 0; i < SIZE; ++i) {
544 <            assertTrue(q.contains(new Integer(i)));
544 >            mustContain(q, i);
545              q.poll();
546 <            assertFalse(q.contains(new Integer(i)));
546 >            mustNotContain(q, i);
547          }
548      }
549  
# Line 545 | Line 551 | public class LinkedBlockingQueueTest ext
551       * clear removes all elements
552       */
553      public void testClear() {
554 <        LinkedBlockingQueue q = populatedQueue(SIZE);
554 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
555          q.clear();
556          assertTrue(q.isEmpty());
557 <        assertEquals(0, q.size());
558 <        assertEquals(SIZE, q.remainingCapacity());
557 >        mustEqual(0, q.size());
558 >        mustEqual(SIZE, q.remainingCapacity());
559          q.add(one);
560          assertFalse(q.isEmpty());
561          assertTrue(q.contains(one));
# Line 561 | Line 567 | public class LinkedBlockingQueueTest ext
567       * containsAll(c) is true when c contains a subset of elements
568       */
569      public void testContainsAll() {
570 <        LinkedBlockingQueue q = populatedQueue(SIZE);
571 <        LinkedBlockingQueue p = new LinkedBlockingQueue(SIZE);
570 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
571 >        LinkedBlockingQueue<Item> p = new LinkedBlockingQueue<>(SIZE);
572          for (int i = 0; i < SIZE; ++i) {
573              assertTrue(q.containsAll(p));
574              assertFalse(p.containsAll(q));
575 <            p.add(new Integer(i));
575 >            mustAdd(p, i);
576          }
577          assertTrue(p.containsAll(q));
578      }
# Line 575 | Line 581 | public class LinkedBlockingQueueTest ext
581       * retainAll(c) retains only those elements of c and reports true if changed
582       */
583      public void testRetainAll() {
584 <        LinkedBlockingQueue q = populatedQueue(SIZE);
585 <        LinkedBlockingQueue p = populatedQueue(SIZE);
584 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
585 >        LinkedBlockingQueue<Item> p = populatedQueue(SIZE);
586          for (int i = 0; i < SIZE; ++i) {
587              boolean changed = q.retainAll(p);
588              if (i == 0)
# Line 585 | Line 591 | public class LinkedBlockingQueueTest ext
591                  assertTrue(changed);
592  
593              assertTrue(q.containsAll(p));
594 <            assertEquals(SIZE-i, q.size());
594 >            mustEqual(SIZE - i, q.size());
595              p.remove();
596          }
597      }
# Line 595 | Line 601 | public class LinkedBlockingQueueTest ext
601       */
602      public void testRemoveAll() {
603          for (int i = 1; i < SIZE; ++i) {
604 <            LinkedBlockingQueue q = populatedQueue(SIZE);
605 <            LinkedBlockingQueue p = populatedQueue(i);
604 >            LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
605 >            LinkedBlockingQueue<Item> p = populatedQueue(i);
606              assertTrue(q.removeAll(p));
607 <            assertEquals(SIZE-i, q.size());
607 >            mustEqual(SIZE - i, q.size());
608              for (int j = 0; j < i; ++j) {
609 <                Integer I = (Integer)(p.remove());
604 <                assertFalse(q.contains(I));
609 >                mustNotContain(q, p.remove());
610              }
611          }
612      }
613  
614      /**
615 <     * toArray contains all elements
615 >     * toArray contains all elements in FIFO order
616       */
617 <    public void testToArray() throws InterruptedException {
618 <        LinkedBlockingQueue q = populatedQueue(SIZE);
619 <        Object[] o = q.toArray();
620 <        for (int i = 0; i < o.length; i++)
621 <            assertEquals(o[i], q.take());
617 >    public void testToArray() {
618 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
619 >        Object[] a = q.toArray();
620 >        assertSame(Object[].class, a.getClass());
621 >        for (Object o : a)
622 >            assertSame(o, q.poll());
623 >        assertTrue(q.isEmpty());
624      }
625  
626      /**
627 <     * toArray(a) contains all elements
627 >     * toArray(a) contains all elements in FIFO order
628       */
629      public void testToArray2() throws InterruptedException {
630 <        LinkedBlockingQueue q = populatedQueue(SIZE);
631 <        Integer[] ints = new Integer[SIZE];
632 <        ints = (Integer[])q.toArray(ints);
633 <        for (int i = 0; i < ints.length; i++)
634 <            assertEquals(ints[i], q.take());
635 <    }
636 <
630 <    /**
631 <     * toArray(null) throws NullPointerException
632 <     */
633 <    public void testToArray_NullArg() {
634 <        LinkedBlockingQueue q = populatedQueue(SIZE);
635 <        try {
636 <            q.toArray(null);
637 <            shouldThrow();
638 <        } catch (NullPointerException success) {}
630 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
631 >        Item[] items = new Item[SIZE];
632 >        Item[] array = q.toArray(items);
633 >        assertSame(items, array);
634 >        for (Item o : items)
635 >            assertSame(o, q.poll());
636 >        assertTrue(q.isEmpty());
637      }
638  
639      /**
640       * toArray(incompatible array type) throws ArrayStoreException
641       */
642      public void testToArray1_BadArg() {
643 <        LinkedBlockingQueue q = populatedQueue(SIZE);
643 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
644          try {
645              q.toArray(new String[10]);
646              shouldThrow();
647          } catch (ArrayStoreException success) {}
648      }
649  
652
650      /**
651       * iterator iterates through all elements
652       */
653      public void testIterator() throws InterruptedException {
654 <        LinkedBlockingQueue q = populatedQueue(SIZE);
655 <        Iterator it = q.iterator();
656 <        while (it.hasNext()) {
657 <            assertEquals(it.next(), q.take());
658 <        }
654 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
655 >        Iterator<? extends Item> it = q.iterator();
656 >        int i;
657 >        for (i = 0; it.hasNext(); i++)
658 >            mustContain(q, it.next());
659 >        mustEqual(i, SIZE);
660 >        assertIteratorExhausted(it);
661 >
662 >        it = q.iterator();
663 >        for (i = 0; it.hasNext(); i++)
664 >            mustEqual(it.next(), q.take());
665 >        mustEqual(i, SIZE);
666 >        assertIteratorExhausted(it);
667 >    }
668 >
669 >    /**
670 >     * iterator of empty collection has no elements
671 >     */
672 >    public void testEmptyIterator() {
673 >        assertIteratorExhausted(new LinkedBlockingQueue<Item>().iterator());
674      }
675  
676      /**
677       * iterator.remove removes current element
678       */
679      public void testIteratorRemove() {
680 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
680 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(3);
681          q.add(two);
682          q.add(one);
683          q.add(three);
684  
685 <        Iterator it = q.iterator();
685 >        Iterator<? extends Item> it = q.iterator();
686          it.next();
687          it.remove();
688  
# Line 680 | Line 692 | public class LinkedBlockingQueueTest ext
692          assertFalse(it.hasNext());
693      }
694  
683
695      /**
696       * iterator ordering is FIFO
697       */
698      public void testIteratorOrdering() {
699 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
699 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(3);
700          q.add(one);
701          q.add(two);
702          q.add(three);
703 <        assertEquals(0, q.remainingCapacity());
703 >        mustEqual(0, q.remainingCapacity());
704          int k = 0;
705 <        for (Iterator it = q.iterator(); it.hasNext();) {
706 <            assertEquals(++k, it.next());
705 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
706 >            mustEqual(++k, it.next());
707          }
708 <        assertEquals(3, k);
708 >        mustEqual(3, k);
709      }
710  
711      /**
712       * Modifications do not cause iterators to fail
713       */
714      public void testWeaklyConsistentIteration() {
715 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
715 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(3);
716          q.add(one);
717          q.add(two);
718          q.add(three);
719 <        for (Iterator it = q.iterator(); it.hasNext();) {
719 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
720              q.remove();
721              it.next();
722          }
723 <        assertEquals(0, q.size());
723 >        mustEqual(0, q.size());
724      }
725  
715
726      /**
727       * toString contains toStrings of elements
728       */
729      public void testToString() {
730 <        LinkedBlockingQueue q = populatedQueue(SIZE);
730 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
731          String s = q.toString();
732          for (int i = 0; i < SIZE; ++i) {
733 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
733 >            assertTrue(s.contains(String.valueOf(i)));
734          }
735      }
736  
727
737      /**
738       * offer transfers elements across Executor tasks
739       */
740      public void testOfferInExecutor() {
741 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
741 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
742          q.add(one);
743          q.add(two);
744 <        ExecutorService executor = Executors.newFixedThreadPool(2);
745 <        executor.execute(new CheckedRunnable() {
746 <            public void realRun() throws InterruptedException {
747 <                assertFalse(q.offer(three));
748 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
749 <                assertEquals(0, q.remainingCapacity());
750 <            }});
751 <
752 <        executor.execute(new CheckedRunnable() {
753 <            public void realRun() throws InterruptedException {
754 <                Thread.sleep(SMALL_DELAY_MS);
755 <                assertSame(one, q.take());
756 <            }});
757 <
758 <        joinPool(executor);
744 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
745 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
746 >        try (PoolCleaner cleaner = cleaner(executor)) {
747 >            executor.execute(new CheckedRunnable() {
748 >                public void realRun() throws InterruptedException {
749 >                    assertFalse(q.offer(three));
750 >                    threadsStarted.await();
751 >                    assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
752 >                    mustEqual(0, q.remainingCapacity());
753 >                }});
754 >
755 >            executor.execute(new CheckedRunnable() {
756 >                public void realRun() throws InterruptedException {
757 >                    threadsStarted.await();
758 >                    assertSame(one, q.take());
759 >                }});
760 >        }
761      }
762  
763      /**
764 <     * poll retrieves elements across Executor threads
764 >     * timed poll retrieves elements across Executor threads
765       */
766      public void testPollInExecutor() {
767 <        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
768 <        ExecutorService executor = Executors.newFixedThreadPool(2);
769 <        executor.execute(new CheckedRunnable() {
770 <            public void realRun() throws InterruptedException {
771 <                assertNull(q.poll());
772 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
773 <                assertTrue(q.isEmpty());
774 <            }});
775 <
776 <        executor.execute(new CheckedRunnable() {
777 <            public void realRun() throws InterruptedException {
778 <                Thread.sleep(SMALL_DELAY_MS);
779 <                q.put(one);
780 <            }});
781 <
782 <        joinPool(executor);
767 >        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
768 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
769 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
770 >        try (PoolCleaner cleaner = cleaner(executor)) {
771 >            executor.execute(new CheckedRunnable() {
772 >                public void realRun() throws InterruptedException {
773 >                    assertNull(q.poll());
774 >                    threadsStarted.await();
775 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
776 >                    checkEmpty(q);
777 >                }});
778 >
779 >            executor.execute(new CheckedRunnable() {
780 >                public void realRun() throws InterruptedException {
781 >                    threadsStarted.await();
782 >                    q.put(one);
783 >                }});
784 >        }
785      }
786  
787      /**
788 <     * A deserialized serialized queue has same elements in same order
788 >     * A deserialized/reserialized queue has same elements in same order
789       */
790      public void testSerialization() throws Exception {
791 <        LinkedBlockingQueue q = populatedQueue(SIZE);
792 <
780 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
781 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
782 <        out.writeObject(q);
783 <        out.close();
791 >        Queue<Item> x = populatedQueue(SIZE);
792 >        Queue<Item> y = serialClone(x);
793  
794 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
795 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
796 <        LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
797 <        assertEquals(q.size(), r.size());
798 <        while (!q.isEmpty())
799 <            assertEquals(q.remove(), r.remove());
800 <    }
801 <
802 <    /**
794 <     * drainTo(null) throws NPE
795 <     */
796 <    public void testDrainToNull() {
797 <        LinkedBlockingQueue q = populatedQueue(SIZE);
798 <        try {
799 <            q.drainTo(null);
800 <            shouldThrow();
801 <        } catch (NullPointerException success) {}
802 <    }
803 <
804 <    /**
805 <     * drainTo(this) throws IAE
806 <     */
807 <    public void testDrainToSelf() {
808 <        LinkedBlockingQueue q = populatedQueue(SIZE);
809 <        try {
810 <            q.drainTo(q);
811 <            shouldThrow();
812 <        } catch (IllegalArgumentException success) {}
794 >        assertNotSame(x, y);
795 >        mustEqual(x.size(), y.size());
796 >        mustEqual(x.toString(), y.toString());
797 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
798 >        while (!x.isEmpty()) {
799 >            assertFalse(y.isEmpty());
800 >            mustEqual(x.remove(), y.remove());
801 >        }
802 >        assertTrue(y.isEmpty());
803      }
804  
805      /**
806       * drainTo(c) empties queue into another collection c
807       */
808      public void testDrainTo() {
809 <        LinkedBlockingQueue q = populatedQueue(SIZE);
810 <        ArrayList l = new ArrayList();
809 >        LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
810 >        ArrayList<Item> l = new ArrayList<>();
811          q.drainTo(l);
812 <        assertEquals(q.size(), 0);
813 <        assertEquals(l.size(), SIZE);
812 >        mustEqual(0, q.size());
813 >        mustEqual(SIZE, l.size());
814          for (int i = 0; i < SIZE; ++i)
815 <            assertEquals(l.get(i), new Integer(i));
815 >            mustEqual(l.get(i), i);
816          q.add(zero);
817          q.add(one);
818          assertFalse(q.isEmpty());
819 <        assertTrue(q.contains(zero));
820 <        assertTrue(q.contains(one));
819 >        mustContain(q, zero);
820 >        mustContain(q, one);
821          l.clear();
822          q.drainTo(l);
823 <        assertEquals(q.size(), 0);
824 <        assertEquals(l.size(), 2);
823 >        mustEqual(0, q.size());
824 >        mustEqual(2, l.size());
825          for (int i = 0; i < 2; ++i)
826 <            assertEquals(l.get(i), new Integer(i));
826 >            mustEqual(l.get(i), i);
827      }
828  
829      /**
830       * drainTo empties full queue, unblocking a waiting put.
831       */
832      public void testDrainToWithActivePut() throws InterruptedException {
833 <        final LinkedBlockingQueue q = populatedQueue(SIZE);
833 >        final LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
834          Thread t = new Thread(new CheckedRunnable() {
835              public void realRun() throws InterruptedException {
836 <                q.put(new Integer(SIZE+1));
836 >                q.put(new Item(SIZE + 1));
837              }});
838  
839          t.start();
840 <        ArrayList l = new ArrayList();
840 >        ArrayList<Item> l = new ArrayList<>();
841          q.drainTo(l);
842          assertTrue(l.size() >= SIZE);
843          for (int i = 0; i < SIZE; ++i)
844 <            assertEquals(l.get(i), new Integer(i));
844 >            mustEqual(l.get(i), i);
845          t.join();
846          assertTrue(q.size() + l.size() >= SIZE);
847      }
848  
849      /**
860     * drainTo(null, n) throws NPE
861     */
862    public void testDrainToNullN() {
863        LinkedBlockingQueue q = populatedQueue(SIZE);
864        try {
865            q.drainTo(null, 0);
866            shouldThrow();
867        } catch (NullPointerException success) {}
868    }
869
870    /**
871     * drainTo(this, n) throws IAE
872     */
873    public void testDrainToSelfN() {
874        LinkedBlockingQueue q = populatedQueue(SIZE);
875        try {
876            q.drainTo(q, 0);
877            shouldThrow();
878        } catch (IllegalArgumentException success) {}
879    }
880
881    /**
850       * drainTo(c, n) empties first min(n, size) elements of queue into c
851       */
852      public void testDrainToN() {
853 <        LinkedBlockingQueue q = new LinkedBlockingQueue();
853 >        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>();
854          for (int i = 0; i < SIZE + 2; ++i) {
855              for (int j = 0; j < SIZE; j++)
856 <                assertTrue(q.offer(new Integer(j)));
857 <            ArrayList l = new ArrayList();
856 >                mustOffer(q, j);
857 >            ArrayList<Item> l = new ArrayList<>();
858              q.drainTo(l, i);
859              int k = (i < SIZE) ? i : SIZE;
860 <            assertEquals(l.size(), k);
861 <            assertEquals(q.size(), SIZE-k);
860 >            mustEqual(k, l.size());
861 >            mustEqual(SIZE - k, q.size());
862              for (int j = 0; j < k; ++j)
863 <                assertEquals(l.get(j), new Integer(j));
864 <            while (q.poll() != null) ;
863 >                mustEqual(l.get(j), j);
864 >            do {} while (q.poll() != null);
865 >        }
866 >    }
867 >
868 >    /**
869 >     * remove(null), contains(null) always return false
870 >     */
871 >    public void testNeverContainsNull() {
872 >        Collection<?>[] qs = {
873 >            new LinkedBlockingQueue<>(),
874 >            populatedQueue(2),
875 >        };
876 >
877 >        for (Collection<?> q : qs) {
878 >            assertFalse(q.contains(null));
879 >            assertFalse(q.remove(null));
880          }
881      }
882  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines