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

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.46 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.88 by jsr166, Wed Jan 27 02:55:18 2021 UTC

# Line 5 | Line 5
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11   import java.util.Arrays;
12 + import java.util.Collection;
13   import java.util.Iterator;
14   import java.util.List;
15   import java.util.NoSuchElementException;
16 < import java.util.concurrent.*;
17 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
18 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
16 > import java.util.Queue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.Callable;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.LinkedTransferQueue;
23 >
24   import junit.framework.Test;
23 import junit.framework.TestSuite;
25  
26   @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
27
28      public static class Generic extends BlockingQueueTest {
29          protected BlockingQueue emptyCollection() {
30              return new LinkedTransferQueue();
# Line 32 | Line 32 | public class LinkedTransferQueueTest ext
32      }
33  
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run(suite());
35 >        main(suite(), args);
36      }
37  
38      public static Test suite() {
39 +        class Implementation implements CollectionImplementation {
40 +            public Class<?> klazz() { return LinkedTransferQueue.class; }
41 +            public Collection emptyCollection() { return new LinkedTransferQueue(); }
42 +            public Object makeElement(int i) { return JSR166TestCase.itemFor(i); }
43 +            public boolean isConcurrent() { return true; }
44 +            public boolean permitsNulls() { return false; }
45 +        }
46          return newTestSuite(LinkedTransferQueueTest.class,
47 <                            new Generic().testSuite());
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
# Line 45 | Line 53 | public class LinkedTransferQueueTest ext
53       * being true
54       */
55      public void testConstructor1() {
56 <        assertEquals(0, new LinkedTransferQueue().size());
56 >        mustEqual(0, new LinkedTransferQueue().size());
57          assertTrue(new LinkedTransferQueue().isEmpty());
58      }
59  
# Line 65 | Line 73 | public class LinkedTransferQueueTest ext
73       * NullPointerException
74       */
75      public void testConstructor3() {
76 +        Collection<Item> elements = Arrays.asList(new Item[SIZE]);
77          try {
78 <            Integer[] ints = new Integer[SIZE];
70 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80          } catch (NullPointerException success) {}
81      }
# Line 77 | Line 85 | public class LinkedTransferQueueTest ext
85       * throws NullPointerException
86       */
87      public void testConstructor4() {
88 +        Item[] items = new Item[2];
89 +        items[0] = zero;
90 +        Collection<Item> elements = Arrays.asList(items);
91          try {
92 <            Integer[] ints = new Integer[SIZE];
82 <            for (int i = 0; i < SIZE - 1; ++i) {
83 <                ints[i] = i;
84 <            }
85 <            new LinkedTransferQueue(Arrays.asList(ints));
92 >            new LinkedTransferQueue(elements);
93              shouldThrow();
94          } catch (NullPointerException success) {}
95      }
# Line 91 | Line 98 | public class LinkedTransferQueueTest ext
98       * Queue contains all elements of the collection it is initialized by
99       */
100      public void testConstructor5() {
101 <        Integer[] ints = new Integer[SIZE];
102 <        for (int i = 0; i < SIZE; ++i) {
103 <            ints[i] = i;
104 <        }
105 <        List intList = Arrays.asList(ints);
99 <        LinkedTransferQueue q
100 <            = new LinkedTransferQueue(intList);
101 <        assertEquals(q.size(), intList.size());
102 <        assertEquals(q.toString(), intList.toString());
101 >        Item[] items = defaultItems;
102 >        List<Item> intList = Arrays.asList(items);
103 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>(intList);
104 >        mustEqual(q.size(), intList.size());
105 >        mustEqual(q.toString(), intList.toString());
106          assertTrue(Arrays.equals(q.toArray(),
107                                       intList.toArray()));
108          assertTrue(Arrays.equals(q.toArray(new Object[0]),
# Line 107 | Line 110 | public class LinkedTransferQueueTest ext
110          assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
111                                   intList.toArray(new Object[SIZE])));
112          for (int i = 0; i < SIZE; ++i) {
113 <            assertEquals(ints[i], q.poll());
113 >            mustEqual(items[i], q.poll());
114          }
115      }
116  
# Line 115 | Line 118 | public class LinkedTransferQueueTest ext
118       * remainingCapacity() always returns Integer.MAX_VALUE
119       */
120      public void testRemainingCapacity() {
121 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
121 >        BlockingQueue<Item> q = populatedQueue(SIZE);
122          for (int i = 0; i < SIZE; ++i) {
123 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
124 <            assertEquals(SIZE - i, q.size());
125 <            q.remove();
123 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
124 >            mustEqual(SIZE - i, q.size());
125 >            mustEqual(i, q.remove());
126          }
127          for (int i = 0; i < SIZE; ++i) {
128 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
129 <            assertEquals(i, q.size());
130 <            q.add(i);
128 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
129 >            mustEqual(i, q.size());
130 >            mustAdd(q, i);
131          }
132      }
133  
134      /**
132     * offer(null) throws NullPointerException
133     */
134    public void testOfferNull() {
135        try {
136            LinkedTransferQueue q = new LinkedTransferQueue();
137            q.offer(null);
138            shouldThrow();
139        } catch (NullPointerException success) {}
140    }
141
142    /**
143     * add(null) throws NullPointerException
144     */
145    public void testAddNull() {
146        try {
147            LinkedTransferQueue q = new LinkedTransferQueue();
148            q.add(null);
149            shouldThrow();
150        } catch (NullPointerException success) {}
151    }
152
153    /**
154     * addAll(null) throws NullPointerException
155     */
156    public void testAddAll1() {
157        try {
158            LinkedTransferQueue q = new LinkedTransferQueue();
159            q.addAll(null);
160            shouldThrow();
161        } catch (NullPointerException success) {}
162    }
163
164    /**
135       * addAll(this) throws IllegalArgumentException
136       */
137      public void testAddAllSelf() {
138 +        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
139          try {
169            LinkedTransferQueue q = populatedQueue(SIZE);
140              q.addAll(q);
141              shouldThrow();
142          } catch (IllegalArgumentException success) {}
143      }
144  
145      /**
176     * addAll of a collection with null elements throws NullPointerException
177     */
178    public void testAddAll2() {
179        try {
180            LinkedTransferQueue q = new LinkedTransferQueue();
181            Integer[] ints = new Integer[SIZE];
182            q.addAll(Arrays.asList(ints));
183            shouldThrow();
184        } catch (NullPointerException success) {}
185    }
186
187    /**
146       * addAll of a collection with any null elements throws
147       * NullPointerException after possibly adding some elements
148       */
149      public void testAddAll3() {
150 +        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
151 +        Item[] items = new Item[2]; items[0] = zero;
152          try {
153 <            LinkedTransferQueue q = new LinkedTransferQueue();
194 <            Integer[] ints = new Integer[SIZE];
195 <            for (int i = 0; i < SIZE - 1; ++i) {
196 <                ints[i] = i;
197 <            }
198 <            q.addAll(Arrays.asList(ints));
153 >            q.addAll(Arrays.asList(items));
154              shouldThrow();
155          } catch (NullPointerException success) {}
156      }
# Line 204 | Line 159 | public class LinkedTransferQueueTest ext
159       * Queue contains all elements, in traversal order, of successful addAll
160       */
161      public void testAddAll5() {
162 <        Integer[] empty = new Integer[0];
163 <        Integer[] ints = new Integer[SIZE];
209 <        for (int i = 0; i < SIZE; ++i) {
210 <            ints[i] = i;
211 <        }
162 >        Item[] empty = new Item[0];
163 >        Item[] items = defaultItems;
164          LinkedTransferQueue q = new LinkedTransferQueue();
165          assertFalse(q.addAll(Arrays.asList(empty)));
166 <        assertTrue(q.addAll(Arrays.asList(ints)));
166 >        assertTrue(q.addAll(Arrays.asList(items)));
167          for (int i = 0; i < SIZE; ++i) {
168 <            assertEquals(ints[i], q.poll());
168 >            mustEqual(items[i], q.poll());
169          }
170      }
171  
172      /**
221     * put(null) throws NullPointerException
222     */
223    public void testPutNull() throws InterruptedException {
224        try {
225            LinkedTransferQueue q = new LinkedTransferQueue();
226            q.put(null);
227            shouldThrow();
228        } catch (NullPointerException success) {}
229    }
230
231    /**
173       * all elements successfully put are contained
174       */
175      public void testPut() {
176 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
176 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
177 >        Item[] items = defaultItems;
178          for (int i = 0; i < SIZE; ++i) {
179 <            assertEquals(q.size(), i);
180 <            q.put(i);
181 <            assertTrue(q.contains(i));
179 >            mustEqual(i, q.size());
180 >            q.put(items[i]);
181 >            mustContain(q, items[i]);
182          }
183      }
184  
# Line 244 | Line 186 | public class LinkedTransferQueueTest ext
186       * take retrieves elements in FIFO order
187       */
188      public void testTake() throws InterruptedException {
189 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
189 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
190          for (int i = 0; i < SIZE; ++i) {
191 <            assertEquals(i, (int) q.take());
191 >            mustEqual(i, q.take());
192          }
193      }
194  
# Line 254 | Line 196 | public class LinkedTransferQueueTest ext
196       * take removes existing elements until empty, then blocks interruptibly
197       */
198      public void testBlockingTake() throws InterruptedException {
199 <        final BlockingQueue q = populatedQueue(SIZE);
199 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
200          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
201          Thread t = newStartedThread(new CheckedRunnable() {
202              public void realRun() throws InterruptedException {
203 <                for (int i = 0; i < SIZE; ++i) {
262 <                    assertEquals(i, q.take());
263 <                }
203 >                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
204  
205                  Thread.currentThread().interrupt();
206                  try {
# Line 278 | Line 218 | public class LinkedTransferQueueTest ext
218              }});
219  
220          await(pleaseInterrupt);
221 <        assertThreadStaysAlive(t);
221 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
222          t.interrupt();
223          awaitTermination(t);
224      }
# Line 287 | Line 227 | public class LinkedTransferQueueTest ext
227       * poll succeeds unless empty
228       */
229      public void testPoll() throws InterruptedException {
230 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
230 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
231          for (int i = 0; i < SIZE; ++i) {
232 <            assertEquals(i, (int) q.poll());
232 >            mustEqual(i, q.poll());
233          }
234          assertNull(q.poll());
235          checkEmpty(q);
# Line 299 | Line 239 | public class LinkedTransferQueueTest ext
239       * timed poll with zero timeout succeeds when non-empty, else times out
240       */
241      public void testTimedPoll0() throws InterruptedException {
242 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
242 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
243          for (int i = 0; i < SIZE; ++i) {
244 <            assertEquals(i, (int) q.poll(0, MILLISECONDS));
244 >            mustEqual(i, q.poll(0, MILLISECONDS));
245          }
246          assertNull(q.poll(0, MILLISECONDS));
247          checkEmpty(q);
# Line 311 | Line 251 | public class LinkedTransferQueueTest ext
251       * timed poll with nonzero timeout succeeds when non-empty, else times out
252       */
253      public void testTimedPoll() throws InterruptedException {
254 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
315 <        for (int i = 0; i < SIZE; ++i) {
316 <            long startTime = System.nanoTime();
317 <            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
318 <            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
319 <        }
254 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
255          long startTime = System.nanoTime();
256 +        for (int i = 0; i < SIZE; ++i)
257 +            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
258 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
259 +
260 +        startTime = System.nanoTime();
261          assertNull(q.poll(timeoutMillis(), MILLISECONDS));
262          assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
263          checkEmpty(q);
# Line 328 | Line 268 | public class LinkedTransferQueueTest ext
268       * returning timeout status
269       */
270      public void testInterruptedTimedPoll() throws InterruptedException {
271 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
272 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
271 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
272 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
273          Thread t = newStartedThread(new CheckedRunnable() {
274              public void realRun() throws InterruptedException {
275 <                for (int i = 0; i < SIZE; ++i) {
276 <                    long t0 = System.nanoTime();
277 <                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
278 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
279 <                }
280 <                long t0 = System.nanoTime();
281 <                aboutToWait.countDown();
275 >                for (int i = 0; i < SIZE; i++)
276 >                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
277 >
278 >                Thread.currentThread().interrupt();
279 >                try {
280 >                    q.poll(randomTimeout(), randomTimeUnit());
281 >                    shouldThrow();
282 >                } catch (InterruptedException success) {}
283 >                assertFalse(Thread.interrupted());
284 >
285 >                pleaseInterrupt.countDown();
286                  try {
287 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
287 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
288                      shouldThrow();
289 <                } catch (InterruptedException success) {
290 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
347 <                }
289 >                } catch (InterruptedException success) {}
290 >                assertFalse(Thread.interrupted());
291              }});
292  
293 <        aboutToWait.await();
294 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
293 >        await(pleaseInterrupt);
294 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
295          t.interrupt();
296 <        awaitTermination(t, MEDIUM_DELAY_MS);
296 >        awaitTermination(t);
297          checkEmpty(q);
298      }
299  
# Line 359 | Line 302 | public class LinkedTransferQueueTest ext
302       * instead of returning timeout status
303       */
304      public void testTimedPollAfterInterrupt() throws InterruptedException {
305 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
305 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
306          Thread t = newStartedThread(new CheckedRunnable() {
307              public void realRun() throws InterruptedException {
308                  Thread.currentThread().interrupt();
309 <                for (int i = 0; i < SIZE; ++i) {
310 <                    long t0 = System.nanoTime();
368 <                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
369 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
370 <                }
309 >                for (int i = 0; i < SIZE; ++i)
310 >                    mustEqual(i, q.poll(randomTimeout(), randomTimeUnit()));
311                  try {
312 <                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
312 >                    q.poll(randomTimeout(), randomTimeUnit());
313                      shouldThrow();
314                  } catch (InterruptedException success) {}
315 +                assertFalse(Thread.interrupted());
316              }});
317  
318 <        awaitTermination(t, MEDIUM_DELAY_MS);
318 >        awaitTermination(t);
319          checkEmpty(q);
320      }
321  
# Line 382 | Line 323 | public class LinkedTransferQueueTest ext
323       * peek returns next element, or null if empty
324       */
325      public void testPeek() throws InterruptedException {
326 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
326 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
327          for (int i = 0; i < SIZE; ++i) {
328 <            assertEquals(i, (int) q.peek());
329 <            assertEquals(i, (int) q.poll());
328 >            mustEqual(i, q.peek());
329 >            mustEqual(i, q.poll());
330              assertTrue(q.peek() == null ||
331 <                       i != (int) q.peek());
331 >                       i != q.peek().value);
332          }
333          assertNull(q.peek());
334          checkEmpty(q);
# Line 397 | Line 338 | public class LinkedTransferQueueTest ext
338       * element returns next element, or throws NoSuchElementException if empty
339       */
340      public void testElement() throws InterruptedException {
341 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
341 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
342          for (int i = 0; i < SIZE; ++i) {
343 <            assertEquals(i, (int) q.element());
344 <            assertEquals(i, (int) q.poll());
343 >            mustEqual(i, q.element());
344 >            mustEqual(i, q.poll());
345          }
346          try {
347              q.element();
# Line 413 | Line 354 | public class LinkedTransferQueueTest ext
354       * remove removes next element, or throws NoSuchElementException if empty
355       */
356      public void testRemove() throws InterruptedException {
357 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
357 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
358          for (int i = 0; i < SIZE; ++i) {
359 <            assertEquals(i, (int) q.remove());
359 >            mustEqual(i, q.remove());
360          }
361          try {
362              q.remove();
# Line 425 | Line 366 | public class LinkedTransferQueueTest ext
366      }
367  
368      /**
428     * remove(x) removes x and returns true if present
429     */
430    public void testRemoveElement() throws InterruptedException {
431        LinkedTransferQueue q = populatedQueue(SIZE);
432        for (int i = 1; i < SIZE; i+=2) {
433            assertTrue(q.contains(i));
434            assertTrue(q.remove(i));
435            assertFalse(q.contains(i));
436            assertTrue(q.contains(i-1));
437        }
438        for (int i = 0; i < SIZE; i+=2) {
439            assertTrue(q.contains(i));
440            assertTrue(q.remove(i));
441            assertFalse(q.contains(i));
442            assertFalse(q.remove(i+1));
443            assertFalse(q.contains(i+1));
444        }
445        checkEmpty(q);
446    }
447
448    /**
369       * An add following remove(x) succeeds
370       */
371      public void testRemoveElementAndAdd() throws InterruptedException {
372 <        LinkedTransferQueue q = new LinkedTransferQueue();
373 <        assertTrue(q.add(one));
374 <        assertTrue(q.add(two));
375 <        assertTrue(q.remove(one));
376 <        assertTrue(q.remove(two));
377 <        assertTrue(q.add(three));
378 <        assertSame(q.take(), three);
372 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
373 >        mustAdd(q, one);
374 >        mustAdd(q, two);
375 >        mustRemove(q, one);
376 >        mustRemove(q, two);
377 >        mustAdd(q, three);
378 >        mustEqual(q.take(), three);
379      }
380  
381      /**
382       * contains(x) reports true when elements added but not yet removed
383       */
384      public void testContains() {
385 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
385 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
386          for (int i = 0; i < SIZE; ++i) {
387 <            assertTrue(q.contains(i));
388 <            assertEquals(i, (int) q.poll());
389 <            assertFalse(q.contains(i));
387 >            mustContain(q, i);
388 >            mustEqual(i, q.poll());
389 >            mustNotContain(q, i);
390          }
391      }
392  
# Line 474 | Line 394 | public class LinkedTransferQueueTest ext
394       * clear removes all elements
395       */
396      public void testClear() throws InterruptedException {
397 <        LinkedTransferQueue q = populatedQueue(SIZE);
397 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
398          q.clear();
399          checkEmpty(q);
400 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
400 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
401          q.add(one);
402          assertFalse(q.isEmpty());
403 <        assertEquals(1, q.size());
404 <        assertTrue(q.contains(one));
403 >        mustEqual(1, q.size());
404 >        mustContain(q, one);
405          q.clear();
406          checkEmpty(q);
407      }
# Line 490 | Line 410 | public class LinkedTransferQueueTest ext
410       * containsAll(c) is true when c contains a subset of elements
411       */
412      public void testContainsAll() {
413 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
414 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
413 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
414 >        LinkedTransferQueue<Item> p = new LinkedTransferQueue<>();
415          for (int i = 0; i < SIZE; ++i) {
416              assertTrue(q.containsAll(p));
417              assertFalse(p.containsAll(q));
418 <            p.add(i);
418 >            mustAdd(p, i);
419          }
420          assertTrue(p.containsAll(q));
421      }
# Line 505 | Line 425 | public class LinkedTransferQueueTest ext
425       * if changed
426       */
427      public void testRetainAll() {
428 <        LinkedTransferQueue q = populatedQueue(SIZE);
429 <        LinkedTransferQueue p = populatedQueue(SIZE);
428 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
429 >        LinkedTransferQueue<Item> p = populatedQueue(SIZE);
430          for (int i = 0; i < SIZE; ++i) {
431              boolean changed = q.retainAll(p);
432              if (i == 0) {
# Line 515 | Line 435 | public class LinkedTransferQueueTest ext
435                  assertTrue(changed);
436              }
437              assertTrue(q.containsAll(p));
438 <            assertEquals(SIZE - i, q.size());
438 >            mustEqual(SIZE - i, q.size());
439              p.remove();
440          }
441      }
# Line 526 | Line 446 | public class LinkedTransferQueueTest ext
446       */
447      public void testRemoveAll() {
448          for (int i = 1; i < SIZE; ++i) {
449 <            LinkedTransferQueue q = populatedQueue(SIZE);
450 <            LinkedTransferQueue p = populatedQueue(i);
449 >            LinkedTransferQueue<Item> q = populatedQueue(SIZE);
450 >            LinkedTransferQueue<Item> p = populatedQueue(i);
451              assertTrue(q.removeAll(p));
452 <            assertEquals(SIZE - i, q.size());
452 >            mustEqual(SIZE - i, q.size());
453              for (int j = 0; j < i; ++j) {
454 <                assertFalse(q.contains(p.remove()));
454 >                mustNotContain(q, p.remove());
455              }
456          }
457      }
# Line 540 | Line 460 | public class LinkedTransferQueueTest ext
460       * toArray() contains all elements in FIFO order
461       */
462      public void testToArray() {
463 <        LinkedTransferQueue q = populatedQueue(SIZE);
464 <        Object[] o = q.toArray();
465 <        for (int i = 0; i < o.length; i++) {
466 <            assertSame(o[i], q.poll());
467 <        }
463 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
464 >        Object[] a = q.toArray();
465 >        assertSame(Object[].class, a.getClass());
466 >        for (Object o : a)
467 >            assertSame(o, q.poll());
468 >        assertTrue(q.isEmpty());
469      }
470  
471      /**
472       * toArray(a) contains all elements in FIFO order
473       */
474      public void testToArray2() {
475 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
476 <        Integer[] ints = new Integer[SIZE];
477 <        Integer[] array = q.toArray(ints);
478 <        assertSame(ints, array);
479 <        for (int i = 0; i < ints.length; i++) {
480 <            assertSame(ints[i], q.poll());
481 <        }
561 <    }
562 <
563 <    /**
564 <     * toArray(null) throws NullPointerException
565 <     */
566 <    public void testToArray_NullArg() {
567 <        LinkedTransferQueue q = populatedQueue(SIZE);
568 <        try {
569 <            q.toArray(null);
570 <            shouldThrow();
571 <        } catch (NullPointerException success) {}
475 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
476 >        Item[] items = new Item[SIZE];
477 >        Item[] array = q.toArray(items);
478 >        assertSame(items, array);
479 >        for (Item o : items)
480 >            assertSame(o, q.poll());
481 >        assertTrue(q.isEmpty());
482      }
483  
484      /**
485       * toArray(incompatible array type) throws ArrayStoreException
486       */
487 <    public void testToArray1_BadArg() {
488 <        LinkedTransferQueue q = populatedQueue(SIZE);
487 >    @SuppressWarnings("CollectionToArraySafeParameter")
488 >    public void testToArray_incompatibleArrayType() {
489 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
490          try {
491              q.toArray(new String[10]);
492              shouldThrow();
# Line 586 | Line 497 | public class LinkedTransferQueueTest ext
497       * iterator iterates through all elements
498       */
499      public void testIterator() throws InterruptedException {
500 <        LinkedTransferQueue q = populatedQueue(SIZE);
501 <        Iterator it = q.iterator();
502 <        int i = 0;
503 <        while (it.hasNext()) {
504 <            assertEquals(it.next(), i++);
505 <        }
506 <        assertEquals(i, SIZE);
500 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
501 >        Iterator<? extends Item> it = q.iterator();
502 >        int i;
503 >        for (i = 0; it.hasNext(); i++)
504 >            mustContain(q, it.next());
505 >        mustEqual(i, SIZE);
506 >        assertIteratorExhausted(it);
507 >
508 >        it = q.iterator();
509 >        for (i = 0; it.hasNext(); i++)
510 >            mustEqual(it.next(), q.take());
511 >        mustEqual(i, SIZE);
512 >        assertIteratorExhausted(it);
513 >    }
514 >
515 >    /**
516 >     * iterator of empty collection has no elements
517 >     */
518 >    public void testEmptyIterator() {
519 >        assertIteratorExhausted(new LinkedTransferQueue().iterator());
520      }
521  
522      /**
523       * iterator.remove() removes current element
524       */
525      public void testIteratorRemove() {
526 <        final LinkedTransferQueue q = new LinkedTransferQueue();
526 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
527          q.add(two);
528          q.add(one);
529          q.add(three);
530  
531 <        Iterator it = q.iterator();
531 >        Iterator<? extends Item> it = q.iterator();
532          it.next();
533          it.remove();
534  
# Line 618 | Line 542 | public class LinkedTransferQueueTest ext
542       * iterator ordering is FIFO
543       */
544      public void testIteratorOrdering() {
545 <        final LinkedTransferQueue<Integer> q
546 <            = new LinkedTransferQueue<Integer>();
623 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
545 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
546 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
547          q.add(one);
548          q.add(two);
549          q.add(three);
550 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
550 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
551          int k = 0;
552 <        for (Integer n : q) {
553 <            assertEquals(++k, (int) n);
552 >        for (Item n : q) {
553 >            mustEqual(++k, n);
554          }
555 <        assertEquals(3, k);
555 >        mustEqual(3, k);
556      }
557  
558      /**
559       * Modifications do not cause iterators to fail
560       */
561      public void testWeaklyConsistentIteration() {
562 <        final LinkedTransferQueue q = new LinkedTransferQueue();
562 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
563          q.add(one);
564          q.add(two);
565          q.add(three);
566 <        for (Iterator it = q.iterator(); it.hasNext();) {
566 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
567              q.remove();
568              it.next();
569          }
570 <        assertEquals(0, q.size());
570 >        mustEqual(0, q.size());
571      }
572  
573      /**
574       * toString contains toStrings of elements
575       */
576      public void testToString() {
577 <        LinkedTransferQueue q = populatedQueue(SIZE);
577 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
578          String s = q.toString();
579          for (int i = 0; i < SIZE; ++i) {
580              assertTrue(s.contains(String.valueOf(i)));
# Line 662 | Line 585 | public class LinkedTransferQueueTest ext
585       * offer transfers elements across Executor tasks
586       */
587      public void testOfferInExecutor() {
588 <        final LinkedTransferQueue q = new LinkedTransferQueue();
588 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
589          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
590 <        ExecutorService executor = Executors.newFixedThreadPool(2);
591 <
669 <        executor.execute(new CheckedRunnable() {
670 <            public void realRun() throws InterruptedException {
671 <                threadsStarted.await();
672 <                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
673 <            }});
590 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
591 >        try (PoolCleaner cleaner = cleaner(executor)) {
592  
593 <        executor.execute(new CheckedRunnable() {
594 <            public void realRun() throws InterruptedException {
595 <                threadsStarted.await();
596 <                assertSame(one, q.take());
597 <                checkEmpty(q);
598 <            }});
593 >            executor.execute(new CheckedRunnable() {
594 >                public void realRun() throws InterruptedException {
595 >                    threadsStarted.await();
596 >                    long startTime = System.nanoTime();
597 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
598 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
599 >                }});
600  
601 <        joinPool(executor);
601 >            executor.execute(new CheckedRunnable() {
602 >                public void realRun() throws InterruptedException {
603 >                    threadsStarted.await();
604 >                    assertSame(one, q.take());
605 >                    checkEmpty(q);
606 >                }});
607 >        }
608      }
609  
610      /**
611       * timed poll retrieves elements across Executor threads
612       */
613      public void testPollInExecutor() {
614 <        final LinkedTransferQueue q = new LinkedTransferQueue();
614 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
615          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
616 <        ExecutorService executor = Executors.newFixedThreadPool(2);
616 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
617 >        try (PoolCleaner cleaner = cleaner(executor)) {
618  
619 <        executor.execute(new CheckedRunnable() {
620 <            public void realRun() throws InterruptedException {
621 <                assertNull(q.poll());
622 <                threadsStarted.await();
623 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
624 <                checkEmpty(q);
625 <            }});
626 <
627 <        executor.execute(new CheckedRunnable() {
702 <            public void realRun() throws InterruptedException {
703 <                threadsStarted.await();
704 <                q.put(one);
705 <            }});
619 >            executor.execute(new CheckedRunnable() {
620 >                public void realRun() throws InterruptedException {
621 >                    assertNull(q.poll());
622 >                    threadsStarted.await();
623 >                    long startTime = System.nanoTime();
624 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
625 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
626 >                    checkEmpty(q);
627 >                }});
628  
629 <        joinPool(executor);
629 >            executor.execute(new CheckedRunnable() {
630 >                public void realRun() throws InterruptedException {
631 >                    threadsStarted.await();
632 >                    q.put(one);
633 >                }});
634 >        }
635      }
636  
637      /**
638 <     * A deserialized serialized queue has same elements in same order
638 >     * A deserialized/reserialized queue has same elements in same order
639       */
640      public void testSerialization() throws Exception {
641 <        LinkedTransferQueue q = populatedQueue(SIZE);
641 >        Queue<Item> x = populatedQueue(SIZE);
642 >        Queue<Item> y = serialClone(x);
643  
644 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
645 <        ObjectOutputStream out
646 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
647 <        out.writeObject(q);
648 <        out.close();
649 <
650 <        ByteArrayInputStream bin
723 <            = new ByteArrayInputStream(bout.toByteArray());
724 <        ObjectInputStream in
725 <            = new ObjectInputStream(new BufferedInputStream(bin));
726 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
727 <
728 <        assertEquals(q.size(), r.size());
729 <        assertEquals(q.toString(), r.toString());
730 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
731 <        while (!q.isEmpty()) {
732 <            assertEquals(q.remove(), r.remove());
644 >        assertNotSame(y, x);
645 >        mustEqual(x.size(), y.size());
646 >        mustEqual(x.toString(), y.toString());
647 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
648 >        while (!x.isEmpty()) {
649 >            assertFalse(y.isEmpty());
650 >            mustEqual(x.remove(), y.remove());
651          }
652 <    }
735 <
736 <    /**
737 <     * drainTo(null) throws NullPointerException
738 <     */
739 <    public void testDrainToNull() {
740 <        LinkedTransferQueue q = populatedQueue(SIZE);
741 <        try {
742 <            q.drainTo(null);
743 <            shouldThrow();
744 <        } catch (NullPointerException success) {}
745 <    }
746 <
747 <    /**
748 <     * drainTo(this) throws IllegalArgumentException
749 <     */
750 <    public void testDrainToSelf() {
751 <        LinkedTransferQueue q = populatedQueue(SIZE);
752 <        try {
753 <            q.drainTo(q);
754 <            shouldThrow();
755 <        } catch (IllegalArgumentException success) {}
652 >        assertTrue(y.isEmpty());
653      }
654  
655      /**
656       * drainTo(c) empties queue into another collection c
657       */
658      public void testDrainTo() {
659 <        LinkedTransferQueue q = populatedQueue(SIZE);
659 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
660          ArrayList l = new ArrayList();
661          q.drainTo(l);
662 <        assertEquals(q.size(), 0);
663 <        assertEquals(l.size(), SIZE);
662 >        mustEqual(0, q.size());
663 >        mustEqual(SIZE, l.size());
664          for (int i = 0; i < SIZE; ++i) {
665 <            assertEquals(l.get(i), i);
665 >            mustEqual(i, l.get(i));
666          }
667          q.add(zero);
668          q.add(one);
669          assertFalse(q.isEmpty());
670 <        assertTrue(q.contains(zero));
671 <        assertTrue(q.contains(one));
670 >        mustContain(q, zero);
671 >        mustContain(q, one);
672          l.clear();
673          q.drainTo(l);
674 <        assertEquals(q.size(), 0);
675 <        assertEquals(l.size(), 2);
674 >        mustEqual(0, q.size());
675 >        mustEqual(2, l.size());
676          for (int i = 0; i < 2; ++i) {
677 <            assertEquals(l.get(i), i);
677 >            mustEqual(i, l.get(i));
678          }
679      }
680  
# Line 785 | Line 682 | public class LinkedTransferQueueTest ext
682       * drainTo(c) empties full queue, unblocking a waiting put.
683       */
684      public void testDrainToWithActivePut() throws InterruptedException {
685 <        final LinkedTransferQueue q = populatedQueue(SIZE);
685 >        final LinkedTransferQueue<Item> q = populatedQueue(SIZE);
686          Thread t = newStartedThread(new CheckedRunnable() {
687              public void realRun() {
688 <                q.put(SIZE + 1);
688 >                q.put(new Item(SIZE + 1));
689              }});
690          ArrayList l = new ArrayList();
691          q.drainTo(l);
692          assertTrue(l.size() >= SIZE);
693 <        for (int i = 0; i < SIZE; ++i) {
694 <            assertEquals(l.get(i), i);
695 <        }
799 <        awaitTermination(t, MEDIUM_DELAY_MS);
693 >        for (int i = 0; i < SIZE; ++i)
694 >            mustEqual(i, l.get(i));
695 >        awaitTermination(t);
696          assertTrue(q.size() + l.size() >= SIZE);
697      }
698  
699      /**
804     * drainTo(null, n) throws NullPointerException
805     */
806    public void testDrainToNullN() {
807        LinkedTransferQueue q = populatedQueue(SIZE);
808        try {
809            q.drainTo(null, SIZE);
810            shouldThrow();
811        } catch (NullPointerException success) {}
812    }
813
814    /**
815     * drainTo(this, n) throws IllegalArgumentException
816     */
817    public void testDrainToSelfN() {
818        LinkedTransferQueue q = populatedQueue(SIZE);
819        try {
820            q.drainTo(q, SIZE);
821            shouldThrow();
822        } catch (IllegalArgumentException success) {}
823    }
824
825    /**
700       * drainTo(c, n) empties first min(n, size) elements of queue into c
701       */
702      public void testDrainToN() {
703 <        LinkedTransferQueue q = new LinkedTransferQueue();
703 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
704          for (int i = 0; i < SIZE + 2; ++i) {
705              for (int j = 0; j < SIZE; j++) {
706 <                assertTrue(q.offer(j));
706 >                mustOffer(q, j);
707              }
708              ArrayList l = new ArrayList();
709              q.drainTo(l, i);
710              int k = (i < SIZE) ? i : SIZE;
711 <            assertEquals(l.size(), k);
712 <            assertEquals(q.size(), SIZE - k);
713 <            for (int j = 0; j < k; ++j) {
714 <                assertEquals(l.get(j), j);
715 <            }
842 <            while (q.poll() != null)
843 <                ;
711 >            mustEqual(k, l.size());
712 >            mustEqual(SIZE - k, q.size());
713 >            for (int j = 0; j < k; ++j)
714 >                mustEqual(j, l.get(j));
715 >            do {} while (q.poll() != null);
716          }
717      }
718  
# Line 849 | Line 721 | public class LinkedTransferQueueTest ext
721       * offer(e) decrements the waiting consumer count
722       */
723      public void testWaitingConsumer() throws InterruptedException {
724 <        final LinkedTransferQueue q = new LinkedTransferQueue();
725 <        assertEquals(q.getWaitingConsumerCount(), 0);
724 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
725 >        mustEqual(0, q.getWaitingConsumerCount());
726          assertFalse(q.hasWaitingConsumer());
727          final CountDownLatch threadStarted = new CountDownLatch(1);
728  
729          Thread t = newStartedThread(new CheckedRunnable() {
730              public void realRun() throws InterruptedException {
731                  threadStarted.countDown();
732 +                long startTime = System.nanoTime();
733                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
734 <                assertEquals(q.getWaitingConsumerCount(), 0);
734 >                mustEqual(0, q.getWaitingConsumerCount());
735                  assertFalse(q.hasWaitingConsumer());
736 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
737              }});
738  
739          threadStarted.await();
740 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
741 <        assertEquals(q.getWaitingConsumerCount(), 1);
742 <        assertTrue(q.hasWaitingConsumer());
740 >        Callable<Boolean> oneConsumer = new Callable<>() {
741 >            public Boolean call() {
742 >                return q.hasWaitingConsumer()
743 >                && q.getWaitingConsumerCount() == 1; }};
744 >        waitForThreadToEnterWaitState(t, oneConsumer);
745  
746          assertTrue(q.offer(one));
747 <        assertEquals(q.getWaitingConsumerCount(), 0);
747 >        mustEqual(0, q.getWaitingConsumerCount());
748          assertFalse(q.hasWaitingConsumer());
749  
750 <        awaitTermination(t, MEDIUM_DELAY_MS);
750 >        awaitTermination(t);
751      }
752  
753      /**
# Line 879 | Line 755 | public class LinkedTransferQueueTest ext
755       */
756      public void testTransfer1() throws InterruptedException {
757          try {
758 <            LinkedTransferQueue q = new LinkedTransferQueue();
758 >            LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
759              q.transfer(null);
760              shouldThrow();
761          } catch (NullPointerException success) {}
762      }
763  
764      /**
765 <     * transfer waits until a poll occurs. The transfered element
766 <     * is returned by this associated poll.
765 >     * transfer waits until a poll occurs. The transferred element
766 >     * is returned by the associated poll.
767       */
768      public void testTransfer2() throws InterruptedException {
769 <        final LinkedTransferQueue<Integer> q
894 <            = new LinkedTransferQueue<Integer>();
769 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
770          final CountDownLatch threadStarted = new CountDownLatch(1);
771  
772          Thread t = newStartedThread(new CheckedRunnable() {
# Line 902 | Line 777 | public class LinkedTransferQueueTest ext
777              }});
778  
779          threadStarted.await();
780 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
781 <        assertEquals(1, q.size());
780 >        Callable<Boolean> oneElement = new Callable<>() {
781 >            public Boolean call() {
782 >                return !q.isEmpty() && q.size() == 1; }};
783 >        waitForThreadToEnterWaitState(t, oneElement);
784 >
785          assertSame(five, q.poll());
786          checkEmpty(q);
787 <        awaitTermination(t, MEDIUM_DELAY_MS);
787 >        awaitTermination(t);
788      }
789  
790      /**
791       * transfer waits until a poll occurs, and then transfers in fifo order
792       */
793      public void testTransfer3() throws InterruptedException {
794 <        final LinkedTransferQueue<Integer> q
917 <            = new LinkedTransferQueue<Integer>();
794 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
795  
796          Thread first = newStartedThread(new CheckedRunnable() {
797              public void realRun() throws InterruptedException {
798                  q.transfer(four);
799 <                assertTrue(!q.contains(four));
800 <                assertEquals(1, q.size());
799 >                mustNotContain(q, four);
800 >                mustEqual(1, q.size());
801              }});
802  
803          Thread interruptedThread = newStartedThread(
# Line 933 | Line 810 | public class LinkedTransferQueueTest ext
810  
811          while (q.size() < 2)
812              Thread.yield();
813 <        assertEquals(2, q.size());
813 >        mustEqual(2, q.size());
814          assertSame(four, q.poll());
815          first.join();
816 <        assertEquals(1, q.size());
816 >        mustEqual(1, q.size());
817          interruptedThread.interrupt();
818          interruptedThread.join();
819          checkEmpty(q);
# Line 947 | Line 824 | public class LinkedTransferQueueTest ext
824       * thread returns the element
825       */
826      public void testTransfer4() throws InterruptedException {
827 <        final LinkedTransferQueue q = new LinkedTransferQueue();
827 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
828  
829          Thread t = newStartedThread(new CheckedRunnable() {
830              public void realRun() throws InterruptedException {
831                  q.transfer(four);
832 <                assertFalse(q.contains(four));
832 >                mustNotContain(q, four);
833                  assertSame(three, q.poll());
834              }});
835  
836          while (q.isEmpty())
837              Thread.yield();
838          assertFalse(q.isEmpty());
839 <        assertEquals(1, q.size());
839 >        mustEqual(1, q.size());
840          assertTrue(q.offer(three));
841          assertSame(four, q.poll());
842 <        awaitTermination(t, MEDIUM_DELAY_MS);
842 >        awaitTermination(t);
843      }
844  
845      /**
846 <     * transfer waits until a take occurs. The transfered element
847 <     * is returned by this associated take.
846 >     * transfer waits until a take occurs. The transferred element
847 >     * is returned by the associated take.
848       */
849      public void testTransfer5() throws InterruptedException {
850 <        final LinkedTransferQueue<Integer> q
974 <            = new LinkedTransferQueue<Integer>();
850 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
851  
852          Thread t = newStartedThread(new CheckedRunnable() {
853              public void realRun() throws InterruptedException {
# Line 982 | Line 858 | public class LinkedTransferQueueTest ext
858          while (q.isEmpty())
859              Thread.yield();
860          assertFalse(q.isEmpty());
861 <        assertEquals(1, q.size());
861 >        mustEqual(1, q.size());
862          assertSame(four, q.take());
863          checkEmpty(q);
864 <        awaitTermination(t, MEDIUM_DELAY_MS);
864 >        awaitTermination(t);
865      }
866  
867      /**
868       * tryTransfer(null) throws NullPointerException
869       */
870      public void testTryTransfer1() {
871 +        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
872          try {
996            final LinkedTransferQueue q = new LinkedTransferQueue();
873              q.tryTransfer(null);
874              shouldThrow();
875          } catch (NullPointerException success) {}
# Line 1004 | Line 880 | public class LinkedTransferQueueTest ext
880       * consumers waiting to poll or take.
881       */
882      public void testTryTransfer2() throws InterruptedException {
883 <        final LinkedTransferQueue q = new LinkedTransferQueue();
883 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
884          assertFalse(q.tryTransfer(new Object()));
885          assertFalse(q.hasWaitingConsumer());
886          checkEmpty(q);
# Line 1016 | Line 892 | public class LinkedTransferQueueTest ext
892       */
893      public void testTryTransfer3() throws InterruptedException {
894          final Object hotPotato = new Object();
895 <        final LinkedTransferQueue q = new LinkedTransferQueue();
895 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
896  
897          Thread t = newStartedThread(new CheckedRunnable() {
898              public void realRun() {
# Line 1027 | Line 903 | public class LinkedTransferQueueTest ext
903                  assertTrue(q.tryTransfer(hotPotato));
904              }});
905  
906 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
906 >        long startTime = System.nanoTime();
907 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
908 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
909          checkEmpty(q);
910 <        awaitTermination(t, MEDIUM_DELAY_MS);
910 >        awaitTermination(t);
911      }
912  
913      /**
# Line 1038 | Line 916 | public class LinkedTransferQueueTest ext
916       */
917      public void testTryTransfer4() throws InterruptedException {
918          final Object hotPotato = new Object();
919 <        final LinkedTransferQueue q = new LinkedTransferQueue();
919 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
920  
921          Thread t = newStartedThread(new CheckedRunnable() {
922              public void realRun() {
# Line 1051 | Line 929 | public class LinkedTransferQueueTest ext
929  
930          assertSame(q.take(), hotPotato);
931          checkEmpty(q);
932 <        awaitTermination(t, MEDIUM_DELAY_MS);
932 >        awaitTermination(t);
933      }
934  
935      /**
936       * tryTransfer blocks interruptibly if no takers
937       */
938      public void testTryTransfer5() throws InterruptedException {
939 <        final LinkedTransferQueue q = new LinkedTransferQueue();
939 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
940          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
941          assertTrue(q.isEmpty());
942  
# Line 1066 | Line 944 | public class LinkedTransferQueueTest ext
944              public void realRun() throws InterruptedException {
945                  Thread.currentThread().interrupt();
946                  try {
947 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
947 >                    q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit());
948                      shouldThrow();
949                  } catch (InterruptedException success) {}
950                  assertFalse(Thread.interrupted());
951  
952                  pleaseInterrupt.countDown();
953                  try {
954 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
954 >                    q.tryTransfer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
955                      shouldThrow();
956                  } catch (InterruptedException success) {}
957                  assertFalse(Thread.interrupted());
958              }});
959  
960          await(pleaseInterrupt);
961 <        assertThreadStaysAlive(t);
961 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
962          t.interrupt();
963          awaitTermination(t);
964          checkEmpty(q);
# Line 1090 | Line 968 | public class LinkedTransferQueueTest ext
968       * tryTransfer gives up after the timeout and returns false
969       */
970      public void testTryTransfer6() throws InterruptedException {
971 <        final LinkedTransferQueue q = new LinkedTransferQueue();
971 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
972  
973          Thread t = newStartedThread(new CheckedRunnable() {
974              public void realRun() throws InterruptedException {
975 <                long t0 = System.nanoTime();
975 >                long startTime = System.nanoTime();
976                  assertFalse(q.tryTransfer(new Object(),
977                                            timeoutMillis(), MILLISECONDS));
978 <                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
978 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
979                  checkEmpty(q);
980              }});
981  
# Line 1110 | Line 988 | public class LinkedTransferQueueTest ext
988       * before transfering to a poll or take
989       */
990      public void testTryTransfer7() throws InterruptedException {
991 <        final LinkedTransferQueue q = new LinkedTransferQueue();
991 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
992          assertTrue(q.offer(four));
993  
994          Thread t = newStartedThread(new CheckedRunnable() {
995              public void realRun() throws InterruptedException {
996 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
996 >                long startTime = System.nanoTime();
997 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
998 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
999                  checkEmpty(q);
1000              }});
1001  
1002          while (q.size() != 2)
1003              Thread.yield();
1004 <        assertEquals(2, q.size());
1004 >        mustEqual(2, q.size());
1005          assertSame(four, q.poll());
1006          assertSame(five, q.poll());
1007          checkEmpty(q);
1008 <        awaitTermination(t, MEDIUM_DELAY_MS);
1008 >        awaitTermination(t);
1009      }
1010  
1011      /**
# Line 1133 | Line 1013 | public class LinkedTransferQueueTest ext
1013       * returning false not enqueueing and the successive poll is null
1014       */
1015      public void testTryTransfer8() throws InterruptedException {
1016 <        final LinkedTransferQueue q = new LinkedTransferQueue();
1016 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
1017          assertTrue(q.offer(four));
1018 <        assertEquals(1, q.size());
1019 <        long t0 = System.nanoTime();
1018 >        mustEqual(1, q.size());
1019 >        long startTime = System.nanoTime();
1020          assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1021 <        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1022 <        assertEquals(1, q.size());
1021 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1022 >        mustEqual(1, q.size());
1023          assertSame(four, q.poll());
1024          assertNull(q.poll());
1025          checkEmpty(q);
1026      }
1027  
1028 <    private LinkedTransferQueue<Integer> populatedQueue(int n) {
1029 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1028 >    private LinkedTransferQueue<Item> populatedQueue(int n) {
1029 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
1030          checkEmpty(q);
1031          for (int i = 0; i < n; i++) {
1032 <            assertEquals(i, q.size());
1033 <            assertTrue(q.offer(i));
1034 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
1032 >            mustEqual(i, q.size());
1033 >            mustOffer(q, i);
1034 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
1035          }
1036          assertFalse(q.isEmpty());
1037          return q;
1038      }
1039 +
1040 +    /**
1041 +     * remove(null), contains(null) always return false
1042 +     */
1043 +    public void testNeverContainsNull() {
1044 +        Collection<?>[] qs = {
1045 +            new LinkedTransferQueue<>(),
1046 +            populatedQueue(2),
1047 +        };
1048 +
1049 +        for (Collection<?> q : qs) {
1050 +            assertFalse(q.contains(null));
1051 +            assertFalse(q.remove(null));
1052 +        }
1053 +    }
1054   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines