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.66 by jsr166, Sun Oct 18 04:48:32 2015 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.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedTransferQueue;
22 >
23   import junit.framework.Test;
21 import junit.framework.TestSuite;
24  
25 + @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
27 +    static class Implementation implements CollectionImplementation {
28 +        public Class<?> klazz() { return LinkedTransferQueue.class; }
29 +        public Collection emptyCollection() { return new LinkedTransferQueue(); }
30 +        public Object makeElement(int i) { return i; }
31 +        public boolean isConcurrent() { return true; }
32 +        public boolean permitsNulls() { return false; }
33 +    }
34 +
35 +    public static class Generic extends BlockingQueueTest {
36 +        protected BlockingQueue emptyCollection() {
37 +            return new LinkedTransferQueue();
38 +        }
39 +    }
40  
41      public static void main(String[] args) {
42 <        junit.textui.TestRunner.run(suite());
42 >        main(suite(), args);
43      }
44  
45      public static Test suite() {
46 <        return new TestSuite(LinkedTransferQueueTest.class);
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>();
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 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.remove removes current element
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
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
549 >            = new LinkedTransferQueue<Integer>();
550          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
551          q.add(one);
552          q.add(two);
# Line 631 | Line 581 | public class LinkedTransferQueueTest ext
581          LinkedTransferQueue q = populatedQueue(SIZE);
582          String s = q.toString();
583          for (int i = 0; i < SIZE; ++i) {
584 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
584 >            assertTrue(s.contains(String.valueOf(i)));
585          }
586      }
587  
# Line 640 | Line 590 | public class LinkedTransferQueueTest ext
590       */
591      public void testOfferInExecutor() {
592          final LinkedTransferQueue q = new LinkedTransferQueue();
593 <        q.add(one);
594 <        q.add(two);
595 <        ExecutorService executor = Executors.newFixedThreadPool(2);
596 <        executor.execute(new Runnable() {
597 <            public void run() {
598 <                try {
599 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
600 <                } catch (Throwable ex) {
601 <                    threadUnexpectedException(ex);
602 <                }
603 <            }});
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 <            }});
593 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
594 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
595 >        try (PoolCleaner cleaner = cleaner(executor)) {
596 >
597 >            executor.execute(new CheckedRunnable() {
598 >                public void realRun() throws InterruptedException {
599 >                    threadsStarted.await();
600 >                    long startTime = System.nanoTime();
601 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
602 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
603 >                }});
604  
605 <        joinPool(executor);
605 >            executor.execute(new CheckedRunnable() {
606 >                public void realRun() throws InterruptedException {
607 >                    threadsStarted.await();
608 >                    assertSame(one, q.take());
609 >                    checkEmpty(q);
610 >                }});
611 >        }
612      }
613  
614      /**
615 <     * poll retrieves elements across Executor threads
615 >     * timed poll retrieves elements across Executor threads
616       */
617      public void testPollInExecutor() {
618          final LinkedTransferQueue q = new LinkedTransferQueue();
619 <        ExecutorService executor = Executors.newFixedThreadPool(2);
620 <        executor.execute(new Runnable() {
621 <            public void run() {
622 <                try {
623 <                    threadAssertNull(q.poll());
624 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
625 <                    threadAssertTrue(q.isEmpty());
626 <                } catch (Throwable  ex) {
627 <                    threadUnexpectedException(ex);
628 <                }
629 <            }});
619 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
620 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
621 >        try (PoolCleaner cleaner = cleaner(executor)) {
622 >
623 >            executor.execute(new CheckedRunnable() {
624 >                public void realRun() throws InterruptedException {
625 >                    assertNull(q.poll());
626 >                    threadsStarted.await();
627 >                    long startTime = System.nanoTime();
628 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
629 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
630 >                    checkEmpty(q);
631 >                }});
632  
633 <        executor.execute(new Runnable() {
634 <            public void run() {
635 <                try {
688 <                    Thread.sleep(SMALL_DELAY_MS);
633 >            executor.execute(new CheckedRunnable() {
634 >                public void realRun() throws InterruptedException {
635 >                    threadsStarted.await();
636                      q.put(one);
637 <                } catch (Throwable ex) {
638 <                    threadUnexpectedException(ex);
692 <                }
693 <            }});
694 <
695 <        joinPool(executor);
637 >                }});
638 >        }
639      }
640  
641      /**
642       * A deserialized serialized queue has same elements in same order
643       */
644      public void testSerialization() throws Exception {
645 <        LinkedTransferQueue q = populatedQueue(SIZE);
646 <
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 <    }
645 >        Queue x = populatedQueue(SIZE);
646 >        Queue y = serialClone(x);
647  
648 <    /**
649 <     * drainTo(this) throws IllegalArgumentException
650 <     */
651 <    public void testDrainToSelf() {
652 <        LinkedTransferQueue q = populatedQueue(SIZE);
653 <        try {
654 <            q.drainTo(q);
738 <            shouldThrow();
739 <        } catch (IllegalArgumentException success) {
648 >        assertNotSame(y, x);
649 >        assertEquals(x.size(), y.size());
650 >        assertEquals(x.toString(), y.toString());
651 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
652 >        while (!x.isEmpty()) {
653 >            assertFalse(y.isEmpty());
654 >            assertEquals(x.remove(), y.remove());
655          }
656 +        assertTrue(y.isEmpty());
657      }
658  
659      /**
# Line 747 | Line 663 | public class LinkedTransferQueueTest ext
663          LinkedTransferQueue q = populatedQueue(SIZE);
664          ArrayList l = new ArrayList();
665          q.drainTo(l);
666 <        assertEquals(q.size(), 0);
667 <        assertEquals(l.size(), SIZE);
666 >        assertEquals(0, q.size());
667 >        assertEquals(SIZE, l.size());
668          for (int i = 0; i < SIZE; ++i) {
669 <            assertEquals(l.get(i), i);
669 >            assertEquals(i, l.get(i));
670          }
671          q.add(zero);
672          q.add(one);
# Line 759 | Line 675 | public class LinkedTransferQueueTest ext
675          assertTrue(q.contains(one));
676          l.clear();
677          q.drainTo(l);
678 <        assertEquals(q.size(), 0);
679 <        assertEquals(l.size(), 2);
678 >        assertEquals(0, q.size());
679 >        assertEquals(2, l.size());
680          for (int i = 0; i < 2; ++i) {
681 <            assertEquals(l.get(i), i);
681 >            assertEquals(i, l.get(i));
682          }
683      }
684  
685      /**
686 <     * drainTo empties full queue, unblocking a waiting put.
686 >     * drainTo(c) empties full queue, unblocking a waiting put.
687       */
688      public void testDrainToWithActivePut() throws InterruptedException {
689          final LinkedTransferQueue q = populatedQueue(SIZE);
690 <        Thread t = new Thread(new Runnable() {
691 <            public void run() {
692 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
690 >        Thread t = newStartedThread(new CheckedRunnable() {
691 >            public void realRun() {
692 >                q.put(SIZE + 1);
693              }});
782        t.start();
694          ArrayList l = new ArrayList();
695          q.drainTo(l);
696          assertTrue(l.size() >= SIZE);
697 <        for (int i = 0; i < SIZE; ++i) {
698 <            assertEquals(l.get(i), i);
699 <        }
789 <        t.join();
697 >        for (int i = 0; i < SIZE; ++i)
698 >            assertEquals(i, l.get(i));
699 >        awaitTermination(t);
700          assertTrue(q.size() + l.size() >= SIZE);
701      }
702  
703      /**
704 <     * 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
704 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
705       */
706      public void testDrainToN() {
707          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 826 | Line 712 | public class LinkedTransferQueueTest ext
712              ArrayList l = new ArrayList();
713              q.drainTo(l, i);
714              int k = (i < SIZE) ? i : SIZE;
715 <            assertEquals(l.size(), k);
716 <            assertEquals(q.size(), SIZE - k);
717 <            for (int j = 0; j < k; ++j) {
718 <                assertEquals(l.get(j), j);
719 <            }
834 <            while (q.poll() != null)
835 <                ;
715 >            assertEquals(k, l.size());
716 >            assertEquals(SIZE - k, q.size());
717 >            for (int j = 0; j < k; ++j)
718 >                assertEquals(j, l.get(j));
719 >            do {} while (q.poll() != null);
720          }
721      }
722  
723      /**
724 <     * poll and take should decrement the waiting consumer count
724 >     * timed poll() or take() increments the waiting consumer count;
725 >     * offer(e) decrements the waiting consumer count
726       */
727      public void testWaitingConsumer() throws InterruptedException {
728          final LinkedTransferQueue q = new LinkedTransferQueue();
729 <        final ConsumerObserver waiting = new ConsumerObserver();
730 <        new Thread(new Runnable() {
731 <            public void run() {
732 <                try {
733 <                    threadAssertTrue(q.hasWaitingConsumer());
734 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
735 <                    threadAssertTrue(q.offer(new Object()));
736 <                } catch (Throwable ex) {
737 <                    threadUnexpectedException(ex);
738 <                }
739 <            }}).start();
740 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
741 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
729 >        assertEquals(0, q.getWaitingConsumerCount());
730 >        assertFalse(q.hasWaitingConsumer());
731 >        final CountDownLatch threadStarted = new CountDownLatch(1);
732 >
733 >        Thread t = newStartedThread(new CheckedRunnable() {
734 >            public void realRun() throws InterruptedException {
735 >                threadStarted.countDown();
736 >                long startTime = System.nanoTime();
737 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
738 >                assertEquals(0, q.getWaitingConsumerCount());
739 >                assertFalse(q.hasWaitingConsumer());
740 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
741 >            }});
742 >
743 >        threadStarted.await();
744 >        waitForThreadToEnterWaitState(t);
745 >        assertEquals(1, q.getWaitingConsumerCount());
746 >        assertTrue(q.hasWaitingConsumer());
747 >
748 >        assertTrue(q.offer(one));
749 >        assertEquals(0, q.getWaitingConsumerCount());
750 >        assertFalse(q.hasWaitingConsumer());
751 >
752 >        awaitTermination(t);
753      }
754  
755      /**
# Line 864 | Line 760 | public class LinkedTransferQueueTest ext
760              LinkedTransferQueue q = new LinkedTransferQueue();
761              q.transfer(null);
762              shouldThrow();
763 <        } catch (NullPointerException ex) {
868 <        }
763 >        } catch (NullPointerException success) {}
764      }
765  
766      /**
767 <     * transfer attempts to insert into the queue then wait until that
768 <     * object is removed via take or poll.
767 >     * transfer waits until a poll occurs. The transfered element
768 >     * is returned by this associated poll.
769       */
770      public void testTransfer2() throws InterruptedException {
771 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
772 <
773 <        new Thread(new Runnable() {
774 <            public void run() {
775 <                try {
776 <                    q.transfer(SIZE);
777 <                    threadAssertTrue(q.isEmpty());
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
886 <            }}).start();
771 >        final LinkedTransferQueue<Integer> q
772 >            = new LinkedTransferQueue<Integer>();
773 >        final CountDownLatch threadStarted = new CountDownLatch(1);
774 >
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);
782 >        threadStarted.await();
783 >        waitForThreadToEnterWaitState(t);
784          assertEquals(1, q.size());
785 <        assertEquals(SIZE, (int) q.poll());
786 <        assertTrue(q.isEmpty());
785 >        assertSame(five, q.poll());
786 >        checkEmpty(q);
787 >        awaitTermination(t);
788      }
789  
790      /**
791 <     * transfer will attempt to transfer in fifo order and continue
896 <     * waiting if the element being transfered is not polled or taken
791 >     * transfer waits until a poll occurs, and then transfers in fifo order
792       */
793      public void testTransfer3() throws InterruptedException {
794 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
794 >        final LinkedTransferQueue<Integer> q
795 >            = new LinkedTransferQueue<Integer>();
796  
797 <        Thread first =
798 <            new Thread(new Runnable() {
799 <                public void run() {
800 <                    try {
801 <                        Integer i = SIZE + 1;
802 <                        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();
797 >        Thread first = newStartedThread(new CheckedRunnable() {
798 >            public void realRun() throws InterruptedException {
799 >                q.transfer(four);
800 >                assertTrue(!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();
921 <                        q.transfer(SIZE);
922 <                        threadShouldThrow();
923 <                    } catch (InterruptedException success) {
924 <                    } catch (Throwable ex) {
925 <                        threadUnexpectedException(ex);
926 <                    }
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                  }});
928        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());
939 <        assertTrue(q.isEmpty());
820 >        checkEmpty(q);
821      }
822  
823      /**
824 <     * transfer will wait as long as a poll or take occurs if one does occur
825 <     * the waiting is finished and the thread that tries to poll/take
945 <     * wins in retrieving the element
824 >     * transfer waits until a poll occurs, at which point the polling
825 >     * thread returns the element
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.
849 >     */
850 >    public void testTransfer5() throws InterruptedException {
851 >        final LinkedTransferQueue<Integer> q
852 >            = new LinkedTransferQueue<Integer>();
853 >
854 >        Thread t = newStartedThread(new CheckedRunnable() {
855 >            public void realRun() throws InterruptedException {
856 >                q.transfer(four);
857 >                checkEmpty(q);
858 >            }});
859 >
860 >        while (q.isEmpty())
861 >            Thread.yield();
862 >        assertFalse(q.isEmpty());
863 >        assertEquals(1, q.size());
864 >        assertSame(four, q.take());
865 >        checkEmpty(q);
866 >        awaitTermination(t);
867      }
868  
869      /**
870       * tryTransfer(null) throws NullPointerException
871       */
872      public void testTryTransfer1() {
873 +        final LinkedTransferQueue q = new LinkedTransferQueue();
874          try {
969            final LinkedTransferQueue q = new LinkedTransferQueue();
875              q.tryTransfer(null);
876 <            this.shouldThrow();
877 <        } catch (NullPointerException ex) {
973 <        }
876 >            shouldThrow();
877 >        } catch (NullPointerException success) {}
878      }
879  
880      /**
881       * tryTransfer returns false and does not enqueue if there are no
882       * consumers waiting to poll or take.
883       */
884 <    public void testTryTransfer2() {
884 >    public void testTryTransfer2() throws InterruptedException {
885          final LinkedTransferQueue q = new LinkedTransferQueue();
886          assertFalse(q.tryTransfer(new Object()));
887          assertFalse(q.hasWaitingConsumer());
888 <        assertTrue(q.isEmpty());
985 <        assertEquals(0, q.size());
888 >        checkEmpty(q);
889      }
890  
891      /**
# Line 992 | Line 895 | public class LinkedTransferQueueTest ext
895      public void testTryTransfer3() throws InterruptedException {
896          final Object hotPotato = new Object();
897          final LinkedTransferQueue q = new LinkedTransferQueue();
898 <        new Thread(new Runnable() {
899 <            public void run() {
900 <                try {
901 <                    while (! q.hasWaitingConsumer())
902 <                        Thread.yield();
903 <                    threadAssertTrue(q.hasWaitingConsumer());
904 <                    threadAssertTrue(q.isEmpty());
905 <                    threadAssertTrue(q.size() == 0);
906 <                    threadAssertTrue(q.tryTransfer(hotPotato));
907 <                } catch (Throwable ex) {
908 <                    threadUnexpectedException(ex);
909 <                }
910 <            }}).start();
911 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
912 <        assertTrue(q.isEmpty());
898 >
899 >        Thread t = newStartedThread(new CheckedRunnable() {
900 >            public void realRun() {
901 >                while (! q.hasWaitingConsumer())
902 >                    Thread.yield();
903 >                assertTrue(q.hasWaitingConsumer());
904 >                checkEmpty(q);
905 >                assertTrue(q.tryTransfer(hotPotato));
906 >            }});
907 >
908 >        long startTime = System.nanoTime();
909 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
910 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
911 >        checkEmpty(q);
912 >        awaitTermination(t);
913      }
914  
915      /**
# Line 1016 | Line 919 | public class LinkedTransferQueueTest ext
919      public void testTryTransfer4() throws InterruptedException {
920          final Object hotPotato = new Object();
921          final LinkedTransferQueue q = new LinkedTransferQueue();
922 <        new Thread(new Runnable() {
923 <            public void run() {
924 <                try {
925 <                    while (! q.hasWaitingConsumer())
926 <                        Thread.yield();
927 <                    threadAssertTrue(q.hasWaitingConsumer());
928 <                    threadAssertTrue(q.isEmpty());
929 <                    threadAssertTrue(q.size() == 0);
930 <                    threadAssertTrue(q.tryTransfer(hotPotato));
931 <                } catch (Throwable ex) {
932 <                    threadUnexpectedException(ex);
933 <                }
934 <            }}).start();
1032 <        assertTrue(q.take() == hotPotato);
1033 <        assertTrue(q.isEmpty());
922 >
923 >        Thread t = newStartedThread(new CheckedRunnable() {
924 >            public void realRun() {
925 >                while (! q.hasWaitingConsumer())
926 >                    Thread.yield();
927 >                assertTrue(q.hasWaitingConsumer());
928 >                checkEmpty(q);
929 >                assertTrue(q.tryTransfer(hotPotato));
930 >            }});
931 >
932 >        assertSame(q.take(), hotPotato);
933 >        checkEmpty(q);
934 >        awaitTermination(t);
935      }
936  
937      /**
938 <     * tryTransfer waits the amount given if interrupted, show an
1038 <     * interrupted exception
938 >     * tryTransfer blocks interruptibly if no takers
939       */
940      public void testTryTransfer5() throws InterruptedException {
941          final LinkedTransferQueue q = new LinkedTransferQueue();
942 <        Thread toInterrupt = new Thread(new Runnable() {
943 <            public void run() {
942 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
943 >        assertTrue(q.isEmpty());
944 >
945 >        Thread t = newStartedThread(new CheckedRunnable() {
946 >            public void realRun() throws InterruptedException {
947 >                long startTime = System.nanoTime();
948 >                Thread.currentThread().interrupt();
949                  try {
950 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
951 <                    threadShouldThrow();
952 <                } catch (InterruptedException success) {
953 <                } catch (Throwable ex) {
954 <                    threadUnexpectedException(ex);
955 <                }
950 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
951 >                    shouldThrow();
952 >                } catch (InterruptedException success) {}
953 >                assertFalse(Thread.interrupted());
954 >
955 >                pleaseInterrupt.countDown();
956 >                try {
957 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
958 >                    shouldThrow();
959 >                } catch (InterruptedException success) {}
960 >                assertFalse(Thread.interrupted());
961 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
962              }});
963 <        toInterrupt.start();
964 <        Thread.sleep(SMALL_DELAY_MS);
965 <        toInterrupt.interrupt();
963 >
964 >        await(pleaseInterrupt);
965 >        assertThreadStaysAlive(t);
966 >        t.interrupt();
967 >        awaitTermination(t);
968 >        checkEmpty(q);
969      }
970  
971      /**
972 <     * tryTransfer gives up after the timeout and return false
972 >     * tryTransfer gives up after the timeout and returns false
973       */
974      public void testTryTransfer6() throws InterruptedException {
975          final LinkedTransferQueue q = new LinkedTransferQueue();
976 <        new Thread(new Runnable() {
977 <            public void run() {
978 <                try {
979 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
980 <                } catch (Throwable ex) {
981 <                    threadUnexpectedException(ex);
982 <                }
983 <            }}).start();
984 <        Thread.sleep(LONG_DELAY_MS);
985 <        assertTrue(q.isEmpty());
976 >
977 >        Thread t = newStartedThread(new CheckedRunnable() {
978 >            public void realRun() throws InterruptedException {
979 >                long startTime = System.nanoTime();
980 >                assertFalse(q.tryTransfer(new Object(),
981 >                                          timeoutMillis(), MILLISECONDS));
982 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
983 >                checkEmpty(q);
984 >            }});
985 >
986 >        awaitTermination(t);
987 >        checkEmpty(q);
988      }
989  
990      /**
# Line 1078 | Line 994 | public class LinkedTransferQueueTest ext
994      public void testTryTransfer7() throws InterruptedException {
995          final LinkedTransferQueue q = new LinkedTransferQueue();
996          assertTrue(q.offer(four));
997 <        new Thread(new Runnable() {
998 <            public void run() {
999 <                try {
1000 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
1001 <                    threadAssertTrue(q.isEmpty());
1002 <                } catch (Throwable ex) {
1003 <                    threadUnexpectedException(ex);
1004 <                }
1005 <            }}).start();
1006 <        Thread.sleep(SHORT_DELAY_MS);
997 >
998 >        Thread t = newStartedThread(new CheckedRunnable() {
999 >            public void realRun() throws InterruptedException {
1000 >                long startTime = System.nanoTime();
1001 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1002 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1003 >                checkEmpty(q);
1004 >            }});
1005 >
1006 >        while (q.size() != 2)
1007 >            Thread.yield();
1008          assertEquals(2, q.size());
1009 <        assertEquals(four, q.poll());
1010 <        assertEquals(five, q.poll());
1011 <        assertTrue(q.isEmpty());
1009 >        assertSame(four, q.poll());
1010 >        assertSame(five, q.poll());
1011 >        checkEmpty(q);
1012 >        awaitTermination(t);
1013      }
1014  
1015      /**
1016 <     * tryTransfer attempts to enqueue into the q and fails returning
1017 <     * false not enqueueing and the successive poll is null
1016 >     * tryTransfer attempts to enqueue into the queue and fails
1017 >     * returning false not enqueueing and the successive poll is null
1018       */
1019      public void testTryTransfer8() throws InterruptedException {
1020          final LinkedTransferQueue q = new LinkedTransferQueue();
1021          assertTrue(q.offer(four));
1022          assertEquals(1, q.size());
1023 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1023 >        long startTime = System.nanoTime();
1024 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1025 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1026          assertEquals(1, q.size());
1027 <        assertEquals(four, q.poll());
1108 <        threadAssertTrue(q.isEmpty());
1027 >        assertSame(four, q.poll());
1028          assertNull(q.poll());
1029 +        checkEmpty(q);
1030      }
1031  
1032      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1033          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1034 <        assertTrue(q.isEmpty());
1034 >        checkEmpty(q);
1035          for (int i = 0; i < n; i++) {
1036              assertEquals(i, q.size());
1037              assertTrue(q.offer(i));
# Line 1121 | Line 1041 | public class LinkedTransferQueueTest ext
1041          return q;
1042      }
1043  
1044 <    private static class ConsumerObserver {
1045 <
1046 <        private int waitingConsumers;
1047 <
1048 <        private ConsumerObserver() {
1049 <        }
1050 <
1051 <        private void setWaitingConsumer(int i) {
1052 <            this.waitingConsumers = i;
1053 <        }
1054 <
1055 <        private int getWaitingConsumers() {
1136 <            return waitingConsumers;
1044 >    /**
1045 >     * remove(null), contains(null) always return false
1046 >     */
1047 >    public void testNeverContainsNull() {
1048 >        Collection<?>[] qs = {
1049 >            new LinkedTransferQueue<Object>(),
1050 >            populatedQueue(2),
1051 >        };
1052 >
1053 >        for (Collection<?> q : qs) {
1054 >            assertFalse(q.contains(null));
1055 >            assertFalse(q.remove(null));
1056          }
1057      }
1058   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines