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.48 by jsr166, Tue May 31 16:16:24 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 <        }
366 >        } catch (NoSuchElementException success) {}
367 >        checkEmpty(q);
368      }
369  
370      /**
371       * remove(x) removes x and returns true if present
372       */
373 <    public void testRemoveElement() {
373 >    public void testRemoveElement() throws InterruptedException {
374          LinkedTransferQueue q = populatedQueue(SIZE);
375 <        for (int i = 1; i < SIZE; i += 2) {
375 >        for (int i = 1; i < SIZE; i+=2) {
376 >            assertTrue(q.contains(i));
377              assertTrue(q.remove(i));
378 +            assertFalse(q.contains(i));
379 +            assertTrue(q.contains(i-1));
380          }
381 <        for (int i = 0; i < SIZE; i += 2) {
381 >        for (int i = 0; i < SIZE; i+=2) {
382 >            assertTrue(q.contains(i));
383              assertTrue(q.remove(i));
384 <            assertFalse(q.remove(i + 1));
384 >            assertFalse(q.contains(i));
385 >            assertFalse(q.remove(i+1));
386 >            assertFalse(q.contains(i+1));
387          }
388 <        assertTrue(q.isEmpty());
388 >        checkEmpty(q);
389      }
390  
391      /**
# Line 436 | Line 398 | public class LinkedTransferQueueTest ext
398          assertTrue(q.remove(one));
399          assertTrue(q.remove(two));
400          assertTrue(q.add(three));
401 <        assertTrue(q.take() != null);
401 >        assertSame(q.take(), three);
402      }
403  
404      /**
# Line 454 | Line 416 | public class LinkedTransferQueueTest ext
416      /**
417       * clear removes all elements
418       */
419 <    public void testClear() {
419 >    public void testClear() throws InterruptedException {
420          LinkedTransferQueue q = populatedQueue(SIZE);
421          q.clear();
422 <        assertTrue(q.isEmpty());
461 <        assertEquals(0, q.size());
422 >        checkEmpty(q);
423          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
424          q.add(one);
425          assertFalse(q.isEmpty());
426 +        assertEquals(1, q.size());
427          assertTrue(q.contains(one));
428          q.clear();
429 <        assertTrue(q.isEmpty());
429 >        checkEmpty(q);
430      }
431  
432      /**
# Line 482 | Line 444 | public class LinkedTransferQueueTest ext
444      }
445  
446      /**
447 <     * retainAll(c) retains only those elements of c and reports true if changed
447 >     * retainAll(c) retains only those elements of c and reports true
448 >     * if changed
449       */
450      public void testRetainAll() {
451          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 501 | Line 464 | public class LinkedTransferQueueTest ext
464      }
465  
466      /**
467 <     * removeAll(c) removes only those elements of c and reports true if changed
467 >     * removeAll(c) removes only those elements of c and reports true
468 >     * if changed
469       */
470      public void testRemoveAll() {
471          for (int i = 1; i < SIZE; ++i) {
# Line 516 | Line 480 | public class LinkedTransferQueueTest ext
480      }
481  
482      /**
483 <     * toArray contains all elements
483 >     * toArray() contains all elements in FIFO order
484       */
485 <    public void testToArray() throws InterruptedException {
485 >    public void testToArray() {
486          LinkedTransferQueue q = populatedQueue(SIZE);
487          Object[] o = q.toArray();
488          for (int i = 0; i < o.length; i++) {
489 <            assertEquals(o[i], q.take());
489 >            assertSame(o[i], q.poll());
490          }
491      }
492  
493      /**
494 <     * toArray(a) contains all elements
494 >     * toArray(a) contains all elements in FIFO order
495       */
496 <    public void testToArray2() throws InterruptedException {
496 >    public void testToArray2() {
497          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
498          Integer[] ints = new Integer[SIZE];
499 <        ints = q.toArray(ints);
499 >        Integer[] array = q.toArray(ints);
500 >        assertSame(ints, array);
501          for (int i = 0; i < ints.length; i++) {
502 <            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) {
502 >            assertSame(ints[i], q.poll());
503          }
504      }
505  
506      /**
507 <     * toArray with incompatible array type throws CCE
507 >     * toArray(incompatible array type) throws ArrayStoreException
508       */
509      public void testToArray1_BadArg() {
510 +        LinkedTransferQueue q = populatedQueue(SIZE);
511          try {
512 <            LinkedTransferQueue q = populatedQueue(SIZE);
559 <            Object o[] = q.toArray(new String[10]);
512 >            q.toArray(new String[10]);
513              shouldThrow();
514 <        } catch (ArrayStoreException success) {
562 <        }
514 >        } catch (ArrayStoreException success) {}
515      }
516  
517      /**
# Line 568 | Line 520 | public class LinkedTransferQueueTest ext
520      public void testIterator() throws InterruptedException {
521          LinkedTransferQueue q = populatedQueue(SIZE);
522          Iterator it = q.iterator();
523 +        int i = 0;
524          while (it.hasNext()) {
525 <            assertEquals(it.next(), q.take());
525 >            assertEquals(it.next(), i++);
526          }
527 +        assertEquals(i, SIZE);
528      }
529  
530      /**
531 <     * iterator.remove removes current element
531 >     * iterator.remove() removes current element
532       */
533      public void testIteratorRemove() {
534          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 587 | Line 541 | public class LinkedTransferQueueTest ext
541          it.remove();
542  
543          it = q.iterator();
544 <        assertEquals(it.next(), one);
545 <        assertEquals(it.next(), three);
544 >        assertSame(it.next(), one);
545 >        assertSame(it.next(), three);
546          assertFalse(it.hasNext());
547      }
548  
# Line 596 | Line 550 | public class LinkedTransferQueueTest ext
550       * iterator ordering is FIFO
551       */
552      public void testIteratorOrdering() {
553 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
553 >        final LinkedTransferQueue<Integer> q
554 >            = new LinkedTransferQueue<Integer>();
555          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
556          q.add(one);
557          q.add(two);
# Line 631 | Line 586 | public class LinkedTransferQueueTest ext
586          LinkedTransferQueue q = populatedQueue(SIZE);
587          String s = q.toString();
588          for (int i = 0; i < SIZE; ++i) {
589 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
589 >            assertTrue(s.contains(String.valueOf(i)));
590          }
591      }
592  
# Line 640 | Line 595 | public class LinkedTransferQueueTest ext
595       */
596      public void testOfferInExecutor() {
597          final LinkedTransferQueue q = new LinkedTransferQueue();
598 <        q.add(one);
644 <        q.add(two);
598 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
599          ExecutorService executor = Executors.newFixedThreadPool(2);
600 <        executor.execute(new Runnable() {
601 <            public void run() {
602 <                try {
603 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
604 <                } catch (Throwable ex) {
651 <                    threadUnexpectedException(ex);
652 <                }
600 >
601 >        executor.execute(new CheckedRunnable() {
602 >            public void realRun() throws InterruptedException {
603 >                threadsStarted.await();
604 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
605              }});
606  
607 <        executor.execute(new Runnable() {
608 <            public void run() {
609 <                try {
610 <                    Thread.sleep(SMALL_DELAY_MS);
611 <                    threadAssertEquals(one, q.take());
660 <                } catch (Throwable ex) {
661 <                    threadUnexpectedException(ex);
662 <                }
607 >        executor.execute(new CheckedRunnable() {
608 >            public void realRun() throws InterruptedException {
609 >                threadsStarted.await();
610 >                assertSame(one, q.take());
611 >                checkEmpty(q);
612              }});
613  
614          joinPool(executor);
615      }
616  
617      /**
618 <     * poll retrieves elements across Executor threads
618 >     * timed poll retrieves elements across Executor threads
619       */
620      public void testPollInExecutor() {
621          final LinkedTransferQueue q = new LinkedTransferQueue();
622 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
623          ExecutorService executor = Executors.newFixedThreadPool(2);
624 <        executor.execute(new Runnable() {
625 <            public void run() {
626 <                try {
627 <                    threadAssertNull(q.poll());
628 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
629 <                    threadAssertTrue(q.isEmpty());
630 <                } catch (Throwable  ex) {
681 <                    threadUnexpectedException(ex);
682 <                }
624 >
625 >        executor.execute(new CheckedRunnable() {
626 >            public void realRun() throws InterruptedException {
627 >                assertNull(q.poll());
628 >                threadsStarted.await();
629 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630 >                checkEmpty(q);
631              }});
632  
633 <        executor.execute(new Runnable() {
634 <            public void run() {
635 <                try {
636 <                    Thread.sleep(SMALL_DELAY_MS);
689 <                    q.put(one);
690 <                } catch (Throwable ex) {
691 <                    threadUnexpectedException(ex);
692 <                }
633 >        executor.execute(new CheckedRunnable() {
634 >            public void realRun() throws InterruptedException {
635 >                threadsStarted.await();
636 >                q.put(one);
637              }});
638  
639          joinPool(executor);
# Line 699 | Line 643 | public class LinkedTransferQueueTest ext
643       * A deserialized serialized queue has same elements in same order
644       */
645      public void testSerialization() throws Exception {
646 <        LinkedTransferQueue q = populatedQueue(SIZE);
647 <
704 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
705 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
706 <        out.writeObject(q);
707 <        out.close();
646 >        Queue x = populatedQueue(SIZE);
647 >        Queue y = serialClone(x);
648  
649 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
650 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
651 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
652 <
653 <        assertEquals(q.size(), r.size());
654 <        while (!q.isEmpty()) {
655 <            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) {
649 >        assertTrue(x != y);
650 >        assertEquals(x.size(), y.size());
651 >        assertEquals(x.toString(), y.toString());
652 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
653 >        while (!x.isEmpty()) {
654 >            assertFalse(y.isEmpty());
655 >            assertEquals(x.remove(), y.remove());
656          }
657 +        assertTrue(y.isEmpty());
658      }
659  
660      /**
# Line 767 | Line 684 | public class LinkedTransferQueueTest ext
684      }
685  
686      /**
687 <     * drainTo empties full queue, unblocking a waiting put.
687 >     * drainTo(c) empties full queue, unblocking a waiting put.
688       */
689      public void testDrainToWithActivePut() throws InterruptedException {
690          final LinkedTransferQueue q = populatedQueue(SIZE);
691 <        Thread t = new Thread(new Runnable() {
692 <            public void run() {
693 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
691 >        Thread t = newStartedThread(new CheckedRunnable() {
692 >            public void realRun() {
693 >                q.put(SIZE + 1);
694              }});
782        t.start();
695          ArrayList l = new ArrayList();
696          q.drainTo(l);
697          assertTrue(l.size() >= SIZE);
698          for (int i = 0; i < SIZE; ++i) {
699              assertEquals(l.get(i), i);
700          }
701 <        t.join();
701 >        awaitTermination(t, MEDIUM_DELAY_MS);
702          assertTrue(q.size() + l.size() >= SIZE);
703      }
704  
705      /**
706 <     * 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
706 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
707       */
708      public void testDrainToN() {
709          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 837 | Line 725 | public class LinkedTransferQueueTest ext
725      }
726  
727      /**
728 <     * poll and take should decrement the waiting consumer count
728 >     * timed poll() or take() increments the waiting consumer count;
729 >     * offer(e) decrements the waiting consumer count
730       */
731      public void testWaitingConsumer() throws InterruptedException {
732          final LinkedTransferQueue q = new LinkedTransferQueue();
733 <        final ConsumerObserver waiting = new ConsumerObserver();
734 <        new Thread(new Runnable() {
735 <            public void run() {
736 <                try {
737 <                    threadAssertTrue(q.hasWaitingConsumer());
738 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
739 <                    threadAssertTrue(q.offer(new Object()));
740 <                } catch (Throwable ex) {
741 <                    threadUnexpectedException(ex);
742 <                }
743 <            }}).start();
744 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
745 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
733 >        assertEquals(q.getWaitingConsumerCount(), 0);
734 >        assertFalse(q.hasWaitingConsumer());
735 >        final CountDownLatch threadStarted = new CountDownLatch(1);
736 >
737 >        Thread t = newStartedThread(new CheckedRunnable() {
738 >            public void realRun() throws InterruptedException {
739 >                threadStarted.countDown();
740 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
741 >                assertEquals(q.getWaitingConsumerCount(), 0);
742 >                assertFalse(q.hasWaitingConsumer());
743 >            }});
744 >
745 >        threadStarted.await();
746 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
747 >        assertEquals(q.getWaitingConsumerCount(), 1);
748 >        assertTrue(q.hasWaitingConsumer());
749 >
750 >        assertTrue(q.offer(one));
751 >        assertEquals(q.getWaitingConsumerCount(), 0);
752 >        assertFalse(q.hasWaitingConsumer());
753 >
754 >        awaitTermination(t, MEDIUM_DELAY_MS);
755      }
756  
757      /**
# Line 864 | Line 762 | public class LinkedTransferQueueTest ext
762              LinkedTransferQueue q = new LinkedTransferQueue();
763              q.transfer(null);
764              shouldThrow();
765 <        } catch (NullPointerException ex) {
868 <        }
765 >        } catch (NullPointerException success) {}
766      }
767  
768      /**
769 <     * transfer attempts to insert into the queue then wait until that
770 <     * object is removed via take or poll.
769 >     * transfer waits until a poll occurs. The transfered element
770 >     * is returned by this associated poll.
771       */
772      public void testTransfer2() throws InterruptedException {
773 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
774 <
775 <        new Thread(new Runnable() {
776 <            public void run() {
777 <                try {
778 <                    q.transfer(SIZE);
779 <                    threadAssertTrue(q.isEmpty());
780 <                } catch (Throwable ex) {
781 <                    threadUnexpectedException(ex);
782 <                }
886 <            }}).start();
773 >        final LinkedTransferQueue<Integer> q
774 >            = new LinkedTransferQueue<Integer>();
775 >        final CountDownLatch threadStarted = new CountDownLatch(1);
776 >
777 >        Thread t = newStartedThread(new CheckedRunnable() {
778 >            public void realRun() throws InterruptedException {
779 >                threadStarted.countDown();
780 >                q.transfer(five);
781 >                checkEmpty(q);
782 >            }});
783  
784 <        Thread.sleep(SHORT_DELAY_MS);
784 >        threadStarted.await();
785 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
786          assertEquals(1, q.size());
787 <        assertEquals(SIZE, (int) q.poll());
788 <        assertTrue(q.isEmpty());
787 >        assertSame(five, q.poll());
788 >        checkEmpty(q);
789 >        awaitTermination(t, MEDIUM_DELAY_MS);
790      }
791  
792      /**
793 <     * transfer will attempt to transfer in fifo order and continue
896 <     * waiting if the element being transfered is not polled or taken
793 >     * transfer waits until a poll occurs, and then transfers in fifo order
794       */
795      public void testTransfer3() throws InterruptedException {
796 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
796 >        final LinkedTransferQueue<Integer> q
797 >            = new LinkedTransferQueue<Integer>();
798  
799 <        Thread first =
800 <            new Thread(new Runnable() {
801 <                public void run() {
802 <                    try {
803 <                        Integer i = SIZE + 1;
804 <                        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();
799 >        Thread first = newStartedThread(new CheckedRunnable() {
800 >            public void realRun() throws InterruptedException {
801 >                q.transfer(four);
802 >                assertTrue(!q.contains(four));
803 >                assertEquals(1, q.size());
804 >            }});
805  
806 <        Thread interruptedThread =
807 <            new Thread(new Runnable() {
808 <                public void run() {
809 <                    try {
810 <                        while (q.size() == 0)
811 <                            Thread.yield();
921 <                        q.transfer(SIZE);
922 <                        threadShouldThrow();
923 <                    } catch (InterruptedException success) {
924 <                    } catch (Throwable ex) {
925 <                        threadUnexpectedException(ex);
926 <                    }
806 >        Thread interruptedThread = newStartedThread(
807 >            new CheckedInterruptedRunnable() {
808 >                public void realRun() throws InterruptedException {
809 >                    while (q.isEmpty())
810 >                        Thread.yield();
811 >                    q.transfer(five);
812                  }});
928        interruptedThread.start();
813  
814          while (q.size() < 2)
815              Thread.yield();
816          assertEquals(2, q.size());
817 <        assertEquals(SIZE + 1, (int) q.poll());
817 >        assertSame(four, q.poll());
818          first.join();
819          assertEquals(1, q.size());
820          interruptedThread.interrupt();
821          interruptedThread.join();
822 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
822 >        checkEmpty(q);
823      }
824  
825      /**
826 <     * transfer will wait as long as a poll or take occurs if one does occur
827 <     * the waiting is finished and the thread that tries to poll/take
945 <     * wins in retrieving the element
826 >     * transfer waits until a poll occurs, at which point the polling
827 >     * thread returns the element
828       */
829      public void testTransfer4() throws InterruptedException {
830          final LinkedTransferQueue q = new LinkedTransferQueue();
831 <        new Thread(new Runnable() {
832 <            public void run() {
833 <                try {
834 <                    q.transfer(four);
835 <                    threadAssertFalse(q.contains(four));
836 <                    threadAssertEquals(three, q.poll());
837 <                } catch (Throwable ex) {
838 <                    threadUnexpectedException(ex);
839 <                }
840 <            }}).start();
841 <        Thread.sleep(MEDIUM_DELAY_MS);
831 >
832 >        Thread t = newStartedThread(new CheckedRunnable() {
833 >            public void realRun() throws InterruptedException {
834 >                q.transfer(four);
835 >                assertFalse(q.contains(four));
836 >                assertSame(three, q.poll());
837 >            }});
838 >
839 >        while (q.isEmpty())
840 >            Thread.yield();
841 >        assertFalse(q.isEmpty());
842 >        assertEquals(1, q.size());
843          assertTrue(q.offer(three));
844 <        assertEquals(four, q.poll());
844 >        assertSame(four, q.poll());
845 >        awaitTermination(t, MEDIUM_DELAY_MS);
846 >    }
847 >
848 >    /**
849 >     * transfer waits until a take occurs. The transfered element
850 >     * is returned by this associated take.
851 >     */
852 >    public void testTransfer5() throws InterruptedException {
853 >        final LinkedTransferQueue<Integer> q
854 >            = new LinkedTransferQueue<Integer>();
855 >
856 >        Thread t = newStartedThread(new CheckedRunnable() {
857 >            public void realRun() throws InterruptedException {
858 >                q.transfer(four);
859 >                checkEmpty(q);
860 >            }});
861 >
862 >        while (q.isEmpty())
863 >            Thread.yield();
864 >        assertFalse(q.isEmpty());
865 >        assertEquals(1, q.size());
866 >        assertSame(four, q.take());
867 >        checkEmpty(q);
868 >        awaitTermination(t, MEDIUM_DELAY_MS);
869      }
870  
871      /**
# Line 968 | Line 875 | public class LinkedTransferQueueTest ext
875          try {
876              final LinkedTransferQueue q = new LinkedTransferQueue();
877              q.tryTransfer(null);
878 <            this.shouldThrow();
879 <        } catch (NullPointerException ex) {
973 <        }
878 >            shouldThrow();
879 >        } catch (NullPointerException success) {}
880      }
881  
882      /**
883       * tryTransfer returns false and does not enqueue if there are no
884       * consumers waiting to poll or take.
885       */
886 <    public void testTryTransfer2() {
886 >    public void testTryTransfer2() throws InterruptedException {
887          final LinkedTransferQueue q = new LinkedTransferQueue();
888          assertFalse(q.tryTransfer(new Object()));
889          assertFalse(q.hasWaitingConsumer());
890 <        assertTrue(q.isEmpty());
985 <        assertEquals(0, q.size());
890 >        checkEmpty(q);
891      }
892  
893      /**
# Line 992 | Line 897 | public class LinkedTransferQueueTest ext
897      public void testTryTransfer3() throws InterruptedException {
898          final Object hotPotato = new Object();
899          final LinkedTransferQueue q = new LinkedTransferQueue();
900 <        new Thread(new Runnable() {
901 <            public void run() {
902 <                try {
903 <                    while (! q.hasWaitingConsumer())
904 <                        Thread.yield();
905 <                    threadAssertTrue(q.hasWaitingConsumer());
906 <                    threadAssertTrue(q.isEmpty());
907 <                    threadAssertTrue(q.size() == 0);
908 <                    threadAssertTrue(q.tryTransfer(hotPotato));
909 <                } catch (Throwable ex) {
910 <                    threadUnexpectedException(ex);
911 <                }
912 <            }}).start();
1008 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
1009 <        assertTrue(q.isEmpty());
900 >
901 >        Thread t = newStartedThread(new CheckedRunnable() {
902 >            public void realRun() {
903 >                while (! q.hasWaitingConsumer())
904 >                    Thread.yield();
905 >                assertTrue(q.hasWaitingConsumer());
906 >                checkEmpty(q);
907 >                assertTrue(q.tryTransfer(hotPotato));
908 >            }});
909 >
910 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
911 >        checkEmpty(q);
912 >        awaitTermination(t, MEDIUM_DELAY_MS);
913      }
914  
915      /**
# Line 1016 | Line 919 | public class LinkedTransferQueueTest ext
919      public void testTryTransfer4() throws InterruptedException {
920          final Object hotPotato = new Object();
921          final LinkedTransferQueue q = new LinkedTransferQueue();
922 <        new Thread(new Runnable() {
923 <            public void run() {
924 <                try {
925 <                    while (! q.hasWaitingConsumer())
926 <                        Thread.yield();
927 <                    threadAssertTrue(q.hasWaitingConsumer());
928 <                    threadAssertTrue(q.isEmpty());
929 <                    threadAssertTrue(q.size() == 0);
930 <                    threadAssertTrue(q.tryTransfer(hotPotato));
931 <                } catch (Throwable ex) {
932 <                    threadUnexpectedException(ex);
933 <                }
934 <            }}).start();
1032 <        assertTrue(q.take() == hotPotato);
1033 <        assertTrue(q.isEmpty());
922 >
923 >        Thread t = newStartedThread(new CheckedRunnable() {
924 >            public void realRun() {
925 >                while (! q.hasWaitingConsumer())
926 >                    Thread.yield();
927 >                assertTrue(q.hasWaitingConsumer());
928 >                checkEmpty(q);
929 >                assertTrue(q.tryTransfer(hotPotato));
930 >            }});
931 >
932 >        assertSame(q.take(), hotPotato);
933 >        checkEmpty(q);
934 >        awaitTermination(t, MEDIUM_DELAY_MS);
935      }
936  
937      /**
938 <     * tryTransfer waits the amount given if interrupted, show an
1038 <     * interrupted exception
938 >     * tryTransfer blocks interruptibly if no takers
939       */
940      public void testTryTransfer5() throws InterruptedException {
941          final LinkedTransferQueue q = new LinkedTransferQueue();
942 <        Thread toInterrupt = new Thread(new Runnable() {
943 <            public void run() {
942 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
943 >        assertTrue(q.isEmpty());
944 >
945 >        Thread t = newStartedThread(new CheckedRunnable() {
946 >            public void realRun() throws InterruptedException {
947 >                Thread.currentThread().interrupt();
948                  try {
949 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
950 <                    threadShouldThrow();
951 <                } catch (InterruptedException success) {
952 <                } catch (Throwable ex) {
953 <                    threadUnexpectedException(ex);
954 <                }
949 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
950 >                    shouldThrow();
951 >                } catch (InterruptedException success) {}
952 >                assertFalse(Thread.interrupted());
953 >
954 >                pleaseInterrupt.countDown();
955 >                try {
956 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
957 >                    shouldThrow();
958 >                } catch (InterruptedException success) {}
959 >                assertFalse(Thread.interrupted());
960              }});
961 <        toInterrupt.start();
962 <        Thread.sleep(SMALL_DELAY_MS);
963 <        toInterrupt.interrupt();
961 >
962 >        await(pleaseInterrupt);
963 >        assertThreadStaysAlive(t);
964 >        t.interrupt();
965 >        awaitTermination(t);
966 >        checkEmpty(q);
967      }
968  
969      /**
970 <     * tryTransfer gives up after the timeout and return false
970 >     * tryTransfer gives up after the timeout and returns false
971       */
972      public void testTryTransfer6() throws InterruptedException {
973          final LinkedTransferQueue q = new LinkedTransferQueue();
974 <        new Thread(new Runnable() {
975 <            public void run() {
976 <                try {
977 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
978 <                } catch (Throwable ex) {
979 <                    threadUnexpectedException(ex);
980 <                }
981 <            }}).start();
982 <        Thread.sleep(LONG_DELAY_MS);
983 <        assertTrue(q.isEmpty());
974 >
975 >        Thread t = newStartedThread(new CheckedRunnable() {
976 >            public void realRun() throws InterruptedException {
977 >                long t0 = System.nanoTime();
978 >                assertFalse(q.tryTransfer(new Object(),
979 >                                          timeoutMillis(), MILLISECONDS));
980 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
981 >                checkEmpty(q);
982 >            }});
983 >
984 >        awaitTermination(t);
985 >        checkEmpty(q);
986      }
987  
988      /**
# Line 1078 | Line 992 | public class LinkedTransferQueueTest ext
992      public void testTryTransfer7() throws InterruptedException {
993          final LinkedTransferQueue q = new LinkedTransferQueue();
994          assertTrue(q.offer(four));
995 <        new Thread(new Runnable() {
996 <            public void run() {
997 <                try {
998 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
999 <                    threadAssertTrue(q.isEmpty());
1000 <                } catch (Throwable ex) {
1001 <                    threadUnexpectedException(ex);
1002 <                }
1003 <            }}).start();
1090 <        Thread.sleep(SHORT_DELAY_MS);
995 >
996 >        Thread t = newStartedThread(new CheckedRunnable() {
997 >            public void realRun() throws InterruptedException {
998 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
999 >                checkEmpty(q);
1000 >            }});
1001 >
1002 >        while (q.size() != 2)
1003 >            Thread.yield();
1004          assertEquals(2, q.size());
1005 <        assertEquals(four, q.poll());
1006 <        assertEquals(five, q.poll());
1007 <        assertTrue(q.isEmpty());
1005 >        assertSame(four, q.poll());
1006 >        assertSame(five, q.poll());
1007 >        checkEmpty(q);
1008 >        awaitTermination(t, MEDIUM_DELAY_MS);
1009      }
1010  
1011      /**
1012 <     * tryTransfer attempts to enqueue into the q and fails returning
1013 <     * false not enqueueing and the successive poll is null
1012 >     * tryTransfer attempts to enqueue into the queue and fails
1013 >     * returning false not enqueueing and the successive poll is null
1014       */
1015      public void testTryTransfer8() throws InterruptedException {
1016          final LinkedTransferQueue q = new LinkedTransferQueue();
1017          assertTrue(q.offer(four));
1018          assertEquals(1, q.size());
1019 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1019 >        long t0 = System.nanoTime();
1020 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1021 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1022          assertEquals(1, q.size());
1023 <        assertEquals(four, q.poll());
1108 <        threadAssertTrue(q.isEmpty());
1023 >        assertSame(four, q.poll());
1024          assertNull(q.poll());
1025 +        checkEmpty(q);
1026      }
1027  
1028      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1029          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1030 <        assertTrue(q.isEmpty());
1030 >        checkEmpty(q);
1031          for (int i = 0; i < n; i++) {
1032              assertEquals(i, q.size());
1033              assertTrue(q.offer(i));
# Line 1120 | Line 1036 | public class LinkedTransferQueueTest ext
1036          assertFalse(q.isEmpty());
1037          return q;
1038      }
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    }
1039   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines