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.6 by dl, Sun Aug 2 12:31:24 2009 UTC vs.
Revision 1.75 by jsr166, Sat May 13 23:50:00 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 <        }
160 <    }
161 <
162 <    /**
163 <     * addAll of a collection with null elements throws NullPointerException
164 <     */
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 <        }
147 >        } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
151 <     * addAll of a collection with any null elements throws NullPointerException after
152 <     * 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++) assertEquals(i, q.take());
213 >
214 >                Thread.currentThread().interrupt();
215                  try {
216                      q.take();
217 <                    threadShouldThrow();
218 <                } catch (InterruptedException success) {
219 <                } catch (Throwable ex) {
254 <                    threadUnexpectedException(ex);
255 <                }
256 <            }});
257 <        t.start();
258 <        Thread.sleep(SHORT_DELAY_MS);
259 <        t.interrupt();
260 <        t.join();
261 <    }
217 >                    shouldThrow();
218 >                } catch (InterruptedException success) {}
219 >                assertFalse(Thread.interrupted());
220  
221 <    /**
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() {
221 >                pleaseInterrupt.countDown();
222                  try {
270                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
271                    for (int i = 0; i < SIZE; ++i) {
272                        threadAssertEquals(i, (int) q.take());
273                    }
223                      q.take();
224 <                    threadShouldThrow();
225 <                } catch (InterruptedException success) {
226 <                } catch (Throwable ex) {
278 <                    threadUnexpectedException(ex);
279 <                }
224 >                    shouldThrow();
225 >                } catch (InterruptedException success) {}
226 >                assertFalse(Thread.interrupted());
227              }});
228 <        t.start();
229 <        Thread.sleep(SHORT_DELAY_MS);
228 >
229 >        await(pleaseInterrupt);
230 >        assertThreadBlocks(t, Thread.State.WAITING);
231          t.interrupt();
232 <        t.join();
232 >        awaitTermination(t);
233      }
234  
235      /**
236       * poll succeeds unless empty
237       */
238 <    public void testPoll() {
238 >    public void testPoll() throws InterruptedException {
239          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
240          for (int i = 0; i < SIZE; ++i) {
241              assertEquals(i, (int) q.poll());
242          }
243          assertNull(q.poll());
244 +        checkEmpty(q);
245      }
246  
247      /**
248 <     * timed pool with zero timeout succeeds when non-empty, else times out
248 >     * timed poll with zero timeout succeeds when non-empty, else times out
249       */
250      public void testTimedPoll0() throws InterruptedException {
251          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
252          for (int i = 0; i < SIZE; ++i) {
253 <            assertEquals(i, (int) q.poll(0, TimeUnit.MILLISECONDS));
253 >            assertEquals(i, (int) q.poll(0, MILLISECONDS));
254          }
255 <        assertNull(q.poll(0, TimeUnit.MILLISECONDS));
255 >        assertNull(q.poll(0, MILLISECONDS));
256 >        checkEmpty(q);
257      }
258  
259      /**
260 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
260 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
261       */
262      public void testTimedPoll() throws InterruptedException {
263          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
264 <        for (int i = 0; i < SIZE; ++i) {
265 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
266 <        }
267 <        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
264 >        long startTime = System.nanoTime();
265 >        for (int i = 0; i < SIZE; ++i)
266 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
267 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
268 >
269 >        startTime = System.nanoTime();
270 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
271 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
272 >        checkEmpty(q);
273      }
274  
275      /**
# Line 322 | Line 277 | public class LinkedTransferQueueTest ext
277       * returning timeout status
278       */
279      public void testInterruptedTimedPoll() throws InterruptedException {
280 <        Thread t = new Thread(new Runnable() {
281 <            public void run() {
280 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
281 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
282 >        Thread t = newStartedThread(new CheckedRunnable() {
283 >            public void realRun() throws InterruptedException {
284 >                long startTime = System.nanoTime();
285 >                for (int i = 0; i < SIZE; ++i)
286 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
287 >                aboutToWait.countDown();
288                  try {
289 <                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
290 <                    for (int i = 0; i < SIZE; ++i) {
291 <                        threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
292 <                    }
332 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
333 <                } catch (InterruptedException success) {
334 <                } catch (Throwable ex) {
335 <                    threadUnexpectedException(ex);
336 <                }
289 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
290 >                    shouldThrow();
291 >                } catch (InterruptedException success) {}
292 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
293              }});
294 <        t.start();
295 <        Thread.sleep(SHORT_DELAY_MS);
294 >
295 >        await(aboutToWait);
296 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
297          t.interrupt();
298 <        t.join();
298 >        awaitTermination(t);
299 >        checkEmpty(q);
300      }
301  
302      /**
303 <     * timed poll before a delayed offer fails; after offer succeeds;
304 <     * on interruption throws
303 >     * timed poll after thread interrupted throws InterruptedException
304 >     * instead of returning timeout status
305       */
306 <    public void testTimedPollWithOffer() throws InterruptedException {
307 <        final LinkedTransferQueue q = new LinkedTransferQueue();
308 <        Thread t = new Thread(new Runnable() {
309 <            public void run() {
306 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
307 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
308 >        Thread t = newStartedThread(new CheckedRunnable() {
309 >            public void realRun() throws InterruptedException {
310 >                long startTime = System.nanoTime();
311 >                Thread.currentThread().interrupt();
312 >                for (int i = 0; i < SIZE; ++i)
313 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
314                  try {
315 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
316 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
317 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
318 <                    threadShouldThrow();
357 <                } catch (InterruptedException success) {
358 <                } catch (Throwable ex) {
359 <                    threadUnexpectedException(ex);
360 <                }
315 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
316 >                    shouldThrow();
317 >                } catch (InterruptedException success) {}
318 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
319              }});
320 <        t.start();
321 <        Thread.sleep(SMALL_DELAY_MS);
322 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
365 <        t.interrupt();
366 <        t.join();
320 >
321 >        awaitTermination(t);
322 >        checkEmpty(q);
323      }
324  
325      /**
326       * peek returns next element, or null if empty
327       */
328 <    public void testPeek() {
328 >    public void testPeek() throws InterruptedException {
329          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
330          for (int i = 0; i < SIZE; ++i) {
331              assertEquals(i, (int) q.peek());
# Line 378 | Line 334 | public class LinkedTransferQueueTest ext
334                         i != (int) q.peek());
335          }
336          assertNull(q.peek());
337 +        checkEmpty(q);
338      }
339  
340      /**
341       * element returns next element, or throws NoSuchElementException if empty
342       */
343 <    public void testElement() {
343 >    public void testElement() throws InterruptedException {
344          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
345          for (int i = 0; i < SIZE; ++i) {
346              assertEquals(i, (int) q.element());
# Line 392 | Line 349 | public class LinkedTransferQueueTest ext
349          try {
350              q.element();
351              shouldThrow();
352 <        } catch (NoSuchElementException success) {
353 <        }
352 >        } catch (NoSuchElementException success) {}
353 >        checkEmpty(q);
354      }
355  
356      /**
357       * remove removes next element, or throws NoSuchElementException if empty
358       */
359 <    public void testRemove() {
359 >    public void testRemove() throws InterruptedException {
360          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
361          for (int i = 0; i < SIZE; ++i) {
362              assertEquals(i, (int) q.remove());
# Line 407 | Line 364 | public class LinkedTransferQueueTest ext
364          try {
365              q.remove();
366              shouldThrow();
367 <        } catch (NoSuchElementException success) {
368 <        }
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());
367 >        } catch (NoSuchElementException success) {}
368 >        checkEmpty(q);
369      }
370  
371      /**
# Line 436 | Line 378 | public class LinkedTransferQueueTest ext
378          assertTrue(q.remove(one));
379          assertTrue(q.remove(two));
380          assertTrue(q.add(three));
381 <        assertTrue(q.take() != null);
381 >        assertSame(q.take(), three);
382      }
383  
384      /**
# Line 454 | Line 396 | public class LinkedTransferQueueTest ext
396      /**
397       * clear removes all elements
398       */
399 <    public void testClear() {
399 >    public void testClear() throws InterruptedException {
400          LinkedTransferQueue q = populatedQueue(SIZE);
401          q.clear();
402 <        assertTrue(q.isEmpty());
461 <        assertEquals(0, q.size());
402 >        checkEmpty(q);
403          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
404          q.add(one);
405          assertFalse(q.isEmpty());
406 +        assertEquals(1, q.size());
407          assertTrue(q.contains(one));
408          q.clear();
409 <        assertTrue(q.isEmpty());
409 >        checkEmpty(q);
410      }
411  
412      /**
# Line 472 | Line 414 | public class LinkedTransferQueueTest ext
414       */
415      public void testContainsAll() {
416          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
417 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
417 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
418          for (int i = 0; i < SIZE; ++i) {
419              assertTrue(q.containsAll(p));
420              assertFalse(p.containsAll(q));
# Line 482 | Line 424 | public class LinkedTransferQueueTest ext
424      }
425  
426      /**
427 <     * retainAll(c) retains only those elements of c and reports true if changed
427 >     * retainAll(c) retains only those elements of c and reports true
428 >     * if changed
429       */
430      public void testRetainAll() {
431          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 501 | Line 444 | public class LinkedTransferQueueTest ext
444      }
445  
446      /**
447 <     * removeAll(c) removes only those elements of c and reports true if changed
447 >     * removeAll(c) removes only those elements of c and reports true
448 >     * if changed
449       */
450      public void testRemoveAll() {
451          for (int i = 1; i < SIZE; ++i) {
# Line 516 | Line 460 | public class LinkedTransferQueueTest ext
460      }
461  
462      /**
463 <     * toArray contains all elements
463 >     * toArray() contains all elements in FIFO order
464       */
465 <    public void testToArray() throws InterruptedException {
465 >    public void testToArray() {
466          LinkedTransferQueue q = populatedQueue(SIZE);
467          Object[] o = q.toArray();
468          for (int i = 0; i < o.length; i++) {
469 <            assertEquals(o[i], q.take());
469 >            assertSame(o[i], q.poll());
470          }
471      }
472  
473      /**
474 <     * toArray(a) contains all elements
474 >     * toArray(a) contains all elements in FIFO order
475       */
476 <    public void testToArray2() throws InterruptedException {
476 >    public void testToArray2() {
477          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
478          Integer[] ints = new Integer[SIZE];
479 <        ints = q.toArray(ints);
479 >        Integer[] array = q.toArray(ints);
480 >        assertSame(ints, array);
481          for (int i = 0; i < ints.length; i++) {
482 <            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) {
482 >            assertSame(ints[i], q.poll());
483          }
484      }
485  
486      /**
487 <     * toArray with incompatible array type throws CCE
487 >     * toArray(incompatible array type) throws ArrayStoreException
488       */
489      public void testToArray1_BadArg() {
490 +        LinkedTransferQueue q = populatedQueue(SIZE);
491          try {
492 <            LinkedTransferQueue q = populatedQueue(SIZE);
559 <            Object o[] = q.toArray(new String[10]);
492 >            q.toArray(new String[10]);
493              shouldThrow();
494 <        } catch (ArrayStoreException success) {
562 <        }
494 >        } catch (ArrayStoreException success) {}
495      }
496  
497      /**
# Line 568 | Line 500 | public class LinkedTransferQueueTest ext
500      public void testIterator() throws InterruptedException {
501          LinkedTransferQueue q = populatedQueue(SIZE);
502          Iterator it = q.iterator();
503 <        while (it.hasNext()) {
503 >        int i;
504 >        for (i = 0; it.hasNext(); i++)
505 >            assertTrue(q.contains(it.next()));
506 >        assertEquals(i, SIZE);
507 >        assertIteratorExhausted(it);
508 >
509 >        it = q.iterator();
510 >        for (i = 0; it.hasNext(); i++)
511              assertEquals(it.next(), q.take());
512 <        }
512 >        assertEquals(i, SIZE);
513 >        assertIteratorExhausted(it);
514 >    }
515 >
516 >    /**
517 >     * iterator of empty collection has no elements
518 >     */
519 >    public void testEmptyIterator() {
520 >        assertIteratorExhausted(new LinkedTransferQueue().iterator());
521      }
522  
523      /**
524 <     * iterator.remove removes current element
524 >     * iterator.remove() removes current element
525       */
526      public void testIteratorRemove() {
527          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 587 | Line 534 | public class LinkedTransferQueueTest ext
534          it.remove();
535  
536          it = q.iterator();
537 <        assertEquals(it.next(), one);
538 <        assertEquals(it.next(), three);
537 >        assertSame(it.next(), one);
538 >        assertSame(it.next(), three);
539          assertFalse(it.hasNext());
540      }
541  
# Line 596 | Line 543 | public class LinkedTransferQueueTest ext
543       * iterator ordering is FIFO
544       */
545      public void testIteratorOrdering() {
546 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
546 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
547          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
548          q.add(one);
549          q.add(two);
# Line 631 | Line 578 | public class LinkedTransferQueueTest ext
578          LinkedTransferQueue q = populatedQueue(SIZE);
579          String s = q.toString();
580          for (int i = 0; i < SIZE; ++i) {
581 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
581 >            assertTrue(s.contains(String.valueOf(i)));
582          }
583      }
584  
# Line 640 | Line 587 | public class LinkedTransferQueueTest ext
587       */
588      public void testOfferInExecutor() {
589          final LinkedTransferQueue q = new LinkedTransferQueue();
590 <        q.add(one);
591 <        q.add(two);
592 <        ExecutorService executor = Executors.newFixedThreadPool(2);
593 <        executor.execute(new Runnable() {
594 <            public void run() {
595 <                try {
596 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
597 <                } catch (Throwable ex) {
598 <                    threadUnexpectedException(ex);
599 <                }
600 <            }});
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 <            }});
590 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
591 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
592 >        try (PoolCleaner cleaner = cleaner(executor)) {
593 >
594 >            executor.execute(new CheckedRunnable() {
595 >                public void realRun() throws InterruptedException {
596 >                    threadsStarted.await();
597 >                    long startTime = System.nanoTime();
598 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
599 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
600 >                }});
601  
602 <        joinPool(executor);
602 >            executor.execute(new CheckedRunnable() {
603 >                public void realRun() throws InterruptedException {
604 >                    threadsStarted.await();
605 >                    assertSame(one, q.take());
606 >                    checkEmpty(q);
607 >                }});
608 >        }
609      }
610  
611      /**
612 <     * poll retrieves elements across Executor threads
612 >     * timed poll retrieves elements across Executor threads
613       */
614      public void testPollInExecutor() {
615          final LinkedTransferQueue q = new LinkedTransferQueue();
616 <        ExecutorService executor = Executors.newFixedThreadPool(2);
617 <        executor.execute(new Runnable() {
618 <            public void run() {
619 <                try {
620 <                    threadAssertNull(q.poll());
621 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
622 <                    threadAssertTrue(q.isEmpty());
623 <                } catch (Throwable  ex) {
624 <                    threadUnexpectedException(ex);
625 <                }
626 <            }});
616 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
617 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
618 >        try (PoolCleaner cleaner = cleaner(executor)) {
619 >
620 >            executor.execute(new CheckedRunnable() {
621 >                public void realRun() throws InterruptedException {
622 >                    assertNull(q.poll());
623 >                    threadsStarted.await();
624 >                    long startTime = System.nanoTime();
625 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
626 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
627 >                    checkEmpty(q);
628 >                }});
629  
630 <        executor.execute(new Runnable() {
631 <            public void run() {
632 <                try {
688 <                    Thread.sleep(SMALL_DELAY_MS);
630 >            executor.execute(new CheckedRunnable() {
631 >                public void realRun() throws InterruptedException {
632 >                    threadsStarted.await();
633                      q.put(one);
634 <                } catch (Throwable ex) {
635 <                    threadUnexpectedException(ex);
692 <                }
693 <            }});
694 <
695 <        joinPool(executor);
634 >                }});
635 >        }
636      }
637  
638      /**
639       * A deserialized serialized queue has same elements in same order
640       */
641      public void testSerialization() throws Exception {
642 <        LinkedTransferQueue q = populatedQueue(SIZE);
643 <
704 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
705 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
706 <        out.writeObject(q);
707 <        out.close();
642 >        Queue x = populatedQueue(SIZE);
643 >        Queue y = serialClone(x);
644  
645 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
646 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
647 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
648 <
649 <        assertEquals(q.size(), r.size());
650 <        while (!q.isEmpty()) {
651 <            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 <    }
730 <
731 <    /**
732 <     * drainTo(this) throws IllegalArgumentException
733 <     */
734 <    public void testDrainToSelf() {
735 <        LinkedTransferQueue q = populatedQueue(SIZE);
736 <        try {
737 <            q.drainTo(q);
738 <            shouldThrow();
739 <        } catch (IllegalArgumentException success) {
645 >        assertNotSame(y, x);
646 >        assertEquals(x.size(), y.size());
647 >        assertEquals(x.toString(), y.toString());
648 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
649 >        while (!x.isEmpty()) {
650 >            assertFalse(y.isEmpty());
651 >            assertEquals(x.remove(), y.remove());
652          }
653 +        assertTrue(y.isEmpty());
654      }
655  
656      /**
# Line 747 | Line 660 | public class LinkedTransferQueueTest ext
660          LinkedTransferQueue q = populatedQueue(SIZE);
661          ArrayList l = new ArrayList();
662          q.drainTo(l);
663 <        assertEquals(q.size(), 0);
664 <        assertEquals(l.size(), SIZE);
663 >        assertEquals(0, q.size());
664 >        assertEquals(SIZE, l.size());
665          for (int i = 0; i < SIZE; ++i) {
666 <            assertEquals(l.get(i), i);
666 >            assertEquals(i, l.get(i));
667          }
668          q.add(zero);
669          q.add(one);
# Line 759 | Line 672 | public class LinkedTransferQueueTest ext
672          assertTrue(q.contains(one));
673          l.clear();
674          q.drainTo(l);
675 <        assertEquals(q.size(), 0);
676 <        assertEquals(l.size(), 2);
675 >        assertEquals(0, q.size());
676 >        assertEquals(2, l.size());
677          for (int i = 0; i < 2; ++i) {
678 <            assertEquals(l.get(i), i);
678 >            assertEquals(i, l.get(i));
679          }
680      }
681  
682      /**
683 <     * drainTo empties full queue, unblocking a waiting put.
683 >     * drainTo(c) empties full queue, unblocking a waiting put.
684       */
685      public void testDrainToWithActivePut() throws InterruptedException {
686          final LinkedTransferQueue q = populatedQueue(SIZE);
687 <        Thread t = new Thread(new Runnable() {
688 <            public void run() {
689 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
687 >        Thread t = newStartedThread(new CheckedRunnable() {
688 >            public void realRun() {
689 >                q.put(SIZE + 1);
690              }});
782        t.start();
691          ArrayList l = new ArrayList();
692          q.drainTo(l);
693          assertTrue(l.size() >= SIZE);
694 <        for (int i = 0; i < SIZE; ++i) {
695 <            assertEquals(l.get(i), i);
696 <        }
789 <        t.join();
694 >        for (int i = 0; i < SIZE; ++i)
695 >            assertEquals(i, l.get(i));
696 >        awaitTermination(t);
697          assertTrue(q.size() + l.size() >= SIZE);
698      }
699  
700      /**
701 <     * 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
701 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
702       */
703      public void testDrainToN() {
704          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 826 | Line 709 | public class LinkedTransferQueueTest ext
709              ArrayList l = new ArrayList();
710              q.drainTo(l, i);
711              int k = (i < SIZE) ? i : SIZE;
712 <            assertEquals(l.size(), k);
713 <            assertEquals(q.size(), SIZE - k);
714 <            for (int j = 0; j < k; ++j) {
715 <                assertEquals(l.get(j), j);
716 <            }
834 <            while (q.poll() != null)
835 <                ;
712 >            assertEquals(k, l.size());
713 >            assertEquals(SIZE - k, q.size());
714 >            for (int j = 0; j < k; ++j)
715 >                assertEquals(j, l.get(j));
716 >            do {} while (q.poll() != null);
717          }
718      }
719  
720      /**
721 <     * poll and take decrement the waiting consumer count
721 >     * timed poll() or take() increments the waiting consumer count;
722 >     * offer(e) decrements the waiting consumer count
723       */
724      public void testWaitingConsumer() throws InterruptedException {
725          final LinkedTransferQueue q = new LinkedTransferQueue();
726 <        final ConsumerObserver waiting = new ConsumerObserver();
727 <        new Thread(new Runnable() {
728 <            public void run() {
729 <                try {
730 <                    threadAssertTrue(q.hasWaitingConsumer());
731 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
732 <                    threadAssertTrue(q.offer(new Object()));
733 <                } catch (Throwable ex) {
734 <                    threadUnexpectedException(ex);
735 <                }
736 <            }}).start();
737 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
738 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
726 >        assertEquals(0, q.getWaitingConsumerCount());
727 >        assertFalse(q.hasWaitingConsumer());
728 >        final CountDownLatch threadStarted = new CountDownLatch(1);
729 >
730 >        Thread t = newStartedThread(new CheckedRunnable() {
731 >            public void realRun() throws InterruptedException {
732 >                threadStarted.countDown();
733 >                long startTime = System.nanoTime();
734 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
735 >                assertEquals(0, q.getWaitingConsumerCount());
736 >                assertFalse(q.hasWaitingConsumer());
737 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
738 >            }});
739 >
740 >        threadStarted.await();
741 >        Callable<Boolean> oneConsumer
742 >            = new Callable<Boolean>() { public Boolean call() {
743 >                return q.hasWaitingConsumer()
744 >                && q.getWaitingConsumerCount() == 1; }};
745 >        waitForThreadToEnterWaitState(t, oneConsumer);
746 >
747 >        assertTrue(q.offer(one));
748 >        assertEquals(0, q.getWaitingConsumerCount());
749 >        assertFalse(q.hasWaitingConsumer());
750 >
751 >        awaitTermination(t);
752      }
753  
754      /**
# Line 864 | Line 759 | public class LinkedTransferQueueTest ext
759              LinkedTransferQueue q = new LinkedTransferQueue();
760              q.transfer(null);
761              shouldThrow();
762 <        } catch (NullPointerException ex) {
868 <        }
762 >        } catch (NullPointerException success) {}
763      }
764  
765      /**
766       * transfer waits until a poll occurs. The transfered element
767 <     * is returned by this associated poll.
767 >     * is returned by the associated poll.
768       */
769      public void testTransfer2() throws InterruptedException {
770 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
770 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
771 >        final CountDownLatch threadStarted = new CountDownLatch(1);
772  
773 <        new Thread(new Runnable() {
774 <            public void run() {
775 <                try {
776 <                    q.transfer(SIZE);
777 <                    threadAssertTrue(q.isEmpty());
778 <                } catch (Throwable ex) {
884 <                    threadUnexpectedException(ex);
885 <                }
886 <            }}).start();
773 >        Thread t = newStartedThread(new CheckedRunnable() {
774 >            public void realRun() throws InterruptedException {
775 >                threadStarted.countDown();
776 >                q.transfer(five);
777 >                checkEmpty(q);
778 >            }});
779  
780 <        Thread.sleep(SHORT_DELAY_MS);
781 <        assertEquals(1, q.size());
782 <        assertEquals(SIZE, (int) q.poll());
783 <        assertTrue(q.isEmpty());
780 >        threadStarted.await();
781 >        Callable<Boolean> oneElement
782 >            = new Callable<Boolean>() { public Boolean call() {
783 >                return !q.isEmpty() && q.size() == 1; }};
784 >        waitForThreadToEnterWaitState(t, oneElement);
785 >
786 >        assertSame(five, q.poll());
787 >        checkEmpty(q);
788 >        awaitTermination(t);
789      }
790  
791      /**
792       * transfer waits until a poll occurs, and then transfers in fifo order
793       */
794      public void testTransfer3() throws InterruptedException {
795 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
795 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
796  
797 <        Thread first =
798 <            new Thread(new Runnable() {
799 <                public void run() {
800 <                    try {
801 <                        Integer i = SIZE + 1;
802 <                        q.transfer(i);
906 <                        threadAssertTrue(!q.contains(i));
907 <                        threadAssertEquals(1, q.size());
908 <                    } catch (Throwable ex) {
909 <                        threadUnexpectedException(ex);
910 <                    }
911 <                }});
912 <        first.start();
797 >        Thread first = newStartedThread(new CheckedRunnable() {
798 >            public void realRun() throws InterruptedException {
799 >                q.transfer(four);
800 >                assertFalse(q.contains(four));
801 >                assertEquals(1, q.size());
802 >            }});
803  
804 <        Thread interruptedThread =
805 <            new Thread(new Runnable() {
806 <                public void run() {
807 <                    try {
808 <                        while (q.size() == 0)
809 <                            Thread.yield();
920 <                        q.transfer(SIZE);
921 <                        threadShouldThrow();
922 <                    } catch (InterruptedException success) {
923 <                    } catch (Throwable ex) {
924 <                        threadUnexpectedException(ex);
925 <                    }
804 >        Thread interruptedThread = newStartedThread(
805 >            new CheckedInterruptedRunnable() {
806 >                public void realRun() throws InterruptedException {
807 >                    while (q.isEmpty())
808 >                        Thread.yield();
809 >                    q.transfer(five);
810                  }});
927        interruptedThread.start();
811  
812          while (q.size() < 2)
813              Thread.yield();
814          assertEquals(2, q.size());
815 <        assertEquals(SIZE + 1, (int) q.poll());
815 >        assertSame(four, q.poll());
816          first.join();
817          assertEquals(1, q.size());
818          interruptedThread.interrupt();
819          interruptedThread.join();
820 <        assertEquals(0, q.size());
938 <        assertTrue(q.isEmpty());
820 >        checkEmpty(q);
821      }
822  
823      /**
# Line 944 | Line 826 | public class LinkedTransferQueueTest ext
826       */
827      public void testTransfer4() throws InterruptedException {
828          final LinkedTransferQueue q = new LinkedTransferQueue();
829 <        new Thread(new Runnable() {
830 <            public void run() {
831 <                try {
832 <                    q.transfer(four);
833 <                    threadAssertFalse(q.contains(four));
834 <                    threadAssertEquals(three, q.poll());
835 <                } catch (Throwable ex) {
836 <                    threadUnexpectedException(ex);
837 <                }
838 <            }}).start();
839 <        Thread.sleep(MEDIUM_DELAY_MS);
829 >
830 >        Thread t = newStartedThread(new CheckedRunnable() {
831 >            public void realRun() throws InterruptedException {
832 >                q.transfer(four);
833 >                assertFalse(q.contains(four));
834 >                assertSame(three, q.poll());
835 >            }});
836 >
837 >        while (q.isEmpty())
838 >            Thread.yield();
839 >        assertFalse(q.isEmpty());
840 >        assertEquals(1, q.size());
841          assertTrue(q.offer(three));
842 <        assertEquals(four, q.poll());
842 >        assertSame(four, q.poll());
843 >        awaitTermination(t);
844      }
845  
846      /**
847       * transfer waits until a take occurs. The transfered element
848 <     * is returned by this associated take.
848 >     * is returned by the associated take.
849       */
850      public void testTransfer5() throws InterruptedException {
851 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
851 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
852  
853 <        new Thread(new Runnable() {
854 <            public void run() {
855 <                try {
856 <                    q.transfer(SIZE);
857 <                    threadAssertTrue(q.isEmpty());
974 <                } catch (Throwable ex) {
975 <                    threadUnexpectedException(ex);
976 <                }
977 <            }}).start();
853 >        Thread t = newStartedThread(new CheckedRunnable() {
854 >            public void realRun() throws InterruptedException {
855 >                q.transfer(four);
856 >                checkEmpty(q);
857 >            }});
858  
859 <        Thread.sleep(SHORT_DELAY_MS);
860 <        assertEquals(SIZE, (int) q.take());
861 <        assertTrue(q.isEmpty());
859 >        while (q.isEmpty())
860 >            Thread.yield();
861 >        assertFalse(q.isEmpty());
862 >        assertEquals(1, q.size());
863 >        assertSame(four, q.take());
864 >        checkEmpty(q);
865 >        awaitTermination(t);
866      }
867  
868      /**
869       * tryTransfer(null) throws NullPointerException
870       */
871      public void testTryTransfer1() {
872 +        final LinkedTransferQueue q = new LinkedTransferQueue();
873          try {
989            final LinkedTransferQueue q = new LinkedTransferQueue();
874              q.tryTransfer(null);
875 <            this.shouldThrow();
876 <        } catch (NullPointerException ex) {
993 <        }
875 >            shouldThrow();
876 >        } catch (NullPointerException success) {}
877      }
878  
879      /**
880       * tryTransfer returns false and does not enqueue if there are no
881       * consumers waiting to poll or take.
882       */
883 <    public void testTryTransfer2() {
883 >    public void testTryTransfer2() throws InterruptedException {
884          final LinkedTransferQueue q = new LinkedTransferQueue();
885          assertFalse(q.tryTransfer(new Object()));
886          assertFalse(q.hasWaitingConsumer());
887 <        assertTrue(q.isEmpty());
1005 <        assertEquals(0, q.size());
887 >        checkEmpty(q);
888      }
889  
890      /**
# Line 1012 | Line 894 | public class LinkedTransferQueueTest ext
894      public void testTryTransfer3() throws InterruptedException {
895          final Object hotPotato = new Object();
896          final LinkedTransferQueue q = new LinkedTransferQueue();
897 <        new Thread(new Runnable() {
898 <            public void run() {
899 <                try {
900 <                    while (! q.hasWaitingConsumer())
901 <                        Thread.yield();
902 <                    threadAssertTrue(q.hasWaitingConsumer());
903 <                    threadAssertTrue(q.isEmpty());
904 <                    threadAssertTrue(q.size() == 0);
905 <                    threadAssertTrue(q.tryTransfer(hotPotato));
906 <                } catch (Throwable ex) {
907 <                    threadUnexpectedException(ex);
908 <                }
909 <            }}).start();
910 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
911 <        assertTrue(q.isEmpty());
897 >
898 >        Thread t = newStartedThread(new CheckedRunnable() {
899 >            public void realRun() {
900 >                while (! q.hasWaitingConsumer())
901 >                    Thread.yield();
902 >                assertTrue(q.hasWaitingConsumer());
903 >                checkEmpty(q);
904 >                assertTrue(q.tryTransfer(hotPotato));
905 >            }});
906 >
907 >        long startTime = System.nanoTime();
908 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
909 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
910 >        checkEmpty(q);
911 >        awaitTermination(t);
912      }
913  
914      /**
# Line 1036 | Line 918 | public class LinkedTransferQueueTest ext
918      public void testTryTransfer4() throws InterruptedException {
919          final Object hotPotato = new Object();
920          final LinkedTransferQueue q = new LinkedTransferQueue();
921 <        new Thread(new Runnable() {
922 <            public void run() {
923 <                try {
924 <                    while (! q.hasWaitingConsumer())
925 <                        Thread.yield();
926 <                    threadAssertTrue(q.hasWaitingConsumer());
927 <                    threadAssertTrue(q.isEmpty());
928 <                    threadAssertTrue(q.size() == 0);
929 <                    threadAssertTrue(q.tryTransfer(hotPotato));
930 <                } catch (Throwable ex) {
931 <                    threadUnexpectedException(ex);
932 <                }
933 <            }}).start();
1052 <        assertTrue(q.take() == hotPotato);
1053 <        assertTrue(q.isEmpty());
921 >
922 >        Thread t = newStartedThread(new CheckedRunnable() {
923 >            public void realRun() {
924 >                while (! q.hasWaitingConsumer())
925 >                    Thread.yield();
926 >                assertTrue(q.hasWaitingConsumer());
927 >                checkEmpty(q);
928 >                assertTrue(q.tryTransfer(hotPotato));
929 >            }});
930 >
931 >        assertSame(q.take(), hotPotato);
932 >        checkEmpty(q);
933 >        awaitTermination(t);
934      }
935  
936      /**
937 <     * tryTransfer waits the amount given if interrupted, and
1058 <     * throws interrupted exception
937 >     * tryTransfer blocks interruptibly if no takers
938       */
939      public void testTryTransfer5() throws InterruptedException {
940          final LinkedTransferQueue q = new LinkedTransferQueue();
941 <        Thread toInterrupt = new Thread(new Runnable() {
942 <            public void run() {
941 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
942 >        assertTrue(q.isEmpty());
943 >
944 >        Thread t = newStartedThread(new CheckedRunnable() {
945 >            public void realRun() throws InterruptedException {
946 >                long startTime = System.nanoTime();
947 >                Thread.currentThread().interrupt();
948                  try {
949 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
950 <                    threadShouldThrow();
951 <                } catch (InterruptedException success) {
952 <                } catch (Throwable ex) {
953 <                    threadUnexpectedException(ex);
954 <                }
949 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
950 >                    shouldThrow();
951 >                } catch (InterruptedException success) {}
952 >                assertFalse(Thread.interrupted());
953 >
954 >                pleaseInterrupt.countDown();
955 >                try {
956 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
957 >                    shouldThrow();
958 >                } catch (InterruptedException success) {}
959 >                assertFalse(Thread.interrupted());
960 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
961              }});
962 <        toInterrupt.start();
963 <        Thread.sleep(SMALL_DELAY_MS);
964 <        toInterrupt.interrupt();
962 >
963 >        await(pleaseInterrupt);
964 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
965 >        t.interrupt();
966 >        awaitTermination(t);
967 >        checkEmpty(q);
968      }
969  
970      /**
971 <     * tryTransfer gives up after the timeout and return false
971 >     * tryTransfer gives up after the timeout and returns false
972       */
973      public void testTryTransfer6() throws InterruptedException {
974          final LinkedTransferQueue q = new LinkedTransferQueue();
975 <        new Thread(new Runnable() {
976 <            public void run() {
977 <                try {
978 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
979 <                } catch (Throwable ex) {
980 <                    threadUnexpectedException(ex);
981 <                }
982 <            }}).start();
983 <        Thread.sleep(LONG_DELAY_MS);
984 <        assertTrue(q.isEmpty());
975 >
976 >        Thread t = newStartedThread(new CheckedRunnable() {
977 >            public void realRun() throws InterruptedException {
978 >                long startTime = System.nanoTime();
979 >                assertFalse(q.tryTransfer(new Object(),
980 >                                          timeoutMillis(), MILLISECONDS));
981 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
982 >                checkEmpty(q);
983 >            }});
984 >
985 >        awaitTermination(t);
986 >        checkEmpty(q);
987      }
988  
989      /**
# Line 1098 | Line 993 | public class LinkedTransferQueueTest ext
993      public void testTryTransfer7() throws InterruptedException {
994          final LinkedTransferQueue q = new LinkedTransferQueue();
995          assertTrue(q.offer(four));
996 <        new Thread(new Runnable() {
997 <            public void run() {
998 <                try {
999 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
1000 <                    threadAssertTrue(q.isEmpty());
1001 <                } catch (Throwable ex) {
1002 <                    threadUnexpectedException(ex);
1003 <                }
1004 <            }}).start();
1005 <        Thread.sleep(SHORT_DELAY_MS);
996 >
997 >        Thread t = newStartedThread(new CheckedRunnable() {
998 >            public void realRun() throws InterruptedException {
999 >                long startTime = System.nanoTime();
1000 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1001 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1002 >                checkEmpty(q);
1003 >            }});
1004 >
1005 >        while (q.size() != 2)
1006 >            Thread.yield();
1007          assertEquals(2, q.size());
1008 <        assertEquals(four, q.poll());
1009 <        assertEquals(five, q.poll());
1010 <        assertTrue(q.isEmpty());
1008 >        assertSame(four, q.poll());
1009 >        assertSame(five, q.poll());
1010 >        checkEmpty(q);
1011 >        awaitTermination(t);
1012      }
1013  
1014      /**
1015 <     * tryTransfer attempts to enqueue into the q and fails returning
1016 <     * false not enqueueing and the successive poll is null
1015 >     * tryTransfer attempts to enqueue into the queue and fails
1016 >     * returning false not enqueueing and the successive poll is null
1017       */
1018      public void testTryTransfer8() throws InterruptedException {
1019          final LinkedTransferQueue q = new LinkedTransferQueue();
1020          assertTrue(q.offer(four));
1021          assertEquals(1, q.size());
1022 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1022 >        long startTime = System.nanoTime();
1023 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1024 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1025          assertEquals(1, q.size());
1026 <        assertEquals(four, q.poll());
1128 <        threadAssertTrue(q.isEmpty());
1026 >        assertSame(four, q.poll());
1027          assertNull(q.poll());
1028 +        checkEmpty(q);
1029      }
1030  
1031      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1032 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1033 <        assertTrue(q.isEmpty());
1032 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1033 >        checkEmpty(q);
1034          for (int i = 0; i < n; i++) {
1035              assertEquals(i, q.size());
1036              assertTrue(q.offer(i));
# Line 1141 | Line 1040 | public class LinkedTransferQueueTest ext
1040          return q;
1041      }
1042  
1043 <    private static class ConsumerObserver {
1044 <
1045 <        private int waitingConsumers;
1046 <
1047 <        private ConsumerObserver() {
1048 <        }
1049 <
1050 <        private void setWaitingConsumer(int i) {
1051 <            this.waitingConsumers = i;
1052 <        }
1053 <
1054 <        private int getWaitingConsumers() {
1156 <            return waitingConsumers;
1043 >    /**
1044 >     * remove(null), contains(null) always return false
1045 >     */
1046 >    public void testNeverContainsNull() {
1047 >        Collection<?>[] qs = {
1048 >            new LinkedTransferQueue<Object>(),
1049 >            populatedQueue(2),
1050 >        };
1051 >
1052 >        for (Collection<?> q : qs) {
1053 >            assertFalse(q.contains(null));
1054 >            assertFalse(q.remove(null));
1055          }
1056      }
1057   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines