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.5 by jsr166, Sun Aug 2 08:17:31 2009 UTC vs.
Revision 1.71 by jsr166, Sat Mar 18 20:42:20 2017 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include 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.ConcurrentModificationException;
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.*;
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;
21 import junit.framework.TestSuite;
25  
26 + @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new LinkedTransferQueue();
31 +        }
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 <        return new TestSuite(LinkedTransferQueueTest.class);
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 i; }
43 >            public boolean isConcurrent() { return true; }
44 >            public boolean permitsNulls() { return false; }
45 >        }
46 >        return newTestSuite(LinkedTransferQueueTest.class,
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
52 <     * Constructor builds new queue with size being zero and empty being true
52 >     * Constructor builds new queue with size being zero and empty
53 >     * being true
54       */
55      public void testConstructor1() {
56          assertEquals(0, new LinkedTransferQueue().size());
# Line 39 | Line 58 | public class LinkedTransferQueueTest ext
58      }
59  
60      /**
61 <     * Initializing constructor with null collection throws NullPointerException
61 >     * Initializing constructor with null collection throws
62 >     * NullPointerException
63       */
64      public void testConstructor2() {
65          try {
66              new LinkedTransferQueue(null);
67              shouldThrow();
68 <        } catch (NullPointerException success) {
49 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
71      /**
72 <     * Initializing from Collection of null elements throws NullPointerException
72 >     * Initializing from Collection of null elements throws
73 >     * NullPointerException
74       */
75      public void testConstructor3() {
76 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
77          try {
78 <            Integer[] ints = new Integer[SIZE];
58 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80 <        } catch (NullPointerException success) {
61 <        }
80 >        } catch (NullPointerException success) {}
81      }
82  
83      /**
# Line 66 | Line 85 | public class LinkedTransferQueueTest ext
85       * throws NullPointerException
86       */
87      public void testConstructor4() {
88 +        Integer[] ints = new Integer[SIZE];
89 +        for (int i = 0; i < SIZE - 1; ++i)
90 +            ints[i] = i;
91 +        Collection<Integer> elements = Arrays.asList(ints);
92          try {
93 <            Integer[] ints = new Integer[SIZE];
71 <            for (int i = 0; i < SIZE - 1; ++i) {
72 <                ints[i] = i;
73 <            }
74 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95 <        } catch (NullPointerException success) {
77 <        }
95 >        } catch (NullPointerException success) {}
96      }
97  
98      /**
99       * Queue contains all elements of the collection it is initialized by
100       */
101      public void testConstructor5() {
102 <        try {
103 <            Integer[] ints = new Integer[SIZE];
104 <            for (int i = 0; i < SIZE; ++i) {
105 <                ints[i] = i;
106 <            }
107 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
108 <            for (int i = 0; i < SIZE; ++i) {
109 <                assertEquals(ints[i], q.poll());
110 <            }
111 <        } finally {
102 >        Integer[] ints = new Integer[SIZE];
103 >        for (int i = 0; i < SIZE; ++i) {
104 >            ints[i] = i;
105 >        }
106 >        List intList = Arrays.asList(ints);
107 >        LinkedTransferQueue q
108 >            = new LinkedTransferQueue(intList);
109 >        assertEquals(q.size(), intList.size());
110 >        assertEquals(q.toString(), intList.toString());
111 >        assertTrue(Arrays.equals(q.toArray(),
112 >                                     intList.toArray()));
113 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
114 >                                 intList.toArray(new Object[0])));
115 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
116 >                                 intList.toArray(new Object[SIZE])));
117 >        for (int i = 0; i < SIZE; ++i) {
118 >            assertEquals(ints[i], q.poll());
119          }
120      }
121  
122      /**
123 <     * Remaining capacity never decrease nor increase on add or remove
123 >     * remainingCapacity() always returns Integer.MAX_VALUE
124       */
125      public void testRemainingCapacity() {
126 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
126 >        BlockingQueue q = populatedQueue(SIZE);
127          for (int i = 0; i < SIZE; ++i) {
128              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
129              assertEquals(SIZE - i, q.size());
130 <            q.remove();
130 >            assertEquals(i, q.remove());
131          }
132          for (int i = 0; i < SIZE; ++i) {
133              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
134              assertEquals(i, q.size());
135 <            q.add(i);
111 <        }
112 <    }
113 <
114 <    /**
115 <     * offer(null) throws NullPointerException
116 <     */
117 <    public void testOfferNull() {
118 <        try {
119 <            LinkedTransferQueue q = new LinkedTransferQueue();
120 <            q.offer(null);
121 <            shouldThrow();
122 <        } catch (NullPointerException success) {
123 <        }
124 <    }
125 <
126 <    /**
127 <     * add(null) throws NullPointerException
128 <     */
129 <    public void testAddNull() {
130 <        try {
131 <            LinkedTransferQueue q = new LinkedTransferQueue();
132 <            q.add(null);
133 <            shouldThrow();
134 <        } catch (NullPointerException success) {
135 <        }
136 <    }
137 <
138 <    /**
139 <     * addAll(null) throws NullPointerException
140 <     */
141 <    public void testAddAll1() {
142 <        try {
143 <            LinkedTransferQueue q = new LinkedTransferQueue();
144 <            q.addAll(null);
145 <            shouldThrow();
146 <        } catch (NullPointerException success) {
135 >            assertTrue(q.add(i));
136          }
137      }
138  
# Line 151 | Line 140 | public class LinkedTransferQueueTest ext
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
155            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147 <        } catch (IllegalArgumentException success) {
159 <        }
147 >        } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
151 <     * addAll of a collection with null elements throws NullPointerException
152 <     */
165 <    public void testAddAll2() {
166 <        try {
167 <            LinkedTransferQueue q = new LinkedTransferQueue();
168 <            Integer[] ints = new Integer[SIZE];
169 <            q.addAll(Arrays.asList(ints));
170 <            shouldThrow();
171 <        } catch (NullPointerException success) {
172 <        }
173 <    }
174 <
175 <    /**
176 <     * addAll of a collection with any null elements throws NullPointerException after
177 <     * possibly adding some elements
151 >     * addAll of a collection with any null elements throws
152 >     * NullPointerException after possibly adding some elements
153       */
154      public void testAddAll3() {
155 +        LinkedTransferQueue q = new LinkedTransferQueue();
156 +        Integer[] ints = new Integer[SIZE];
157 +        for (int i = 0; i < SIZE - 1; ++i)
158 +            ints[i] = i;
159          try {
181            LinkedTransferQueue q = new LinkedTransferQueue();
182            Integer[] ints = new Integer[SIZE];
183            for (int i = 0; i < SIZE - 1; ++i) {
184                ints[i] = i;
185            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162 <        } catch (NullPointerException success) {
189 <        }
162 >        } catch (NullPointerException success) {}
163      }
164  
165      /**
# Line 207 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
210     * put(null) throws NullPointerException
211     */
212    public void testPutNull() throws InterruptedException {
213        try {
214            LinkedTransferQueue q = new LinkedTransferQueue();
215            q.put(null);
216            shouldThrow();
217        } catch (NullPointerException success) {}
218    }
219
220    /**
183       * all elements successfully put are contained
184       */
185      public void testPut() {
186 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
186 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
187          for (int i = 0; i < SIZE; ++i) {
188 +            assertEquals(i, q.size());
189              q.put(i);
190              assertTrue(q.contains(i));
191          }
229        assertEquals(q.size(), SIZE);
192      }
193  
194      /**
# Line 240 | Line 202 | public class LinkedTransferQueueTest ext
202      }
203  
204      /**
205 <     * take blocks interruptibly when empty
205 >     * take removes existing elements until empty, then blocks interruptibly
206       */
207 <    public void testTakeFromEmpty() throws InterruptedException {
208 <        final LinkedTransferQueue q = new LinkedTransferQueue();
209 <        Thread t = new Thread(new Runnable() {
210 <            public void run() {
207 >    public void testBlockingTake() throws InterruptedException {
208 >        final BlockingQueue q = populatedQueue(SIZE);
209 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
210 >        Thread t = newStartedThread(new CheckedRunnable() {
211 >            public void realRun() throws InterruptedException {
212 >                for (int i = 0; i < SIZE; ++i) {
213 >                    assertEquals(i, q.take());
214 >                }
215 >
216 >                Thread.currentThread().interrupt();
217                  try {
218                      q.take();
219 <                    threadShouldThrow();
220 <                } catch (InterruptedException success) {
221 <                } catch (Throwable ex) {
254 <                    threadUnexpectedException(ex);
255 <                }
256 <            }});
257 <        t.start();
258 <        Thread.sleep(SHORT_DELAY_MS);
259 <        t.interrupt();
260 <        t.join();
261 <    }
219 >                    shouldThrow();
220 >                } catch (InterruptedException success) {}
221 >                assertFalse(Thread.interrupted());
222  
223 <    /**
264 <     * Take removes existing elements until empty, then blocks interruptibly
265 <     */
266 <    public void testBlockingTake() throws InterruptedException {
267 <        Thread t = new Thread(new Runnable() {
268 <            public void run() {
223 >                pleaseInterrupt.countDown();
224                  try {
270                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
271                    for (int i = 0; i < SIZE; ++i) {
272                        threadAssertEquals(i, (int) q.take());
273                    }
225                      q.take();
226 <                    threadShouldThrow();
227 <                } catch (InterruptedException success) {
228 <                } catch (Throwable ex) {
278 <                    threadUnexpectedException(ex);
279 <                }
226 >                    shouldThrow();
227 >                } catch (InterruptedException success) {}
228 >                assertFalse(Thread.interrupted());
229              }});
230 <        t.start();
231 <        Thread.sleep(SHORT_DELAY_MS);
230 >
231 >        await(pleaseInterrupt);
232 >        assertThreadStaysAlive(t);
233          t.interrupt();
234 <        t.join();
234 >        awaitTermination(t);
235      }
236  
237      /**
238       * poll succeeds unless empty
239       */
240 <    public void testPoll() {
240 >    public void testPoll() throws InterruptedException {
241          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
242          for (int i = 0; i < SIZE; ++i) {
243              assertEquals(i, (int) q.poll());
244          }
245          assertNull(q.poll());
246 +        checkEmpty(q);
247      }
248  
249      /**
250 <     * timed pool with zero timeout succeeds when non-empty, else times out
250 >     * timed poll with zero timeout succeeds when non-empty, else times out
251       */
252      public void testTimedPoll0() throws InterruptedException {
253          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
254          for (int i = 0; i < SIZE; ++i) {
255 <            assertEquals(i, (int) q.poll(0, TimeUnit.MILLISECONDS));
255 >            assertEquals(i, (int) q.poll(0, MILLISECONDS));
256          }
257 <        assertNull(q.poll(0, TimeUnit.MILLISECONDS));
257 >        assertNull(q.poll(0, MILLISECONDS));
258 >        checkEmpty(q);
259      }
260  
261      /**
262 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
262 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
263       */
264      public void testTimedPoll() throws InterruptedException {
265          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
266 <        for (int i = 0; i < SIZE; ++i) {
267 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
268 <        }
269 <        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
266 >        long startTime = System.nanoTime();
267 >        for (int i = 0; i < SIZE; ++i)
268 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
269 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
270 >
271 >        startTime = System.nanoTime();
272 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
273 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
274 >        checkEmpty(q);
275      }
276  
277      /**
# Line 322 | Line 279 | public class LinkedTransferQueueTest ext
279       * returning timeout status
280       */
281      public void testInterruptedTimedPoll() throws InterruptedException {
282 <        Thread t = new Thread(new Runnable() {
283 <            public void run() {
282 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
283 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
284 >        Thread t = newStartedThread(new CheckedRunnable() {
285 >            public void realRun() throws InterruptedException {
286 >                long startTime = System.nanoTime();
287 >                for (int i = 0; i < SIZE; ++i)
288 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
289 >                aboutToWait.countDown();
290                  try {
291 <                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
292 <                    for (int i = 0; i < SIZE; ++i) {
293 <                        threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
294 <                    }
332 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
333 <                } catch (InterruptedException success) {
334 <                } catch (Throwable ex) {
335 <                    threadUnexpectedException(ex);
336 <                }
291 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
292 >                    shouldThrow();
293 >                } catch (InterruptedException success) {}
294 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
295              }});
296 <        t.start();
297 <        Thread.sleep(SHORT_DELAY_MS);
296 >
297 >        aboutToWait.await();
298 >        waitForThreadToEnterWaitState(t);
299          t.interrupt();
300 <        t.join();
300 >        awaitTermination(t);
301 >        checkEmpty(q);
302      }
303  
304      /**
305 <     * timed poll before a delayed offer fails; after offer succeeds;
306 <     * on interruption throws
305 >     * timed poll after thread interrupted throws InterruptedException
306 >     * instead of returning timeout status
307       */
308 <    public void testTimedPollWithOffer() throws InterruptedException {
309 <        final LinkedTransferQueue q = new LinkedTransferQueue();
310 <        Thread t = new Thread(new Runnable() {
311 <            public void run() {
308 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
309 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
310 >        Thread t = newStartedThread(new CheckedRunnable() {
311 >            public void realRun() throws InterruptedException {
312 >                long startTime = System.nanoTime();
313 >                Thread.currentThread().interrupt();
314 >                for (int i = 0; i < SIZE; ++i)
315 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
316                  try {
317 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
318 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
319 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
320 <                    threadShouldThrow();
357 <                } catch (InterruptedException success) {
358 <                } catch (Throwable ex) {
359 <                    threadUnexpectedException(ex);
360 <                }
317 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
318 >                    shouldThrow();
319 >                } catch (InterruptedException success) {}
320 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
321              }});
322 <        t.start();
323 <        Thread.sleep(SMALL_DELAY_MS);
324 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
365 <        t.interrupt();
366 <        t.join();
322 >
323 >        awaitTermination(t);
324 >        checkEmpty(q);
325      }
326  
327      /**
328       * peek returns next element, or null if empty
329       */
330 <    public void testPeek() {
330 >    public void testPeek() throws InterruptedException {
331          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
332          for (int i = 0; i < SIZE; ++i) {
333              assertEquals(i, (int) q.peek());
# Line 378 | Line 336 | public class LinkedTransferQueueTest ext
336                         i != (int) q.peek());
337          }
338          assertNull(q.peek());
339 +        checkEmpty(q);
340      }
341  
342      /**
343       * element returns next element, or throws NoSuchElementException if empty
344       */
345 <    public void testElement() {
345 >    public void testElement() throws InterruptedException {
346          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
347          for (int i = 0; i < SIZE; ++i) {
348              assertEquals(i, (int) q.element());
# Line 392 | Line 351 | public class LinkedTransferQueueTest ext
351          try {
352              q.element();
353              shouldThrow();
354 <        } catch (NoSuchElementException success) {
355 <        }
354 >        } catch (NoSuchElementException success) {}
355 >        checkEmpty(q);
356      }
357  
358      /**
359       * remove removes next element, or throws NoSuchElementException if empty
360       */
361 <    public void testRemove() {
361 >    public void testRemove() throws InterruptedException {
362          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
363          for (int i = 0; i < SIZE; ++i) {
364              assertEquals(i, (int) q.remove());
# Line 407 | Line 366 | public class LinkedTransferQueueTest ext
366          try {
367              q.remove();
368              shouldThrow();
369 <        } catch (NoSuchElementException success) {
370 <        }
412 <    }
413 <
414 <    /**
415 <     * remove(x) removes x and returns true if present
416 <     */
417 <    public void testRemoveElement() {
418 <        LinkedTransferQueue q = populatedQueue(SIZE);
419 <        for (int i = 1; i < SIZE; i += 2) {
420 <            assertTrue(q.remove(i));
421 <        }
422 <        for (int i = 0; i < SIZE; i += 2) {
423 <            assertTrue(q.remove(i));
424 <            assertFalse(q.remove(i + 1));
425 <        }
426 <        assertTrue(q.isEmpty());
369 >        } catch (NoSuchElementException success) {}
370 >        checkEmpty(q);
371      }
372  
373      /**
# Line 436 | Line 380 | public class LinkedTransferQueueTest ext
380          assertTrue(q.remove(one));
381          assertTrue(q.remove(two));
382          assertTrue(q.add(three));
383 <        assertTrue(q.take() != null);
383 >        assertSame(q.take(), three);
384      }
385  
386      /**
# Line 454 | Line 398 | public class LinkedTransferQueueTest ext
398      /**
399       * clear removes all elements
400       */
401 <    public void testClear() {
401 >    public void testClear() throws InterruptedException {
402          LinkedTransferQueue q = populatedQueue(SIZE);
403          q.clear();
404 <        assertTrue(q.isEmpty());
461 <        assertEquals(0, q.size());
404 >        checkEmpty(q);
405          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
406          q.add(one);
407          assertFalse(q.isEmpty());
408 +        assertEquals(1, q.size());
409          assertTrue(q.contains(one));
410          q.clear();
411 <        assertTrue(q.isEmpty());
411 >        checkEmpty(q);
412      }
413  
414      /**
# Line 472 | Line 416 | public class LinkedTransferQueueTest ext
416       */
417      public void testContainsAll() {
418          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
419 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
419 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
420          for (int i = 0; i < SIZE; ++i) {
421              assertTrue(q.containsAll(p));
422              assertFalse(p.containsAll(q));
# Line 482 | Line 426 | public class LinkedTransferQueueTest ext
426      }
427  
428      /**
429 <     * retainAll(c) retains only those elements of c and reports true if changed
429 >     * retainAll(c) retains only those elements of c and reports true
430 >     * if changed
431       */
432      public void testRetainAll() {
433          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 501 | Line 446 | public class LinkedTransferQueueTest ext
446      }
447  
448      /**
449 <     * removeAll(c) removes only those elements of c and reports true if changed
449 >     * removeAll(c) removes only those elements of c and reports true
450 >     * if changed
451       */
452      public void testRemoveAll() {
453          for (int i = 1; i < SIZE; ++i) {
# Line 516 | Line 462 | public class LinkedTransferQueueTest ext
462      }
463  
464      /**
465 <     * toArray contains all elements
465 >     * toArray() contains all elements in FIFO order
466       */
467 <    public void testToArray() throws InterruptedException {
467 >    public void testToArray() {
468          LinkedTransferQueue q = populatedQueue(SIZE);
469          Object[] o = q.toArray();
470          for (int i = 0; i < o.length; i++) {
471 <            assertEquals(o[i], q.take());
471 >            assertSame(o[i], q.poll());
472          }
473      }
474  
475      /**
476 <     * toArray(a) contains all elements
476 >     * toArray(a) contains all elements in FIFO order
477       */
478 <    public void testToArray2() throws InterruptedException {
478 >    public void testToArray2() {
479          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
480          Integer[] ints = new Integer[SIZE];
481 <        ints = q.toArray(ints);
481 >        Integer[] array = q.toArray(ints);
482 >        assertSame(ints, array);
483          for (int i = 0; i < ints.length; i++) {
484 <            assertEquals(ints[i], q.take());
538 <        }
539 <    }
540 <
541 <    /**
542 <     * toArray(null) throws NullPointerException
543 <     */
544 <    public void testToArray_BadArg() {
545 <        try {
546 <            LinkedTransferQueue q = populatedQueue(SIZE);
547 <            Object o[] = q.toArray(null);
548 <            shouldThrow();
549 <        } catch (NullPointerException success) {
484 >            assertSame(ints[i], q.poll());
485          }
486      }
487  
488      /**
489 <     * toArray with incompatible array type throws CCE
489 >     * toArray(incompatible array type) throws ArrayStoreException
490       */
491      public void testToArray1_BadArg() {
492 +        LinkedTransferQueue q = populatedQueue(SIZE);
493          try {
494 <            LinkedTransferQueue q = populatedQueue(SIZE);
559 <            Object o[] = q.toArray(new String[10]);
494 >            q.toArray(new String[10]);
495              shouldThrow();
496 <        } catch (ArrayStoreException success) {
562 <        }
496 >        } catch (ArrayStoreException success) {}
497      }
498  
499      /**
# Line 568 | Line 502 | public class LinkedTransferQueueTest ext
502      public void testIterator() throws InterruptedException {
503          LinkedTransferQueue q = populatedQueue(SIZE);
504          Iterator it = q.iterator();
505 <        while (it.hasNext()) {
505 >        int i;
506 >        for (i = 0; it.hasNext(); i++)
507 >            assertTrue(q.contains(it.next()));
508 >        assertEquals(i, SIZE);
509 >        assertIteratorExhausted(it);
510 >
511 >        it = q.iterator();
512 >        for (i = 0; it.hasNext(); i++)
513              assertEquals(it.next(), q.take());
514 <        }
514 >        assertEquals(i, SIZE);
515 >        assertIteratorExhausted(it);
516 >    }
517 >
518 >    /**
519 >     * iterator of empty collection has no elements
520 >     */
521 >    public void testEmptyIterator() {
522 >        assertIteratorExhausted(new LinkedTransferQueue().iterator());
523      }
524  
525      /**
526 <     * iterator.remove removes current element
526 >     * iterator.remove() removes current element
527       */
528      public void testIteratorRemove() {
529          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 587 | Line 536 | public class LinkedTransferQueueTest ext
536          it.remove();
537  
538          it = q.iterator();
539 <        assertEquals(it.next(), one);
540 <        assertEquals(it.next(), three);
539 >        assertSame(it.next(), one);
540 >        assertSame(it.next(), three);
541          assertFalse(it.hasNext());
542      }
543  
# Line 596 | Line 545 | public class LinkedTransferQueueTest ext
545       * iterator ordering is FIFO
546       */
547      public void testIteratorOrdering() {
548 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
548 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
549          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
550          q.add(one);
551          q.add(two);
# Line 631 | Line 580 | public class LinkedTransferQueueTest ext
580          LinkedTransferQueue q = populatedQueue(SIZE);
581          String s = q.toString();
582          for (int i = 0; i < SIZE; ++i) {
583 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
583 >            assertTrue(s.contains(String.valueOf(i)));
584          }
585      }
586  
# Line 640 | Line 589 | public class LinkedTransferQueueTest ext
589       */
590      public void testOfferInExecutor() {
591          final LinkedTransferQueue q = new LinkedTransferQueue();
592 <        q.add(one);
593 <        q.add(two);
594 <        ExecutorService executor = Executors.newFixedThreadPool(2);
595 <        executor.execute(new Runnable() {
596 <            public void run() {
597 <                try {
598 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
599 <                } catch (Throwable ex) {
600 <                    threadUnexpectedException(ex);
601 <                }
602 <            }});
654 <
655 <        executor.execute(new Runnable() {
656 <            public void run() {
657 <                try {
658 <                    Thread.sleep(SMALL_DELAY_MS);
659 <                    threadAssertEquals(one, q.take());
660 <                } catch (Throwable ex) {
661 <                    threadUnexpectedException(ex);
662 <                }
663 <            }});
592 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
593 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
594 >        try (PoolCleaner cleaner = cleaner(executor)) {
595 >
596 >            executor.execute(new CheckedRunnable() {
597 >                public void realRun() throws InterruptedException {
598 >                    threadsStarted.await();
599 >                    long startTime = System.nanoTime();
600 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
601 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
602 >                }});
603  
604 <        joinPool(executor);
604 >            executor.execute(new CheckedRunnable() {
605 >                public void realRun() throws InterruptedException {
606 >                    threadsStarted.await();
607 >                    assertSame(one, q.take());
608 >                    checkEmpty(q);
609 >                }});
610 >        }
611      }
612  
613      /**
614 <     * poll retrieves elements across Executor threads
614 >     * timed poll retrieves elements across Executor threads
615       */
616      public void testPollInExecutor() {
617          final LinkedTransferQueue q = new LinkedTransferQueue();
618 <        ExecutorService executor = Executors.newFixedThreadPool(2);
619 <        executor.execute(new Runnable() {
620 <            public void run() {
621 <                try {
622 <                    threadAssertNull(q.poll());
623 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
624 <                    threadAssertTrue(q.isEmpty());
625 <                } catch (Throwable  ex) {
626 <                    threadUnexpectedException(ex);
627 <                }
628 <            }});
618 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
619 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
620 >        try (PoolCleaner cleaner = cleaner(executor)) {
621 >
622 >            executor.execute(new CheckedRunnable() {
623 >                public void realRun() throws InterruptedException {
624 >                    assertNull(q.poll());
625 >                    threadsStarted.await();
626 >                    long startTime = System.nanoTime();
627 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
629 >                    checkEmpty(q);
630 >                }});
631  
632 <        executor.execute(new Runnable() {
633 <            public void run() {
634 <                try {
688 <                    Thread.sleep(SMALL_DELAY_MS);
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    threadsStarted.await();
635                      q.put(one);
636 <                } catch (Throwable ex) {
637 <                    threadUnexpectedException(ex);
692 <                }
693 <            }});
694 <
695 <        joinPool(executor);
636 >                }});
637 >        }
638      }
639  
640      /**
641       * A deserialized serialized queue has same elements in same order
642       */
643      public void testSerialization() throws Exception {
644 <        LinkedTransferQueue q = populatedQueue(SIZE);
645 <
704 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
705 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
706 <        out.writeObject(q);
707 <        out.close();
708 <
709 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
710 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
711 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
712 <
713 <        assertEquals(q.size(), r.size());
714 <        while (!q.isEmpty()) {
715 <            assertEquals(q.remove(), r.remove());
716 <        }
717 <    }
718 <
719 <    /**
720 <     * drainTo(null) throws NullPointerException
721 <     */
722 <    public void testDrainToNull() {
723 <        LinkedTransferQueue q = populatedQueue(SIZE);
724 <        try {
725 <            q.drainTo(null);
726 <            shouldThrow();
727 <        } catch (NullPointerException success) {
728 <        }
729 <    }
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646  
647 <    /**
648 <     * drainTo(this) throws IllegalArgumentException
649 <     */
650 <    public void testDrainToSelf() {
651 <        LinkedTransferQueue q = populatedQueue(SIZE);
652 <        try {
653 <            q.drainTo(q);
738 <            shouldThrow();
739 <        } catch (IllegalArgumentException success) {
647 >        assertNotSame(y, x);
648 >        assertEquals(x.size(), y.size());
649 >        assertEquals(x.toString(), y.toString());
650 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
651 >        while (!x.isEmpty()) {
652 >            assertFalse(y.isEmpty());
653 >            assertEquals(x.remove(), y.remove());
654          }
655 +        assertTrue(y.isEmpty());
656      }
657  
658      /**
# Line 747 | Line 662 | public class LinkedTransferQueueTest ext
662          LinkedTransferQueue q = populatedQueue(SIZE);
663          ArrayList l = new ArrayList();
664          q.drainTo(l);
665 <        assertEquals(q.size(), 0);
666 <        assertEquals(l.size(), SIZE);
665 >        assertEquals(0, q.size());
666 >        assertEquals(SIZE, l.size());
667          for (int i = 0; i < SIZE; ++i) {
668 <            assertEquals(l.get(i), i);
668 >            assertEquals(i, l.get(i));
669          }
670          q.add(zero);
671          q.add(one);
# Line 759 | Line 674 | public class LinkedTransferQueueTest ext
674          assertTrue(q.contains(one));
675          l.clear();
676          q.drainTo(l);
677 <        assertEquals(q.size(), 0);
678 <        assertEquals(l.size(), 2);
677 >        assertEquals(0, q.size());
678 >        assertEquals(2, l.size());
679          for (int i = 0; i < 2; ++i) {
680 <            assertEquals(l.get(i), i);
680 >            assertEquals(i, l.get(i));
681          }
682      }
683  
684      /**
685 <     * drainTo empties full queue, unblocking a waiting put.
685 >     * drainTo(c) empties full queue, unblocking a waiting put.
686       */
687      public void testDrainToWithActivePut() throws InterruptedException {
688          final LinkedTransferQueue q = populatedQueue(SIZE);
689 <        Thread t = new Thread(new Runnable() {
690 <            public void run() {
691 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
689 >        Thread t = newStartedThread(new CheckedRunnable() {
690 >            public void realRun() {
691 >                q.put(SIZE + 1);
692              }});
782        t.start();
693          ArrayList l = new ArrayList();
694          q.drainTo(l);
695          assertTrue(l.size() >= SIZE);
696 <        for (int i = 0; i < SIZE; ++i) {
697 <            assertEquals(l.get(i), i);
698 <        }
789 <        t.join();
696 >        for (int i = 0; i < SIZE; ++i)
697 >            assertEquals(i, l.get(i));
698 >        awaitTermination(t);
699          assertTrue(q.size() + l.size() >= SIZE);
700      }
701  
702      /**
703 <     * drainTo(null, n) throws NullPointerException
795 <     */
796 <    public void testDrainToNullN() {
797 <        LinkedTransferQueue q = populatedQueue(SIZE);
798 <        try {
799 <            q.drainTo(null, 0);
800 <            shouldThrow();
801 <        } catch (NullPointerException success) {
802 <        }
803 <    }
804 <
805 <    /**
806 <     * drainTo(this, n) throws IllegalArgumentException
807 <     */
808 <    public void testDrainToSelfN() {
809 <        LinkedTransferQueue q = populatedQueue(SIZE);
810 <        try {
811 <            q.drainTo(q, 0);
812 <            shouldThrow();
813 <        } catch (IllegalArgumentException success) {
814 <        }
815 <    }
816 <
817 <    /**
818 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
703 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
704       */
705      public void testDrainToN() {
706          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 826 | Line 711 | public class LinkedTransferQueueTest ext
711              ArrayList l = new ArrayList();
712              q.drainTo(l, i);
713              int k = (i < SIZE) ? i : SIZE;
714 <            assertEquals(l.size(), k);
715 <            assertEquals(q.size(), SIZE - k);
716 <            for (int j = 0; j < k; ++j) {
717 <                assertEquals(l.get(j), j);
718 <            }
834 <            while (q.poll() != null)
835 <                ;
714 >            assertEquals(k, l.size());
715 >            assertEquals(SIZE - k, q.size());
716 >            for (int j = 0; j < k; ++j)
717 >                assertEquals(j, l.get(j));
718 >            do {} while (q.poll() != null);
719          }
720      }
721  
722      /**
723 <     * poll and take should decrement the waiting consumer count
723 >     * timed poll() or take() increments the waiting consumer count;
724 >     * offer(e) decrements the waiting consumer count
725       */
726      public void testWaitingConsumer() throws InterruptedException {
727          final LinkedTransferQueue q = new LinkedTransferQueue();
728 <        final ConsumerObserver waiting = new ConsumerObserver();
729 <        new Thread(new Runnable() {
730 <            public void run() {
731 <                try {
732 <                    threadAssertTrue(q.hasWaitingConsumer());
733 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
734 <                    threadAssertTrue(q.offer(new Object()));
735 <                } catch (Throwable ex) {
736 <                    threadUnexpectedException(ex);
737 <                }
738 <            }}).start();
739 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
740 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
728 >        assertEquals(0, q.getWaitingConsumerCount());
729 >        assertFalse(q.hasWaitingConsumer());
730 >        final CountDownLatch threadStarted = new CountDownLatch(1);
731 >
732 >        Thread t = newStartedThread(new CheckedRunnable() {
733 >            public void realRun() throws InterruptedException {
734 >                threadStarted.countDown();
735 >                long startTime = System.nanoTime();
736 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
737 >                assertEquals(0, q.getWaitingConsumerCount());
738 >                assertFalse(q.hasWaitingConsumer());
739 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
740 >            }});
741 >
742 >        threadStarted.await();
743 >        Callable<Boolean> oneConsumer
744 >            = new Callable<Boolean>() { public Boolean call() {
745 >                return q.hasWaitingConsumer()
746 >                && q.getWaitingConsumerCount() == 1; }};
747 >        waitForThreadToEnterWaitState(t, oneConsumer);
748 >
749 >        assertTrue(q.offer(one));
750 >        assertEquals(0, q.getWaitingConsumerCount());
751 >        assertFalse(q.hasWaitingConsumer());
752 >
753 >        awaitTermination(t);
754      }
755  
756      /**
# Line 864 | Line 761 | public class LinkedTransferQueueTest ext
761              LinkedTransferQueue q = new LinkedTransferQueue();
762              q.transfer(null);
763              shouldThrow();
764 <        } catch (NullPointerException ex) {
868 <        }
764 >        } catch (NullPointerException success) {}
765      }
766  
767      /**
768 <     * transfer attempts to insert into the queue then wait until that
769 <     * object is removed via take or poll.
768 >     * transfer waits until a poll occurs. The transfered element
769 >     * is returned by the associated poll.
770       */
771      public void testTransfer2() throws InterruptedException {
772 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
772 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
773 >        final CountDownLatch threadStarted = new CountDownLatch(1);
774  
775 <        new Thread(new Runnable() {
776 <            public void run() {
777 <                try {
778 <                    q.transfer(SIZE);
779 <                    threadAssertTrue(q.isEmpty());
780 <                } catch (Throwable ex) {
884 <                    threadUnexpectedException(ex);
885 <                }
886 <            }}).start();
775 >        Thread t = newStartedThread(new CheckedRunnable() {
776 >            public void realRun() throws InterruptedException {
777 >                threadStarted.countDown();
778 >                q.transfer(five);
779 >                checkEmpty(q);
780 >            }});
781  
782 <        Thread.sleep(SHORT_DELAY_MS);
783 <        assertEquals(1, q.size());
784 <        assertEquals(SIZE, (int) q.poll());
785 <        assertTrue(q.isEmpty());
782 >        threadStarted.await();
783 >        Callable<Boolean> oneElement
784 >            = new Callable<Boolean>() { public Boolean call() {
785 >                return !q.isEmpty() && q.size() == 1; }};
786 >        waitForThreadToEnterWaitState(t, oneElement);
787 >
788 >        assertSame(five, q.poll());
789 >        checkEmpty(q);
790 >        awaitTermination(t);
791      }
792  
793      /**
794 <     * transfer will attempt to transfer in fifo order and continue
896 <     * waiting if the element being transfered is not polled or taken
794 >     * transfer waits until a poll occurs, and then transfers in fifo order
795       */
796      public void testTransfer3() throws InterruptedException {
797 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
797 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
798  
799 <        Thread first =
800 <            new Thread(new Runnable() {
801 <                public void run() {
802 <                    try {
803 <                        Integer i = SIZE + 1;
804 <                        q.transfer(i);
907 <                        threadAssertTrue(!q.contains(i));
908 <                        threadAssertEquals(1, q.size());
909 <                    } catch (Throwable ex) {
910 <                        threadUnexpectedException(ex);
911 <                    }
912 <                }});
913 <        first.start();
799 >        Thread first = newStartedThread(new CheckedRunnable() {
800 >            public void realRun() throws InterruptedException {
801 >                q.transfer(four);
802 >                assertFalse(q.contains(four));
803 >                assertEquals(1, q.size());
804 >            }});
805  
806 <        Thread interruptedThread =
807 <            new Thread(new Runnable() {
808 <                public void run() {
809 <                    try {
810 <                        while (q.size() == 0)
811 <                            Thread.yield();
921 <                        q.transfer(SIZE);
922 <                        threadShouldThrow();
923 <                    } catch (InterruptedException success) {
924 <                    } catch (Throwable ex) {
925 <                        threadUnexpectedException(ex);
926 <                    }
806 >        Thread interruptedThread = newStartedThread(
807 >            new CheckedInterruptedRunnable() {
808 >                public void realRun() throws InterruptedException {
809 >                    while (q.isEmpty())
810 >                        Thread.yield();
811 >                    q.transfer(five);
812                  }});
928        interruptedThread.start();
813  
814          while (q.size() < 2)
815              Thread.yield();
816          assertEquals(2, q.size());
817 <        assertEquals(SIZE + 1, (int) q.poll());
817 >        assertSame(four, q.poll());
818          first.join();
819          assertEquals(1, q.size());
820          interruptedThread.interrupt();
821          interruptedThread.join();
822 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
822 >        checkEmpty(q);
823      }
824  
825      /**
826 <     * transfer will wait as long as a poll or take occurs if one does occur
827 <     * the waiting is finished and the thread that tries to poll/take
945 <     * wins in retrieving the element
826 >     * transfer waits until a poll occurs, at which point the polling
827 >     * thread returns the element
828       */
829      public void testTransfer4() throws InterruptedException {
830          final LinkedTransferQueue q = new LinkedTransferQueue();
831 <        new Thread(new Runnable() {
832 <            public void run() {
833 <                try {
834 <                    q.transfer(four);
835 <                    threadAssertFalse(q.contains(four));
836 <                    threadAssertEquals(three, q.poll());
837 <                } catch (Throwable ex) {
838 <                    threadUnexpectedException(ex);
839 <                }
840 <            }}).start();
841 <        Thread.sleep(MEDIUM_DELAY_MS);
831 >
832 >        Thread t = newStartedThread(new CheckedRunnable() {
833 >            public void realRun() throws InterruptedException {
834 >                q.transfer(four);
835 >                assertFalse(q.contains(four));
836 >                assertSame(three, q.poll());
837 >            }});
838 >
839 >        while (q.isEmpty())
840 >            Thread.yield();
841 >        assertFalse(q.isEmpty());
842 >        assertEquals(1, q.size());
843          assertTrue(q.offer(three));
844 <        assertEquals(four, q.poll());
844 >        assertSame(four, q.poll());
845 >        awaitTermination(t);
846 >    }
847 >
848 >    /**
849 >     * transfer waits until a take occurs. The transfered element
850 >     * is returned by the associated take.
851 >     */
852 >    public void testTransfer5() throws InterruptedException {
853 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
854 >
855 >        Thread t = newStartedThread(new CheckedRunnable() {
856 >            public void realRun() throws InterruptedException {
857 >                q.transfer(four);
858 >                checkEmpty(q);
859 >            }});
860 >
861 >        while (q.isEmpty())
862 >            Thread.yield();
863 >        assertFalse(q.isEmpty());
864 >        assertEquals(1, q.size());
865 >        assertSame(four, q.take());
866 >        checkEmpty(q);
867 >        awaitTermination(t);
868      }
869  
870      /**
871       * tryTransfer(null) throws NullPointerException
872       */
873      public void testTryTransfer1() {
874 +        final LinkedTransferQueue q = new LinkedTransferQueue();
875          try {
969            final LinkedTransferQueue q = new LinkedTransferQueue();
876              q.tryTransfer(null);
877 <            this.shouldThrow();
878 <        } catch (NullPointerException ex) {
973 <        }
877 >            shouldThrow();
878 >        } catch (NullPointerException success) {}
879      }
880  
881      /**
882       * tryTransfer returns false and does not enqueue if there are no
883       * consumers waiting to poll or take.
884       */
885 <    public void testTryTransfer2() {
885 >    public void testTryTransfer2() throws InterruptedException {
886          final LinkedTransferQueue q = new LinkedTransferQueue();
887          assertFalse(q.tryTransfer(new Object()));
888          assertFalse(q.hasWaitingConsumer());
889 <        assertTrue(q.isEmpty());
985 <        assertEquals(0, q.size());
889 >        checkEmpty(q);
890      }
891  
892      /**
# Line 992 | Line 896 | public class LinkedTransferQueueTest ext
896      public void testTryTransfer3() throws InterruptedException {
897          final Object hotPotato = new Object();
898          final LinkedTransferQueue q = new LinkedTransferQueue();
899 <        new Thread(new Runnable() {
900 <            public void run() {
901 <                try {
902 <                    while (! q.hasWaitingConsumer())
903 <                        Thread.yield();
904 <                    threadAssertTrue(q.hasWaitingConsumer());
905 <                    threadAssertTrue(q.isEmpty());
906 <                    threadAssertTrue(q.size() == 0);
907 <                    threadAssertTrue(q.tryTransfer(hotPotato));
908 <                } catch (Throwable ex) {
909 <                    threadUnexpectedException(ex);
910 <                }
911 <            }}).start();
912 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
913 <        assertTrue(q.isEmpty());
899 >
900 >        Thread t = newStartedThread(new CheckedRunnable() {
901 >            public void realRun() {
902 >                while (! q.hasWaitingConsumer())
903 >                    Thread.yield();
904 >                assertTrue(q.hasWaitingConsumer());
905 >                checkEmpty(q);
906 >                assertTrue(q.tryTransfer(hotPotato));
907 >            }});
908 >
909 >        long startTime = System.nanoTime();
910 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
911 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
912 >        checkEmpty(q);
913 >        awaitTermination(t);
914      }
915  
916      /**
# Line 1016 | Line 920 | public class LinkedTransferQueueTest ext
920      public void testTryTransfer4() throws InterruptedException {
921          final Object hotPotato = new Object();
922          final LinkedTransferQueue q = new LinkedTransferQueue();
923 <        new Thread(new Runnable() {
924 <            public void run() {
925 <                try {
926 <                    while (! q.hasWaitingConsumer())
927 <                        Thread.yield();
928 <                    threadAssertTrue(q.hasWaitingConsumer());
929 <                    threadAssertTrue(q.isEmpty());
930 <                    threadAssertTrue(q.size() == 0);
931 <                    threadAssertTrue(q.tryTransfer(hotPotato));
932 <                } catch (Throwable ex) {
933 <                    threadUnexpectedException(ex);
934 <                }
935 <            }}).start();
1032 <        assertTrue(q.take() == hotPotato);
1033 <        assertTrue(q.isEmpty());
923 >
924 >        Thread t = newStartedThread(new CheckedRunnable() {
925 >            public void realRun() {
926 >                while (! q.hasWaitingConsumer())
927 >                    Thread.yield();
928 >                assertTrue(q.hasWaitingConsumer());
929 >                checkEmpty(q);
930 >                assertTrue(q.tryTransfer(hotPotato));
931 >            }});
932 >
933 >        assertSame(q.take(), hotPotato);
934 >        checkEmpty(q);
935 >        awaitTermination(t);
936      }
937  
938      /**
939 <     * tryTransfer waits the amount given if interrupted, show an
1038 <     * interrupted exception
939 >     * tryTransfer blocks interruptibly if no takers
940       */
941      public void testTryTransfer5() throws InterruptedException {
942          final LinkedTransferQueue q = new LinkedTransferQueue();
943 <        Thread toInterrupt = new Thread(new Runnable() {
944 <            public void run() {
943 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
944 >        assertTrue(q.isEmpty());
945 >
946 >        Thread t = newStartedThread(new CheckedRunnable() {
947 >            public void realRun() throws InterruptedException {
948 >                long startTime = System.nanoTime();
949 >                Thread.currentThread().interrupt();
950                  try {
951 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
952 <                    threadShouldThrow();
953 <                } catch (InterruptedException success) {
954 <                } catch (Throwable ex) {
955 <                    threadUnexpectedException(ex);
956 <                }
951 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
952 >                    shouldThrow();
953 >                } catch (InterruptedException success) {}
954 >                assertFalse(Thread.interrupted());
955 >
956 >                pleaseInterrupt.countDown();
957 >                try {
958 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
959 >                    shouldThrow();
960 >                } catch (InterruptedException success) {}
961 >                assertFalse(Thread.interrupted());
962 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
963              }});
964 <        toInterrupt.start();
965 <        Thread.sleep(SMALL_DELAY_MS);
966 <        toInterrupt.interrupt();
964 >
965 >        await(pleaseInterrupt);
966 >        assertThreadStaysAlive(t);
967 >        t.interrupt();
968 >        awaitTermination(t);
969 >        checkEmpty(q);
970      }
971  
972      /**
973 <     * tryTransfer gives up after the timeout and return false
973 >     * tryTransfer gives up after the timeout and returns false
974       */
975      public void testTryTransfer6() throws InterruptedException {
976          final LinkedTransferQueue q = new LinkedTransferQueue();
977 <        new Thread(new Runnable() {
978 <            public void run() {
979 <                try {
980 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
981 <                } catch (Throwable ex) {
982 <                    threadUnexpectedException(ex);
983 <                }
984 <            }}).start();
985 <        Thread.sleep(LONG_DELAY_MS);
986 <        assertTrue(q.isEmpty());
977 >
978 >        Thread t = newStartedThread(new CheckedRunnable() {
979 >            public void realRun() throws InterruptedException {
980 >                long startTime = System.nanoTime();
981 >                assertFalse(q.tryTransfer(new Object(),
982 >                                          timeoutMillis(), MILLISECONDS));
983 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
984 >                checkEmpty(q);
985 >            }});
986 >
987 >        awaitTermination(t);
988 >        checkEmpty(q);
989      }
990  
991      /**
# Line 1078 | Line 995 | public class LinkedTransferQueueTest ext
995      public void testTryTransfer7() throws InterruptedException {
996          final LinkedTransferQueue q = new LinkedTransferQueue();
997          assertTrue(q.offer(four));
998 <        new Thread(new Runnable() {
999 <            public void run() {
1000 <                try {
1001 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
1002 <                    threadAssertTrue(q.isEmpty());
1003 <                } catch (Throwable ex) {
1004 <                    threadUnexpectedException(ex);
1005 <                }
1006 <            }}).start();
1007 <        Thread.sleep(SHORT_DELAY_MS);
998 >
999 >        Thread t = newStartedThread(new CheckedRunnable() {
1000 >            public void realRun() throws InterruptedException {
1001 >                long startTime = System.nanoTime();
1002 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1003 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1004 >                checkEmpty(q);
1005 >            }});
1006 >
1007 >        while (q.size() != 2)
1008 >            Thread.yield();
1009          assertEquals(2, q.size());
1010 <        assertEquals(four, q.poll());
1011 <        assertEquals(five, q.poll());
1012 <        assertTrue(q.isEmpty());
1010 >        assertSame(four, q.poll());
1011 >        assertSame(five, q.poll());
1012 >        checkEmpty(q);
1013 >        awaitTermination(t);
1014      }
1015  
1016      /**
1017 <     * tryTransfer attempts to enqueue into the q and fails returning
1018 <     * false not enqueueing and the successive poll is null
1017 >     * tryTransfer attempts to enqueue into the queue and fails
1018 >     * returning false not enqueueing and the successive poll is null
1019       */
1020      public void testTryTransfer8() throws InterruptedException {
1021          final LinkedTransferQueue q = new LinkedTransferQueue();
1022          assertTrue(q.offer(four));
1023          assertEquals(1, q.size());
1024 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1024 >        long startTime = System.nanoTime();
1025 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1026 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1027          assertEquals(1, q.size());
1028 <        assertEquals(four, q.poll());
1108 <        threadAssertTrue(q.isEmpty());
1028 >        assertSame(four, q.poll());
1029          assertNull(q.poll());
1030 +        checkEmpty(q);
1031      }
1032  
1033      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1034 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1035 <        assertTrue(q.isEmpty());
1034 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1035 >        checkEmpty(q);
1036          for (int i = 0; i < n; i++) {
1037              assertEquals(i, q.size());
1038              assertTrue(q.offer(i));
# Line 1121 | Line 1042 | public class LinkedTransferQueueTest ext
1042          return q;
1043      }
1044  
1045 <    private static class ConsumerObserver {
1046 <
1047 <        private int waitingConsumers;
1048 <
1049 <        private ConsumerObserver() {
1050 <        }
1051 <
1052 <        private void setWaitingConsumer(int i) {
1053 <            this.waitingConsumers = i;
1054 <        }
1055 <
1056 <        private int getWaitingConsumers() {
1136 <            return waitingConsumers;
1045 >    /**
1046 >     * remove(null), contains(null) always return false
1047 >     */
1048 >    public void testNeverContainsNull() {
1049 >        Collection<?>[] qs = {
1050 >            new LinkedTransferQueue<Object>(),
1051 >            populatedQueue(2),
1052 >        };
1053 >
1054 >        for (Collection<?> q : qs) {
1055 >            assertFalse(q.contains(null));
1056 >            assertFalse(q.remove(null));
1057          }
1058      }
1059   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines