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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines