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.65 by jsr166, Tue Oct 6 00:36:55 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 <        }
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>();
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));
267 >            long startTime = System.nanoTime();
268 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
269 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
270 >        }
271 >        long 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 >                }
290 >                aboutToWait.countDown();
291                  try {
292 <                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
293 <                    for (int i = 0; i < SIZE; ++i) {
330 <                        threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
331 <                    }
332 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
292 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
293 >                    shouldThrow();
294                  } catch (InterruptedException success) {
295 <                } catch (Throwable ex) {
335 <                    threadUnexpectedException(ex);
295 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296                  }
297              }});
298 <        t.start();
299 <        Thread.sleep(SHORT_DELAY_MS);
298 >
299 >        aboutToWait.await();
300 >        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
301          t.interrupt();
302 <        t.join();
302 >        awaitTermination(t);
303 >        checkEmpty(q);
304      }
305  
306      /**
307 <     * timed poll before a delayed offer fails; after offer succeeds;
308 <     * on interruption throws
307 >     * timed poll after thread interrupted throws InterruptedException
308 >     * instead of returning timeout status
309       */
310 <    public void testTimedPollWithOffer() throws InterruptedException {
311 <        final LinkedTransferQueue q = new LinkedTransferQueue();
312 <        Thread t = new Thread(new Runnable() {
313 <            public void run() {
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);
310 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
311 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
312 >        Thread t = newStartedThread(new CheckedRunnable() {
313 >            public void realRun() throws InterruptedException {
314 >                Thread.currentThread().interrupt();
315 >                for (int i = 0; i < SIZE; ++i) {
316 >                    long startTime = System.nanoTime();
317 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
318 >                    assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
319                  }
320 +                try {
321 +                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
322 +                    shouldThrow();
323 +                } catch (InterruptedException success) {}
324              }});
325 <        t.start();
326 <        Thread.sleep(SMALL_DELAY_MS);
327 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
365 <        t.interrupt();
366 <        t.join();
325 >
326 >        awaitTermination(t, MEDIUM_DELAY_MS);
327 >        checkEmpty(q);
328      }
329  
330      /**
331       * peek returns next element, or null if empty
332       */
333 <    public void testPeek() {
333 >    public void testPeek() throws InterruptedException {
334          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
335          for (int i = 0; i < SIZE; ++i) {
336              assertEquals(i, (int) q.peek());
# Line 378 | Line 339 | public class LinkedTransferQueueTest ext
339                         i != (int) q.peek());
340          }
341          assertNull(q.peek());
342 +        checkEmpty(q);
343      }
344  
345      /**
346       * element returns next element, or throws NoSuchElementException if empty
347       */
348 <    public void testElement() {
348 >    public void testElement() throws InterruptedException {
349          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
350          for (int i = 0; i < SIZE; ++i) {
351              assertEquals(i, (int) q.element());
# Line 392 | Line 354 | public class LinkedTransferQueueTest ext
354          try {
355              q.element();
356              shouldThrow();
357 <        } catch (NoSuchElementException success) {
358 <        }
357 >        } catch (NoSuchElementException success) {}
358 >        checkEmpty(q);
359      }
360  
361      /**
362       * remove removes next element, or throws NoSuchElementException if empty
363       */
364 <    public void testRemove() {
364 >    public void testRemove() throws InterruptedException {
365          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
366          for (int i = 0; i < SIZE; ++i) {
367              assertEquals(i, (int) q.remove());
# Line 407 | Line 369 | public class LinkedTransferQueueTest ext
369          try {
370              q.remove();
371              shouldThrow();
372 <        } catch (NoSuchElementException success) {
373 <        }
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());
372 >        } catch (NoSuchElementException success) {}
373 >        checkEmpty(q);
374      }
375  
376      /**
# Line 436 | Line 383 | public class LinkedTransferQueueTest ext
383          assertTrue(q.remove(one));
384          assertTrue(q.remove(two));
385          assertTrue(q.add(three));
386 <        assertTrue(q.take() != null);
386 >        assertSame(q.take(), three);
387      }
388  
389      /**
# Line 454 | Line 401 | public class LinkedTransferQueueTest ext
401      /**
402       * clear removes all elements
403       */
404 <    public void testClear() {
404 >    public void testClear() throws InterruptedException {
405          LinkedTransferQueue q = populatedQueue(SIZE);
406          q.clear();
407 <        assertTrue(q.isEmpty());
461 <        assertEquals(0, q.size());
407 >        checkEmpty(q);
408          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
409          q.add(one);
410          assertFalse(q.isEmpty());
411 +        assertEquals(1, q.size());
412          assertTrue(q.contains(one));
413          q.clear();
414 <        assertTrue(q.isEmpty());
414 >        checkEmpty(q);
415      }
416  
417      /**
# Line 482 | Line 429 | public class LinkedTransferQueueTest ext
429      }
430  
431      /**
432 <     * retainAll(c) retains only those elements of c and reports true if changed
432 >     * retainAll(c) retains only those elements of c and reports true
433 >     * if changed
434       */
435      public void testRetainAll() {
436          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 501 | Line 449 | public class LinkedTransferQueueTest ext
449      }
450  
451      /**
452 <     * removeAll(c) removes only those elements of c and reports true if changed
452 >     * removeAll(c) removes only those elements of c and reports true
453 >     * if changed
454       */
455      public void testRemoveAll() {
456          for (int i = 1; i < SIZE; ++i) {
# Line 516 | Line 465 | public class LinkedTransferQueueTest ext
465      }
466  
467      /**
468 <     * toArray contains all elements
468 >     * toArray() contains all elements in FIFO order
469       */
470 <    public void testToArray() throws InterruptedException {
470 >    public void testToArray() {
471          LinkedTransferQueue q = populatedQueue(SIZE);
472          Object[] o = q.toArray();
473          for (int i = 0; i < o.length; i++) {
474 <            assertEquals(o[i], q.take());
474 >            assertSame(o[i], q.poll());
475          }
476      }
477  
478      /**
479 <     * toArray(a) contains all elements
479 >     * toArray(a) contains all elements in FIFO order
480       */
481 <    public void testToArray2() throws InterruptedException {
481 >    public void testToArray2() {
482          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
483          Integer[] ints = new Integer[SIZE];
484 <        ints = q.toArray(ints);
484 >        Integer[] array = q.toArray(ints);
485 >        assertSame(ints, array);
486          for (int i = 0; i < ints.length; i++) {
487 <            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) {
487 >            assertSame(ints[i], q.poll());
488          }
489      }
490  
491      /**
492 <     * toArray with incompatible array type throws CCE
492 >     * toArray(incompatible array type) throws ArrayStoreException
493       */
494      public void testToArray1_BadArg() {
495 +        LinkedTransferQueue q = populatedQueue(SIZE);
496          try {
497 <            LinkedTransferQueue q = populatedQueue(SIZE);
559 <            Object o[] = q.toArray(new String[10]);
497 >            q.toArray(new String[10]);
498              shouldThrow();
499 <        } catch (ArrayStoreException success) {
562 <        }
499 >        } catch (ArrayStoreException success) {}
500      }
501  
502      /**
# Line 568 | Line 505 | public class LinkedTransferQueueTest ext
505      public void testIterator() throws InterruptedException {
506          LinkedTransferQueue q = populatedQueue(SIZE);
507          Iterator it = q.iterator();
508 <        while (it.hasNext()) {
508 >        int i;
509 >        for (i = 0; it.hasNext(); i++)
510 >            assertTrue(q.contains(it.next()));
511 >        assertEquals(i, SIZE);
512 >        assertIteratorExhausted(it);
513 >
514 >        it = q.iterator();
515 >        for (i = 0; it.hasNext(); i++)
516              assertEquals(it.next(), q.take());
517 <        }
517 >        assertEquals(i, SIZE);
518 >        assertIteratorExhausted(it);
519      }
520  
521      /**
522 <     * iterator.remove removes current element
522 >     * iterator of empty collection has no elements
523 >     */
524 >    public void testEmptyIterator() {
525 >        assertIteratorExhausted(new LinkedTransferQueue().iterator());
526 >    }
527 >
528 >    /**
529 >     * iterator.remove() removes current element
530       */
531      public void testIteratorRemove() {
532          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 587 | Line 539 | public class LinkedTransferQueueTest ext
539          it.remove();
540  
541          it = q.iterator();
542 <        assertEquals(it.next(), one);
543 <        assertEquals(it.next(), three);
542 >        assertSame(it.next(), one);
543 >        assertSame(it.next(), three);
544          assertFalse(it.hasNext());
545      }
546  
# Line 596 | Line 548 | public class LinkedTransferQueueTest ext
548       * iterator ordering is FIFO
549       */
550      public void testIteratorOrdering() {
551 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
551 >        final LinkedTransferQueue<Integer> q
552 >            = new LinkedTransferQueue<Integer>();
553          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
554          q.add(one);
555          q.add(two);
# Line 631 | Line 584 | public class LinkedTransferQueueTest ext
584          LinkedTransferQueue q = populatedQueue(SIZE);
585          String s = q.toString();
586          for (int i = 0; i < SIZE; ++i) {
587 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
587 >            assertTrue(s.contains(String.valueOf(i)));
588          }
589      }
590  
# Line 640 | Line 593 | public class LinkedTransferQueueTest ext
593       */
594      public void testOfferInExecutor() {
595          final LinkedTransferQueue q = new LinkedTransferQueue();
596 <        q.add(one);
597 <        q.add(two);
598 <        ExecutorService executor = Executors.newFixedThreadPool(2);
599 <        executor.execute(new Runnable() {
600 <            public void run() {
601 <                try {
602 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
603 <                } catch (Throwable ex) {
604 <                    threadUnexpectedException(ex);
652 <                }
653 <            }});
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 <            }});
596 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
597 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
598 >        try (PoolCleaner cleaner = cleaner(executor)) {
599 >
600 >            executor.execute(new CheckedRunnable() {
601 >                public void realRun() throws InterruptedException {
602 >                    threadsStarted.await();
603 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
604 >                }});
605  
606 <        joinPool(executor);
606 >            executor.execute(new CheckedRunnable() {
607 >                public void realRun() throws InterruptedException {
608 >                    threadsStarted.await();
609 >                    assertSame(one, q.take());
610 >                    checkEmpty(q);
611 >                }});
612 >        }
613      }
614  
615      /**
616 <     * poll retrieves elements across Executor threads
616 >     * timed poll retrieves elements across Executor threads
617       */
618      public void testPollInExecutor() {
619          final LinkedTransferQueue q = new LinkedTransferQueue();
620 <        ExecutorService executor = Executors.newFixedThreadPool(2);
621 <        executor.execute(new Runnable() {
622 <            public void run() {
623 <                try {
624 <                    threadAssertNull(q.poll());
625 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
626 <                    threadAssertTrue(q.isEmpty());
627 <                } catch (Throwable  ex) {
628 <                    threadUnexpectedException(ex);
629 <                }
630 <            }});
620 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
621 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
622 >        try (PoolCleaner cleaner = cleaner(executor)) {
623 >
624 >            executor.execute(new CheckedRunnable() {
625 >                public void realRun() throws InterruptedException {
626 >                    assertNull(q.poll());
627 >                    threadsStarted.await();
628 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
629 >                    checkEmpty(q);
630 >                }});
631  
632 <        executor.execute(new Runnable() {
633 <            public void run() {
634 <                try {
688 <                    Thread.sleep(SMALL_DELAY_MS);
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    threadsStarted.await();
635                      q.put(one);
636 <                } catch (Throwable ex) {
637 <                    threadUnexpectedException(ex);
692 <                }
693 <            }});
694 <
695 <        joinPool(executor);
636 >                }});
637 >        }
638      }
639  
640      /**
641       * A deserialized serialized queue has same elements in same order
642       */
643      public void testSerialization() throws Exception {
644 <        LinkedTransferQueue q = populatedQueue(SIZE);
645 <
704 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
705 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
706 <        out.writeObject(q);
707 <        out.close();
708 <
709 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
710 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
711 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
712 <
713 <        assertEquals(q.size(), r.size());
714 <        while (!q.isEmpty()) {
715 <            assertEquals(q.remove(), r.remove());
716 <        }
717 <    }
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646  
647 <    /**
648 <     * drainTo(null) throws NullPointerException
649 <     */
650 <    public void testDrainToNull() {
651 <        LinkedTransferQueue q = populatedQueue(SIZE);
652 <        try {
653 <            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) {
647 >        assertNotSame(y, x);
648 >        assertEquals(x.size(), y.size());
649 >        assertEquals(x.toString(), y.toString());
650 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
651 >        while (!x.isEmpty()) {
652 >            assertFalse(y.isEmpty());
653 >            assertEquals(x.remove(), y.remove());
654          }
655 +        assertTrue(y.isEmpty());
656      }
657  
658      /**
# Line 747 | Line 662 | public class LinkedTransferQueueTest ext
662          LinkedTransferQueue q = populatedQueue(SIZE);
663          ArrayList l = new ArrayList();
664          q.drainTo(l);
665 <        assertEquals(q.size(), 0);
666 <        assertEquals(l.size(), SIZE);
665 >        assertEquals(0, q.size());
666 >        assertEquals(SIZE, l.size());
667          for (int i = 0; i < SIZE; ++i) {
668 <            assertEquals(l.get(i), i);
668 >            assertEquals(i, l.get(i));
669          }
670          q.add(zero);
671          q.add(one);
# Line 759 | Line 674 | public class LinkedTransferQueueTest ext
674          assertTrue(q.contains(one));
675          l.clear();
676          q.drainTo(l);
677 <        assertEquals(q.size(), 0);
678 <        assertEquals(l.size(), 2);
677 >        assertEquals(0, q.size());
678 >        assertEquals(2, l.size());
679          for (int i = 0; i < 2; ++i) {
680 <            assertEquals(l.get(i), i);
680 >            assertEquals(i, l.get(i));
681          }
682      }
683  
684      /**
685 <     * drainTo empties full queue, unblocking a waiting put.
685 >     * drainTo(c) empties full queue, unblocking a waiting put.
686       */
687      public void testDrainToWithActivePut() throws InterruptedException {
688          final LinkedTransferQueue q = populatedQueue(SIZE);
689 <        Thread t = new Thread(new Runnable() {
690 <            public void run() {
691 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
689 >        Thread t = newStartedThread(new CheckedRunnable() {
690 >            public void realRun() {
691 >                q.put(SIZE + 1);
692              }});
782        t.start();
693          ArrayList l = new ArrayList();
694          q.drainTo(l);
695          assertTrue(l.size() >= SIZE);
696 <        for (int i = 0; i < SIZE; ++i) {
697 <            assertEquals(l.get(i), i);
698 <        }
789 <        t.join();
696 >        for (int i = 0; i < SIZE; ++i)
697 >            assertEquals(i, l.get(i));
698 >        awaitTermination(t, MEDIUM_DELAY_MS);
699          assertTrue(q.size() + l.size() >= SIZE);
700      }
701  
702      /**
703 <     * drainTo(null, n) throws NullPointerException
795 <     */
796 <    public void testDrainToNullN() {
797 <        LinkedTransferQueue q = populatedQueue(SIZE);
798 <        try {
799 <            q.drainTo(null, 0);
800 <            shouldThrow();
801 <        } catch (NullPointerException success) {
802 <        }
803 <    }
804 <
805 <    /**
806 <     * drainTo(this, n) throws IllegalArgumentException
807 <     */
808 <    public void testDrainToSelfN() {
809 <        LinkedTransferQueue q = populatedQueue(SIZE);
810 <        try {
811 <            q.drainTo(q, 0);
812 <            shouldThrow();
813 <        } catch (IllegalArgumentException success) {
814 <        }
815 <    }
816 <
817 <    /**
818 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
703 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
704       */
705      public void testDrainToN() {
706          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 826 | Line 711 | public class LinkedTransferQueueTest ext
711              ArrayList l = new ArrayList();
712              q.drainTo(l, i);
713              int k = (i < SIZE) ? i : SIZE;
714 <            assertEquals(l.size(), k);
715 <            assertEquals(q.size(), SIZE - k);
716 <            for (int j = 0; j < k; ++j) {
717 <                assertEquals(l.get(j), j);
718 <            }
834 <            while (q.poll() != null)
835 <                ;
714 >            assertEquals(k, l.size());
715 >            assertEquals(SIZE - k, q.size());
716 >            for (int j = 0; j < k; ++j)
717 >                assertEquals(j, l.get(j));
718 >            do {} while (q.poll() != null);
719          }
720      }
721  
722      /**
723 <     * poll and take should decrement the waiting consumer count
723 >     * timed poll() or take() increments the waiting consumer count;
724 >     * offer(e) decrements the waiting consumer count
725       */
726      public void testWaitingConsumer() throws InterruptedException {
727          final LinkedTransferQueue q = new LinkedTransferQueue();
728 <        final ConsumerObserver waiting = new ConsumerObserver();
729 <        new Thread(new Runnable() {
730 <            public void run() {
731 <                try {
732 <                    threadAssertTrue(q.hasWaitingConsumer());
733 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
734 <                    threadAssertTrue(q.offer(new Object()));
735 <                } catch (Throwable ex) {
736 <                    threadUnexpectedException(ex);
737 <                }
738 <            }}).start();
739 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
740 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
728 >        assertEquals(0, q.getWaitingConsumerCount());
729 >        assertFalse(q.hasWaitingConsumer());
730 >        final CountDownLatch threadStarted = new CountDownLatch(1);
731 >
732 >        Thread t = newStartedThread(new CheckedRunnable() {
733 >            public void realRun() throws InterruptedException {
734 >                threadStarted.countDown();
735 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
736 >                assertEquals(0, q.getWaitingConsumerCount());
737 >                assertFalse(q.hasWaitingConsumer());
738 >            }});
739 >
740 >        threadStarted.await();
741 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
742 >        assertEquals(1, q.getWaitingConsumerCount());
743 >        assertTrue(q.hasWaitingConsumer());
744 >
745 >        assertTrue(q.offer(one));
746 >        assertEquals(0, q.getWaitingConsumerCount());
747 >        assertFalse(q.hasWaitingConsumer());
748 >
749 >        awaitTermination(t, MEDIUM_DELAY_MS);
750      }
751  
752      /**
# Line 864 | Line 757 | public class LinkedTransferQueueTest ext
757              LinkedTransferQueue q = new LinkedTransferQueue();
758              q.transfer(null);
759              shouldThrow();
760 <        } catch (NullPointerException ex) {
868 <        }
760 >        } catch (NullPointerException success) {}
761      }
762  
763      /**
764 <     * transfer attempts to insert into the queue then wait until that
765 <     * object is removed via take or poll.
764 >     * transfer waits until a poll occurs. The transfered element
765 >     * is returned by this associated poll.
766       */
767      public void testTransfer2() throws InterruptedException {
768 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
769 <
770 <        new Thread(new Runnable() {
771 <            public void run() {
772 <                try {
773 <                    q.transfer(SIZE);
774 <                    threadAssertTrue(q.isEmpty());
775 <                } catch (Throwable ex) {
776 <                    threadUnexpectedException(ex);
777 <                }
886 <            }}).start();
768 >        final LinkedTransferQueue<Integer> q
769 >            = new LinkedTransferQueue<Integer>();
770 >        final CountDownLatch threadStarted = new CountDownLatch(1);
771 >
772 >        Thread t = newStartedThread(new CheckedRunnable() {
773 >            public void realRun() throws InterruptedException {
774 >                threadStarted.countDown();
775 >                q.transfer(five);
776 >                checkEmpty(q);
777 >            }});
778  
779 <        Thread.sleep(SHORT_DELAY_MS);
779 >        threadStarted.await();
780 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
781          assertEquals(1, q.size());
782 <        assertEquals(SIZE, (int) q.poll());
783 <        assertTrue(q.isEmpty());
782 >        assertSame(five, q.poll());
783 >        checkEmpty(q);
784 >        awaitTermination(t, MEDIUM_DELAY_MS);
785      }
786  
787      /**
788 <     * transfer will attempt to transfer in fifo order and continue
896 <     * waiting if the element being transfered is not polled or taken
788 >     * transfer waits until a poll occurs, and then transfers in fifo order
789       */
790      public void testTransfer3() throws InterruptedException {
791 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
791 >        final LinkedTransferQueue<Integer> q
792 >            = new LinkedTransferQueue<Integer>();
793  
794 <        Thread first =
795 <            new Thread(new Runnable() {
796 <                public void run() {
797 <                    try {
798 <                        Integer i = SIZE + 1;
799 <                        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();
794 >        Thread first = newStartedThread(new CheckedRunnable() {
795 >            public void realRun() throws InterruptedException {
796 >                q.transfer(four);
797 >                assertTrue(!q.contains(four));
798 >                assertEquals(1, q.size());
799 >            }});
800  
801 <        Thread interruptedThread =
802 <            new Thread(new Runnable() {
803 <                public void run() {
804 <                    try {
805 <                        while (q.size() == 0)
806 <                            Thread.yield();
921 <                        q.transfer(SIZE);
922 <                        threadShouldThrow();
923 <                    } catch (InterruptedException success) {
924 <                    } catch (Throwable ex) {
925 <                        threadUnexpectedException(ex);
926 <                    }
801 >        Thread interruptedThread = newStartedThread(
802 >            new CheckedInterruptedRunnable() {
803 >                public void realRun() throws InterruptedException {
804 >                    while (q.isEmpty())
805 >                        Thread.yield();
806 >                    q.transfer(five);
807                  }});
928        interruptedThread.start();
808  
809          while (q.size() < 2)
810              Thread.yield();
811          assertEquals(2, q.size());
812 <        assertEquals(SIZE + 1, (int) q.poll());
812 >        assertSame(four, q.poll());
813          first.join();
814          assertEquals(1, q.size());
815          interruptedThread.interrupt();
816          interruptedThread.join();
817 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
817 >        checkEmpty(q);
818      }
819  
820      /**
821 <     * transfer will wait as long as a poll or take occurs if one does occur
822 <     * the waiting is finished and the thread that tries to poll/take
945 <     * wins in retrieving the element
821 >     * transfer waits until a poll occurs, at which point the polling
822 >     * thread returns the element
823       */
824      public void testTransfer4() throws InterruptedException {
825          final LinkedTransferQueue q = new LinkedTransferQueue();
826 <        new Thread(new Runnable() {
827 <            public void run() {
828 <                try {
829 <                    q.transfer(four);
830 <                    threadAssertFalse(q.contains(four));
831 <                    threadAssertEquals(three, q.poll());
832 <                } catch (Throwable ex) {
833 <                    threadUnexpectedException(ex);
834 <                }
835 <            }}).start();
836 <        Thread.sleep(MEDIUM_DELAY_MS);
826 >
827 >        Thread t = newStartedThread(new CheckedRunnable() {
828 >            public void realRun() throws InterruptedException {
829 >                q.transfer(four);
830 >                assertFalse(q.contains(four));
831 >                assertSame(three, q.poll());
832 >            }});
833 >
834 >        while (q.isEmpty())
835 >            Thread.yield();
836 >        assertFalse(q.isEmpty());
837 >        assertEquals(1, q.size());
838          assertTrue(q.offer(three));
839 <        assertEquals(four, q.poll());
839 >        assertSame(four, q.poll());
840 >        awaitTermination(t, MEDIUM_DELAY_MS);
841 >    }
842 >
843 >    /**
844 >     * transfer waits until a take occurs. The transfered element
845 >     * is returned by this associated take.
846 >     */
847 >    public void testTransfer5() throws InterruptedException {
848 >        final LinkedTransferQueue<Integer> q
849 >            = new LinkedTransferQueue<Integer>();
850 >
851 >        Thread t = newStartedThread(new CheckedRunnable() {
852 >            public void realRun() throws InterruptedException {
853 >                q.transfer(four);
854 >                checkEmpty(q);
855 >            }});
856 >
857 >        while (q.isEmpty())
858 >            Thread.yield();
859 >        assertFalse(q.isEmpty());
860 >        assertEquals(1, q.size());
861 >        assertSame(four, q.take());
862 >        checkEmpty(q);
863 >        awaitTermination(t, MEDIUM_DELAY_MS);
864      }
865  
866      /**
867       * tryTransfer(null) throws NullPointerException
868       */
869      public void testTryTransfer1() {
870 +        final LinkedTransferQueue q = new LinkedTransferQueue();
871          try {
969            final LinkedTransferQueue q = new LinkedTransferQueue();
872              q.tryTransfer(null);
873 <            this.shouldThrow();
874 <        } catch (NullPointerException ex) {
973 <        }
873 >            shouldThrow();
874 >        } catch (NullPointerException success) {}
875      }
876  
877      /**
878       * tryTransfer returns false and does not enqueue if there are no
879       * consumers waiting to poll or take.
880       */
881 <    public void testTryTransfer2() {
881 >    public void testTryTransfer2() throws InterruptedException {
882          final LinkedTransferQueue q = new LinkedTransferQueue();
883          assertFalse(q.tryTransfer(new Object()));
884          assertFalse(q.hasWaitingConsumer());
885 <        assertTrue(q.isEmpty());
985 <        assertEquals(0, q.size());
885 >        checkEmpty(q);
886      }
887  
888      /**
# Line 992 | Line 892 | public class LinkedTransferQueueTest ext
892      public void testTryTransfer3() throws InterruptedException {
893          final Object hotPotato = new Object();
894          final LinkedTransferQueue q = new LinkedTransferQueue();
895 <        new Thread(new Runnable() {
896 <            public void run() {
897 <                try {
898 <                    while (! q.hasWaitingConsumer())
899 <                        Thread.yield();
900 <                    threadAssertTrue(q.hasWaitingConsumer());
901 <                    threadAssertTrue(q.isEmpty());
902 <                    threadAssertTrue(q.size() == 0);
903 <                    threadAssertTrue(q.tryTransfer(hotPotato));
904 <                } catch (Throwable ex) {
905 <                    threadUnexpectedException(ex);
906 <                }
907 <            }}).start();
1008 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
1009 <        assertTrue(q.isEmpty());
895 >
896 >        Thread t = newStartedThread(new CheckedRunnable() {
897 >            public void realRun() {
898 >                while (! q.hasWaitingConsumer())
899 >                    Thread.yield();
900 >                assertTrue(q.hasWaitingConsumer());
901 >                checkEmpty(q);
902 >                assertTrue(q.tryTransfer(hotPotato));
903 >            }});
904 >
905 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
906 >        checkEmpty(q);
907 >        awaitTermination(t, MEDIUM_DELAY_MS);
908      }
909  
910      /**
# Line 1016 | Line 914 | public class LinkedTransferQueueTest ext
914      public void testTryTransfer4() throws InterruptedException {
915          final Object hotPotato = new Object();
916          final LinkedTransferQueue q = new LinkedTransferQueue();
917 <        new Thread(new Runnable() {
918 <            public void run() {
919 <                try {
920 <                    while (! q.hasWaitingConsumer())
921 <                        Thread.yield();
922 <                    threadAssertTrue(q.hasWaitingConsumer());
923 <                    threadAssertTrue(q.isEmpty());
924 <                    threadAssertTrue(q.size() == 0);
925 <                    threadAssertTrue(q.tryTransfer(hotPotato));
926 <                } catch (Throwable ex) {
927 <                    threadUnexpectedException(ex);
928 <                }
929 <            }}).start();
1032 <        assertTrue(q.take() == hotPotato);
1033 <        assertTrue(q.isEmpty());
917 >
918 >        Thread t = newStartedThread(new CheckedRunnable() {
919 >            public void realRun() {
920 >                while (! q.hasWaitingConsumer())
921 >                    Thread.yield();
922 >                assertTrue(q.hasWaitingConsumer());
923 >                checkEmpty(q);
924 >                assertTrue(q.tryTransfer(hotPotato));
925 >            }});
926 >
927 >        assertSame(q.take(), hotPotato);
928 >        checkEmpty(q);
929 >        awaitTermination(t, MEDIUM_DELAY_MS);
930      }
931  
932      /**
933 <     * tryTransfer waits the amount given if interrupted, show an
1038 <     * interrupted exception
933 >     * tryTransfer blocks interruptibly if no takers
934       */
935      public void testTryTransfer5() throws InterruptedException {
936          final LinkedTransferQueue q = new LinkedTransferQueue();
937 <        Thread toInterrupt = new Thread(new Runnable() {
938 <            public void run() {
937 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
938 >        assertTrue(q.isEmpty());
939 >
940 >        Thread t = newStartedThread(new CheckedRunnable() {
941 >            public void realRun() throws InterruptedException {
942 >                Thread.currentThread().interrupt();
943                  try {
944 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
945 <                    threadShouldThrow();
946 <                } catch (InterruptedException success) {
947 <                } catch (Throwable ex) {
948 <                    threadUnexpectedException(ex);
949 <                }
944 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
945 >                    shouldThrow();
946 >                } catch (InterruptedException success) {}
947 >                assertFalse(Thread.interrupted());
948 >
949 >                pleaseInterrupt.countDown();
950 >                try {
951 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
952 >                    shouldThrow();
953 >                } catch (InterruptedException success) {}
954 >                assertFalse(Thread.interrupted());
955              }});
956 <        toInterrupt.start();
957 <        Thread.sleep(SMALL_DELAY_MS);
958 <        toInterrupt.interrupt();
956 >
957 >        await(pleaseInterrupt);
958 >        assertThreadStaysAlive(t);
959 >        t.interrupt();
960 >        awaitTermination(t);
961 >        checkEmpty(q);
962      }
963  
964      /**
965 <     * tryTransfer gives up after the timeout and return false
965 >     * tryTransfer gives up after the timeout and returns false
966       */
967      public void testTryTransfer6() throws InterruptedException {
968          final LinkedTransferQueue q = new LinkedTransferQueue();
969 <        new Thread(new Runnable() {
970 <            public void run() {
971 <                try {
972 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
973 <                } catch (Throwable ex) {
974 <                    threadUnexpectedException(ex);
975 <                }
976 <            }}).start();
977 <        Thread.sleep(LONG_DELAY_MS);
978 <        assertTrue(q.isEmpty());
969 >
970 >        Thread t = newStartedThread(new CheckedRunnable() {
971 >            public void realRun() throws InterruptedException {
972 >                long startTime = System.nanoTime();
973 >                assertFalse(q.tryTransfer(new Object(),
974 >                                          timeoutMillis(), MILLISECONDS));
975 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
976 >                checkEmpty(q);
977 >            }});
978 >
979 >        awaitTermination(t);
980 >        checkEmpty(q);
981      }
982  
983      /**
# Line 1078 | Line 987 | public class LinkedTransferQueueTest ext
987      public void testTryTransfer7() throws InterruptedException {
988          final LinkedTransferQueue q = new LinkedTransferQueue();
989          assertTrue(q.offer(four));
990 <        new Thread(new Runnable() {
991 <            public void run() {
992 <                try {
993 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
994 <                    threadAssertTrue(q.isEmpty());
995 <                } catch (Throwable ex) {
996 <                    threadUnexpectedException(ex);
997 <                }
998 <            }}).start();
1090 <        Thread.sleep(SHORT_DELAY_MS);
990 >
991 >        Thread t = newStartedThread(new CheckedRunnable() {
992 >            public void realRun() throws InterruptedException {
993 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
994 >                checkEmpty(q);
995 >            }});
996 >
997 >        while (q.size() != 2)
998 >            Thread.yield();
999          assertEquals(2, q.size());
1000 <        assertEquals(four, q.poll());
1001 <        assertEquals(five, q.poll());
1002 <        assertTrue(q.isEmpty());
1000 >        assertSame(four, q.poll());
1001 >        assertSame(five, q.poll());
1002 >        checkEmpty(q);
1003 >        awaitTermination(t, MEDIUM_DELAY_MS);
1004      }
1005  
1006      /**
1007 <     * tryTransfer attempts to enqueue into the q and fails returning
1008 <     * false not enqueueing and the successive poll is null
1007 >     * tryTransfer attempts to enqueue into the queue and fails
1008 >     * returning false not enqueueing and the successive poll is null
1009       */
1010      public void testTryTransfer8() throws InterruptedException {
1011          final LinkedTransferQueue q = new LinkedTransferQueue();
1012          assertTrue(q.offer(four));
1013          assertEquals(1, q.size());
1014 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1014 >        long startTime = System.nanoTime();
1015 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1016 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1017          assertEquals(1, q.size());
1018 <        assertEquals(four, q.poll());
1108 <        threadAssertTrue(q.isEmpty());
1018 >        assertSame(four, q.poll());
1019          assertNull(q.poll());
1020 +        checkEmpty(q);
1021      }
1022  
1023      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1024          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1025 <        assertTrue(q.isEmpty());
1025 >        checkEmpty(q);
1026          for (int i = 0; i < n; i++) {
1027              assertEquals(i, q.size());
1028              assertTrue(q.offer(i));
# Line 1121 | Line 1032 | public class LinkedTransferQueueTest ext
1032          return q;
1033      }
1034  
1035 <    private static class ConsumerObserver {
1036 <
1037 <        private int waitingConsumers;
1038 <
1039 <        private ConsumerObserver() {
1040 <        }
1041 <
1042 <        private void setWaitingConsumer(int i) {
1043 <            this.waitingConsumers = i;
1044 <        }
1045 <
1046 <        private int getWaitingConsumers() {
1136 <            return waitingConsumers;
1035 >    /**
1036 >     * remove(null), contains(null) always return false
1037 >     */
1038 >    public void testNeverContainsNull() {
1039 >        Collection<?>[] qs = {
1040 >            new LinkedTransferQueue<Object>(),
1041 >            populatedQueue(2),
1042 >        };
1043 >
1044 >        for (Collection<?> q : qs) {
1045 >            assertFalse(q.contains(null));
1046 >            assertFalse(q.remove(null));
1047          }
1048      }
1049   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines