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.50 by jsr166, Sat Nov 26 05:19:17 2011 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;
14 < import java.util.ArrayList;
8 > import junit.framework.*;
9   import java.util.Arrays;
10 < import java.util.ConcurrentModificationException;
10 > import java.util.ArrayList;
11 > import java.util.Collection;
12   import java.util.Iterator;
13 + import java.util.List;
14   import java.util.NoSuchElementException;
15 < import java.util.concurrent.*;
16 < import junit.framework.Test;
17 < import junit.framework.TestSuite;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.LinkedTransferQueue;
21 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
23  
24 + @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
26  
27 +    public static class Generic extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedTransferQueue();
30 +        }
31 +    }
32 +
33      public static void main(String[] args) {
34          junit.textui.TestRunner.run(suite());
35      }
36  
37      public static Test suite() {
38 <        return new TestSuite(LinkedTransferQueueTest.class);
38 >        return newTestSuite(LinkedTransferQueueTest.class,
39 >                            new Generic().testSuite());
40      }
41  
42      /**
43 <     * Constructor builds new queue with size being zero and empty being true
43 >     * Constructor builds new queue with size being zero and empty
44 >     * being true
45       */
46      public void testConstructor1() {
47          assertEquals(0, new LinkedTransferQueue().size());
# Line 39 | Line 49 | public class LinkedTransferQueueTest ext
49      }
50  
51      /**
52 <     * Initializing constructor with null collection throws NullPointerException
52 >     * Initializing constructor with null collection throws
53 >     * NullPointerException
54       */
55      public void testConstructor2() {
56          try {
57              new LinkedTransferQueue(null);
58              shouldThrow();
59 <        } catch (NullPointerException success) {
49 <        }
59 >        } catch (NullPointerException success) {}
60      }
61  
62      /**
63 <     * Initializing from Collection of null elements throws NullPointerException
63 >     * Initializing from Collection of null elements throws
64 >     * NullPointerException
65       */
66      public void testConstructor3() {
67 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
68          try {
69 <            Integer[] ints = new Integer[SIZE];
58 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71 <        } catch (NullPointerException success) {
61 <        }
71 >        } catch (NullPointerException success) {}
72      }
73  
74      /**
# Line 66 | Line 76 | public class LinkedTransferQueueTest ext
76       * throws NullPointerException
77       */
78      public void testConstructor4() {
79 +        Integer[] ints = new Integer[SIZE];
80 +        for (int i = 0; i < SIZE-1; ++i)
81 +            ints[i] = i;
82 +        Collection<Integer> elements = Arrays.asList(ints);
83          try {
84 <            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));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86 <        } catch (NullPointerException success) {
77 <        }
86 >        } catch (NullPointerException success) {}
87      }
88  
89      /**
90       * Queue contains all elements of the collection it is initialized by
91       */
92      public void testConstructor5() {
93 <        try {
94 <            Integer[] ints = new Integer[SIZE];
95 <            for (int i = 0; i < SIZE; ++i) {
96 <                ints[i] = i;
97 <            }
98 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
99 <            for (int i = 0; i < SIZE; ++i) {
100 <                assertEquals(ints[i], q.poll());
101 <            }
102 <        } finally {
93 >        Integer[] ints = new Integer[SIZE];
94 >        for (int i = 0; i < SIZE; ++i) {
95 >            ints[i] = i;
96 >        }
97 >        List intList = Arrays.asList(ints);
98 >        LinkedTransferQueue q
99 >            = new LinkedTransferQueue(intList);
100 >        assertEquals(q.size(), intList.size());
101 >        assertEquals(q.toString(), intList.toString());
102 >        assertTrue(Arrays.equals(q.toArray(),
103 >                                     intList.toArray()));
104 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
105 >                                 intList.toArray(new Object[0])));
106 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
107 >                                 intList.toArray(new Object[SIZE])));
108 >        for (int i = 0; i < SIZE; ++i) {
109 >            assertEquals(ints[i], q.poll());
110          }
111      }
112  
113      /**
114 <     * Remaining capacity never decrease nor increase on add or remove
114 >     * remainingCapacity() always returns Integer.MAX_VALUE
115       */
116      public void testRemainingCapacity() {
117          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 112 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
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) {
147        }
148    }
149
150    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 155 | Line 135 | public class LinkedTransferQueueTest ext
135              LinkedTransferQueue q = populatedQueue(SIZE);
136              q.addAll(q);
137              shouldThrow();
138 <        } 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 <        }
138 >        } catch (IllegalArgumentException success) {}
139      }
140  
141      /**
142 <     * addAll of a collection with any null elements throws NullPointerException after
143 <     * possibly adding some elements
142 >     * addAll of a collection with any null elements throws
143 >     * NullPointerException after possibly adding some elements
144       */
145      public void testAddAll3() {
146          try {
# Line 185 | Line 151 | public class LinkedTransferQueueTest ext
151              }
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(q.size(), i);
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());
481 >            assertSame(ints[i], q.poll());
482          }
483      }
484  
485      /**
486 <     * 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) {
550 <        }
551 <    }
552 <
553 <    /**
554 <     * 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 +        int i = 0;
503          while (it.hasNext()) {
504 <            assertEquals(it.next(), q.take());
504 >            assertEquals(it.next(), i++);
505          }
506 +        assertEquals(i, SIZE);
507      }
508  
509      /**
510 <     * iterator.remove removes current element
510 >     * iterator.remove() removes current element
511       */
512      public void testIteratorRemove() {
513          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 587 | Line 520 | public class LinkedTransferQueueTest ext
520          it.remove();
521  
522          it = q.iterator();
523 <        assertEquals(it.next(), one);
524 <        assertEquals(it.next(), three);
523 >        assertSame(it.next(), one);
524 >        assertSame(it.next(), three);
525          assertFalse(it.hasNext());
526      }
527  
# Line 596 | Line 529 | public class LinkedTransferQueueTest ext
529       * iterator ordering is FIFO
530       */
531      public void testIteratorOrdering() {
532 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
532 >        final LinkedTransferQueue<Integer> q
533 >            = new LinkedTransferQueue<Integer>();
534          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
535          q.add(one);
536          q.add(two);
# Line 631 | Line 565 | public class LinkedTransferQueueTest ext
565          LinkedTransferQueue q = populatedQueue(SIZE);
566          String s = q.toString();
567          for (int i = 0; i < SIZE; ++i) {
568 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
568 >            assertTrue(s.contains(String.valueOf(i)));
569          }
570      }
571  
# Line 640 | Line 574 | public class LinkedTransferQueueTest ext
574       */
575      public void testOfferInExecutor() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
577 <        q.add(one);
644 <        q.add(two);
577 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
578          ExecutorService executor = Executors.newFixedThreadPool(2);
579 <        executor.execute(new Runnable() {
580 <            public void run() {
581 <                try {
582 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
583 <                } catch (Throwable ex) {
651 <                    threadUnexpectedException(ex);
652 <                }
579 >
580 >        executor.execute(new CheckedRunnable() {
581 >            public void realRun() throws InterruptedException {
582 >                threadsStarted.await();
583 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584              }});
585  
586 <        executor.execute(new Runnable() {
587 <            public void run() {
588 <                try {
589 <                    Thread.sleep(SMALL_DELAY_MS);
590 <                    threadAssertEquals(one, q.take());
660 <                } catch (Throwable ex) {
661 <                    threadUnexpectedException(ex);
662 <                }
586 >        executor.execute(new CheckedRunnable() {
587 >            public void realRun() throws InterruptedException {
588 >                threadsStarted.await();
589 >                assertSame(one, q.take());
590 >                checkEmpty(q);
591              }});
592  
593          joinPool(executor);
594      }
595  
596      /**
597 <     * poll retrieves elements across Executor threads
597 >     * timed poll retrieves elements across Executor threads
598       */
599      public void testPollInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602          ExecutorService executor = Executors.newFixedThreadPool(2);
603 <        executor.execute(new Runnable() {
604 <            public void run() {
605 <                try {
606 <                    threadAssertNull(q.poll());
607 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
608 <                    threadAssertTrue(q.isEmpty());
609 <                } catch (Throwable  ex) {
681 <                    threadUnexpectedException(ex);
682 <                }
603 >
604 >        executor.execute(new CheckedRunnable() {
605 >            public void realRun() throws InterruptedException {
606 >                assertNull(q.poll());
607 >                threadsStarted.await();
608 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609 >                checkEmpty(q);
610              }});
611  
612 <        executor.execute(new Runnable() {
613 <            public void run() {
614 <                try {
615 <                    Thread.sleep(SMALL_DELAY_MS);
689 <                    q.put(one);
690 <                } catch (Throwable ex) {
691 <                    threadUnexpectedException(ex);
692 <                }
612 >        executor.execute(new CheckedRunnable() {
613 >            public void realRun() throws InterruptedException {
614 >                threadsStarted.await();
615 >                q.put(one);
616              }});
617  
618          joinPool(executor);
# Line 699 | Line 622 | public class LinkedTransferQueueTest ext
622       * A deserialized serialized queue has same elements in same order
623       */
624      public void testSerialization() throws Exception {
625 <        LinkedTransferQueue q = populatedQueue(SIZE);
626 <
704 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
705 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
706 <        out.writeObject(q);
707 <        out.close();
625 >        Queue x = populatedQueue(SIZE);
626 >        Queue y = serialClone(x);
627  
628 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
629 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
630 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
631 <
632 <        assertEquals(q.size(), r.size());
633 <        while (!q.isEmpty()) {
634 <            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) {
628 >        assertTrue(x != y);
629 >        assertEquals(x.size(), y.size());
630 >        assertEquals(x.toString(), y.toString());
631 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
632 >        while (!x.isEmpty()) {
633 >            assertFalse(y.isEmpty());
634 >            assertEquals(x.remove(), y.remove());
635          }
636 +        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 747 | Line 643 | public class LinkedTransferQueueTest ext
643          LinkedTransferQueue q = populatedQueue(SIZE);
644          ArrayList l = new ArrayList();
645          q.drainTo(l);
646 <        assertEquals(q.size(), 0);
647 <        assertEquals(l.size(), SIZE);
646 >        assertEquals(0, q.size());
647 >        assertEquals(SIZE, l.size());
648          for (int i = 0; i < SIZE; ++i) {
649              assertEquals(l.get(i), i);
650          }
# Line 759 | Line 655 | public class LinkedTransferQueueTest ext
655          assertTrue(q.contains(one));
656          l.clear();
657          q.drainTo(l);
658 <        assertEquals(q.size(), 0);
659 <        assertEquals(l.size(), 2);
658 >        assertEquals(0, q.size());
659 >        assertEquals(2, l.size());
660          for (int i = 0; i < 2; ++i) {
661              assertEquals(l.get(i), i);
662          }
663      }
664  
665      /**
666 <     * drainTo empties full queue, unblocking a waiting put.
666 >     * drainTo(c) empties full queue, unblocking a waiting put.
667       */
668      public void testDrainToWithActivePut() throws InterruptedException {
669          final LinkedTransferQueue q = populatedQueue(SIZE);
670 <        Thread t = new Thread(new Runnable() {
671 <            public void run() {
672 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
670 >        Thread t = newStartedThread(new CheckedRunnable() {
671 >            public void realRun() {
672 >                q.put(SIZE + 1);
673              }});
782        t.start();
674          ArrayList l = new ArrayList();
675          q.drainTo(l);
676          assertTrue(l.size() >= SIZE);
677          for (int i = 0; i < SIZE; ++i) {
678              assertEquals(l.get(i), i);
679          }
680 <        t.join();
680 >        awaitTermination(t, MEDIUM_DELAY_MS);
681          assertTrue(q.size() + l.size() >= SIZE);
682      }
683  
684      /**
685 <     * 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
685 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
688          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 837 | Line 704 | public class LinkedTransferQueueTest ext
704      }
705  
706      /**
707 <     * poll and take should decrement the waiting consumer count
707 >     * timed poll() or take() increments the waiting consumer count;
708 >     * offer(e) decrements the waiting consumer count
709       */
710      public void testWaitingConsumer() throws InterruptedException {
711          final LinkedTransferQueue q = new LinkedTransferQueue();
712 <        final ConsumerObserver waiting = new ConsumerObserver();
713 <        new Thread(new Runnable() {
714 <            public void run() {
715 <                try {
716 <                    threadAssertTrue(q.hasWaitingConsumer());
717 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
718 <                    threadAssertTrue(q.offer(new Object()));
719 <                } catch (Throwable ex) {
720 <                    threadUnexpectedException(ex);
721 <                }
722 <            }}).start();
723 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
724 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
712 >        assertEquals(0, q.getWaitingConsumerCount());
713 >        assertFalse(q.hasWaitingConsumer());
714 >        final CountDownLatch threadStarted = new CountDownLatch(1);
715 >
716 >        Thread t = newStartedThread(new CheckedRunnable() {
717 >            public void realRun() throws InterruptedException {
718 >                threadStarted.countDown();
719 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
720 >                assertEquals(0, q.getWaitingConsumerCount());
721 >                assertFalse(q.hasWaitingConsumer());
722 >            }});
723 >
724 >        threadStarted.await();
725 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
726 >        assertEquals(1, q.getWaitingConsumerCount());
727 >        assertTrue(q.hasWaitingConsumer());
728 >
729 >        assertTrue(q.offer(one));
730 >        assertEquals(0, q.getWaitingConsumerCount());
731 >        assertFalse(q.hasWaitingConsumer());
732 >
733 >        awaitTermination(t, MEDIUM_DELAY_MS);
734      }
735  
736      /**
# Line 864 | Line 741 | public class LinkedTransferQueueTest ext
741              LinkedTransferQueue q = new LinkedTransferQueue();
742              q.transfer(null);
743              shouldThrow();
744 <        } catch (NullPointerException ex) {
868 <        }
744 >        } catch (NullPointerException success) {}
745      }
746  
747      /**
748 <     * transfer attempts to insert into the queue then wait until that
749 <     * object is removed via take or poll.
748 >     * transfer waits until a poll occurs. The transfered element
749 >     * is returned by this associated poll.
750       */
751      public void testTransfer2() throws InterruptedException {
752 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
753 <
754 <        new Thread(new Runnable() {
755 <            public void run() {
756 <                try {
757 <                    q.transfer(SIZE);
758 <                    threadAssertTrue(q.isEmpty());
759 <                } catch (Throwable ex) {
760 <                    threadUnexpectedException(ex);
761 <                }
886 <            }}).start();
752 >        final LinkedTransferQueue<Integer> q
753 >            = new LinkedTransferQueue<Integer>();
754 >        final CountDownLatch threadStarted = new CountDownLatch(1);
755 >
756 >        Thread t = newStartedThread(new CheckedRunnable() {
757 >            public void realRun() throws InterruptedException {
758 >                threadStarted.countDown();
759 >                q.transfer(five);
760 >                checkEmpty(q);
761 >            }});
762  
763 <        Thread.sleep(SHORT_DELAY_MS);
763 >        threadStarted.await();
764 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
765          assertEquals(1, q.size());
766 <        assertEquals(SIZE, (int) q.poll());
767 <        assertTrue(q.isEmpty());
766 >        assertSame(five, q.poll());
767 >        checkEmpty(q);
768 >        awaitTermination(t, MEDIUM_DELAY_MS);
769      }
770  
771      /**
772 <     * transfer will attempt to transfer in fifo order and continue
896 <     * waiting if the element being transfered is not polled or taken
772 >     * transfer waits until a poll occurs, and then transfers in fifo order
773       */
774      public void testTransfer3() throws InterruptedException {
775 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
775 >        final LinkedTransferQueue<Integer> q
776 >            = new LinkedTransferQueue<Integer>();
777  
778 <        Thread first =
779 <            new Thread(new Runnable() {
780 <                public void run() {
781 <                    try {
782 <                        Integer i = SIZE + 1;
783 <                        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();
778 >        Thread first = newStartedThread(new CheckedRunnable() {
779 >            public void realRun() throws InterruptedException {
780 >                q.transfer(four);
781 >                assertTrue(!q.contains(four));
782 >                assertEquals(1, q.size());
783 >            }});
784  
785 <        Thread interruptedThread =
786 <            new Thread(new Runnable() {
787 <                public void run() {
788 <                    try {
789 <                        while (q.size() == 0)
790 <                            Thread.yield();
921 <                        q.transfer(SIZE);
922 <                        threadShouldThrow();
923 <                    } catch (InterruptedException success) {
924 <                    } catch (Throwable ex) {
925 <                        threadUnexpectedException(ex);
926 <                    }
785 >        Thread interruptedThread = newStartedThread(
786 >            new CheckedInterruptedRunnable() {
787 >                public void realRun() throws InterruptedException {
788 >                    while (q.isEmpty())
789 >                        Thread.yield();
790 >                    q.transfer(five);
791                  }});
928        interruptedThread.start();
792  
793          while (q.size() < 2)
794              Thread.yield();
795          assertEquals(2, q.size());
796 <        assertEquals(SIZE + 1, (int) q.poll());
796 >        assertSame(four, q.poll());
797          first.join();
798          assertEquals(1, q.size());
799          interruptedThread.interrupt();
800          interruptedThread.join();
801 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
801 >        checkEmpty(q);
802      }
803  
804      /**
805 <     * transfer will wait as long as a poll or take occurs if one does occur
806 <     * the waiting is finished and the thread that tries to poll/take
945 <     * wins in retrieving the element
805 >     * transfer waits until a poll occurs, at which point the polling
806 >     * thread returns the element
807       */
808      public void testTransfer4() throws InterruptedException {
809          final LinkedTransferQueue q = new LinkedTransferQueue();
810 <        new Thread(new Runnable() {
811 <            public void run() {
812 <                try {
813 <                    q.transfer(four);
814 <                    threadAssertFalse(q.contains(four));
815 <                    threadAssertEquals(three, q.poll());
816 <                } catch (Throwable ex) {
817 <                    threadUnexpectedException(ex);
818 <                }
819 <            }}).start();
820 <        Thread.sleep(MEDIUM_DELAY_MS);
810 >
811 >        Thread t = newStartedThread(new CheckedRunnable() {
812 >            public void realRun() throws InterruptedException {
813 >                q.transfer(four);
814 >                assertFalse(q.contains(four));
815 >                assertSame(three, q.poll());
816 >            }});
817 >
818 >        while (q.isEmpty())
819 >            Thread.yield();
820 >        assertFalse(q.isEmpty());
821 >        assertEquals(1, q.size());
822          assertTrue(q.offer(three));
823 <        assertEquals(four, q.poll());
823 >        assertSame(four, q.poll());
824 >        awaitTermination(t, MEDIUM_DELAY_MS);
825 >    }
826 >
827 >    /**
828 >     * transfer waits until a take occurs. The transfered element
829 >     * is returned by this associated take.
830 >     */
831 >    public void testTransfer5() throws InterruptedException {
832 >        final LinkedTransferQueue<Integer> q
833 >            = new LinkedTransferQueue<Integer>();
834 >
835 >        Thread t = newStartedThread(new CheckedRunnable() {
836 >            public void realRun() throws InterruptedException {
837 >                q.transfer(four);
838 >                checkEmpty(q);
839 >            }});
840 >
841 >        while (q.isEmpty())
842 >            Thread.yield();
843 >        assertFalse(q.isEmpty());
844 >        assertEquals(1, q.size());
845 >        assertSame(four, q.take());
846 >        checkEmpty(q);
847 >        awaitTermination(t, MEDIUM_DELAY_MS);
848      }
849  
850      /**
# Line 968 | Line 854 | public class LinkedTransferQueueTest ext
854          try {
855              final LinkedTransferQueue q = new LinkedTransferQueue();
856              q.tryTransfer(null);
857 <            this.shouldThrow();
858 <        } catch (NullPointerException ex) {
973 <        }
857 >            shouldThrow();
858 >        } catch (NullPointerException success) {}
859      }
860  
861      /**
862       * tryTransfer returns false and does not enqueue if there are no
863       * consumers waiting to poll or take.
864       */
865 <    public void testTryTransfer2() {
865 >    public void testTryTransfer2() throws InterruptedException {
866          final LinkedTransferQueue q = new LinkedTransferQueue();
867          assertFalse(q.tryTransfer(new Object()));
868          assertFalse(q.hasWaitingConsumer());
869 <        assertTrue(q.isEmpty());
985 <        assertEquals(0, q.size());
869 >        checkEmpty(q);
870      }
871  
872      /**
# Line 992 | Line 876 | public class LinkedTransferQueueTest ext
876      public void testTryTransfer3() throws InterruptedException {
877          final Object hotPotato = new Object();
878          final LinkedTransferQueue q = new LinkedTransferQueue();
879 <        new Thread(new Runnable() {
880 <            public void run() {
881 <                try {
882 <                    while (! q.hasWaitingConsumer())
883 <                        Thread.yield();
884 <                    threadAssertTrue(q.hasWaitingConsumer());
885 <                    threadAssertTrue(q.isEmpty());
886 <                    threadAssertTrue(q.size() == 0);
887 <                    threadAssertTrue(q.tryTransfer(hotPotato));
888 <                } catch (Throwable ex) {
889 <                    threadUnexpectedException(ex);
890 <                }
891 <            }}).start();
1008 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
1009 <        assertTrue(q.isEmpty());
879 >
880 >        Thread t = newStartedThread(new CheckedRunnable() {
881 >            public void realRun() {
882 >                while (! q.hasWaitingConsumer())
883 >                    Thread.yield();
884 >                assertTrue(q.hasWaitingConsumer());
885 >                checkEmpty(q);
886 >                assertTrue(q.tryTransfer(hotPotato));
887 >            }});
888 >
889 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
890 >        checkEmpty(q);
891 >        awaitTermination(t, MEDIUM_DELAY_MS);
892      }
893  
894      /**
# Line 1016 | Line 898 | public class LinkedTransferQueueTest ext
898      public void testTryTransfer4() throws InterruptedException {
899          final Object hotPotato = new Object();
900          final LinkedTransferQueue q = new LinkedTransferQueue();
901 <        new Thread(new Runnable() {
902 <            public void run() {
903 <                try {
904 <                    while (! q.hasWaitingConsumer())
905 <                        Thread.yield();
906 <                    threadAssertTrue(q.hasWaitingConsumer());
907 <                    threadAssertTrue(q.isEmpty());
908 <                    threadAssertTrue(q.size() == 0);
909 <                    threadAssertTrue(q.tryTransfer(hotPotato));
910 <                } catch (Throwable ex) {
911 <                    threadUnexpectedException(ex);
912 <                }
913 <            }}).start();
1032 <        assertTrue(q.take() == hotPotato);
1033 <        assertTrue(q.isEmpty());
901 >
902 >        Thread t = newStartedThread(new CheckedRunnable() {
903 >            public void realRun() {
904 >                while (! q.hasWaitingConsumer())
905 >                    Thread.yield();
906 >                assertTrue(q.hasWaitingConsumer());
907 >                checkEmpty(q);
908 >                assertTrue(q.tryTransfer(hotPotato));
909 >            }});
910 >
911 >        assertSame(q.take(), hotPotato);
912 >        checkEmpty(q);
913 >        awaitTermination(t, MEDIUM_DELAY_MS);
914      }
915  
916      /**
917 <     * tryTransfer waits the amount given if interrupted, show an
1038 <     * interrupted exception
917 >     * tryTransfer blocks interruptibly if no takers
918       */
919      public void testTryTransfer5() throws InterruptedException {
920          final LinkedTransferQueue q = new LinkedTransferQueue();
921 <        Thread toInterrupt = new Thread(new Runnable() {
922 <            public void run() {
921 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
922 >        assertTrue(q.isEmpty());
923 >
924 >        Thread t = newStartedThread(new CheckedRunnable() {
925 >            public void realRun() throws InterruptedException {
926 >                Thread.currentThread().interrupt();
927                  try {
928 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
929 <                    threadShouldThrow();
930 <                } catch (InterruptedException success) {
931 <                } catch (Throwable ex) {
932 <                    threadUnexpectedException(ex);
933 <                }
928 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
929 >                    shouldThrow();
930 >                } catch (InterruptedException success) {}
931 >                assertFalse(Thread.interrupted());
932 >
933 >                pleaseInterrupt.countDown();
934 >                try {
935 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
936 >                    shouldThrow();
937 >                } catch (InterruptedException success) {}
938 >                assertFalse(Thread.interrupted());
939              }});
940 <        toInterrupt.start();
941 <        Thread.sleep(SMALL_DELAY_MS);
942 <        toInterrupt.interrupt();
940 >
941 >        await(pleaseInterrupt);
942 >        assertThreadStaysAlive(t);
943 >        t.interrupt();
944 >        awaitTermination(t);
945 >        checkEmpty(q);
946      }
947  
948      /**
949 <     * tryTransfer gives up after the timeout and return false
949 >     * tryTransfer gives up after the timeout and returns false
950       */
951      public void testTryTransfer6() throws InterruptedException {
952          final LinkedTransferQueue q = new LinkedTransferQueue();
953 <        new Thread(new Runnable() {
954 <            public void run() {
955 <                try {
956 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
957 <                } catch (Throwable ex) {
958 <                    threadUnexpectedException(ex);
959 <                }
960 <            }}).start();
961 <        Thread.sleep(LONG_DELAY_MS);
962 <        assertTrue(q.isEmpty());
953 >
954 >        Thread t = newStartedThread(new CheckedRunnable() {
955 >            public void realRun() throws InterruptedException {
956 >                long t0 = System.nanoTime();
957 >                assertFalse(q.tryTransfer(new Object(),
958 >                                          timeoutMillis(), MILLISECONDS));
959 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
960 >                checkEmpty(q);
961 >            }});
962 >
963 >        awaitTermination(t);
964 >        checkEmpty(q);
965      }
966  
967      /**
# Line 1078 | Line 971 | public class LinkedTransferQueueTest ext
971      public void testTryTransfer7() throws InterruptedException {
972          final LinkedTransferQueue q = new LinkedTransferQueue();
973          assertTrue(q.offer(four));
974 <        new Thread(new Runnable() {
975 <            public void run() {
976 <                try {
977 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
978 <                    threadAssertTrue(q.isEmpty());
979 <                } catch (Throwable ex) {
980 <                    threadUnexpectedException(ex);
981 <                }
982 <            }}).start();
1090 <        Thread.sleep(SHORT_DELAY_MS);
974 >
975 >        Thread t = newStartedThread(new CheckedRunnable() {
976 >            public void realRun() throws InterruptedException {
977 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
978 >                checkEmpty(q);
979 >            }});
980 >
981 >        while (q.size() != 2)
982 >            Thread.yield();
983          assertEquals(2, q.size());
984 <        assertEquals(four, q.poll());
985 <        assertEquals(five, q.poll());
986 <        assertTrue(q.isEmpty());
984 >        assertSame(four, q.poll());
985 >        assertSame(five, q.poll());
986 >        checkEmpty(q);
987 >        awaitTermination(t, MEDIUM_DELAY_MS);
988      }
989  
990      /**
991 <     * tryTransfer attempts to enqueue into the q and fails returning
992 <     * false not enqueueing and the successive poll is null
991 >     * tryTransfer attempts to enqueue into the queue and fails
992 >     * returning false not enqueueing and the successive poll is null
993       */
994      public void testTryTransfer8() throws InterruptedException {
995          final LinkedTransferQueue q = new LinkedTransferQueue();
996          assertTrue(q.offer(four));
997          assertEquals(1, q.size());
998 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
998 >        long t0 = System.nanoTime();
999 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1000 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1001          assertEquals(1, q.size());
1002 <        assertEquals(four, q.poll());
1108 <        threadAssertTrue(q.isEmpty());
1002 >        assertSame(four, q.poll());
1003          assertNull(q.poll());
1004 +        checkEmpty(q);
1005      }
1006  
1007      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1008          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1009 <        assertTrue(q.isEmpty());
1009 >        checkEmpty(q);
1010          for (int i = 0; i < n; i++) {
1011              assertEquals(i, q.size());
1012              assertTrue(q.offer(i));
# Line 1120 | Line 1015 | public class LinkedTransferQueueTest ext
1015          assertFalse(q.isEmpty());
1016          return q;
1017      }
1123
1124    private static class ConsumerObserver {
1125
1126        private int waitingConsumers;
1127
1128        private ConsumerObserver() {
1129        }
1130
1131        private void setWaitingConsumer(int i) {
1132            this.waitingConsumers = i;
1133        }
1134
1135        private int getWaitingConsumers() {
1136            return waitingConsumers;
1137        }
1138    }
1018   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines