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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines