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.47 by jsr166, Mon May 30 22:43:20 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  
# Line 13 | Line 13 | import java.io.ObjectInputStream;
13   import java.io.ObjectOutputStream;
14   import java.util.ArrayList;
15   import java.util.Arrays;
16 < import java.util.ConcurrentModificationException;
16 > import java.util.Collection;
17   import java.util.Iterator;
18 + import java.util.List;
19   import java.util.NoSuchElementException;
20 < import java.util.concurrent.*;
20 > import java.util.concurrent.BlockingQueue;
21 > import java.util.concurrent.CountDownLatch;
22 > import java.util.concurrent.Executors;
23 > import java.util.concurrent.ExecutorService;
24 > import java.util.concurrent.LinkedTransferQueue;
25 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
26 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
27   import junit.framework.Test;
28   import junit.framework.TestSuite;
29  
30 + @SuppressWarnings({"unchecked", "rawtypes"})
31   public class LinkedTransferQueueTest extends JSR166TestCase {
32  
33 +    public static class Generic extends BlockingQueueTest {
34 +        protected BlockingQueue emptyCollection() {
35 +            return new LinkedTransferQueue();
36 +        }
37 +    }
38 +
39      public static void main(String[] args) {
40          junit.textui.TestRunner.run(suite());
41      }
42  
43      public static Test suite() {
44 <        return new TestSuite(LinkedTransferQueueTest.class);
44 >        return newTestSuite(LinkedTransferQueueTest.class,
45 >                            new Generic().testSuite());
46      }
47  
48      /**
49 <     * Constructor builds new queue with size being zero and empty being true
49 >     * Constructor builds new queue with size being zero and empty
50 >     * being true
51       */
52      public void testConstructor1() {
53          assertEquals(0, new LinkedTransferQueue().size());
# Line 39 | Line 55 | public class LinkedTransferQueueTest ext
55      }
56  
57      /**
58 <     * Initializing constructor with null collection throws NullPointerException
58 >     * Initializing constructor with null collection throws
59 >     * NullPointerException
60       */
61      public void testConstructor2() {
62          try {
63              new LinkedTransferQueue(null);
64              shouldThrow();
65 <        } catch (NullPointerException success) {
49 <        }
65 >        } catch (NullPointerException success) {}
66      }
67  
68      /**
69 <     * Initializing from Collection of null elements throws NullPointerException
69 >     * Initializing from Collection of null elements throws
70 >     * NullPointerException
71       */
72      public void testConstructor3() {
73 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
74          try {
75 <            Integer[] ints = new Integer[SIZE];
58 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
75 >            new LinkedTransferQueue(elements);
76              shouldThrow();
77 <        } catch (NullPointerException success) {
61 <        }
77 >        } catch (NullPointerException success) {}
78      }
79  
80      /**
# Line 66 | Line 82 | public class LinkedTransferQueueTest ext
82       * throws NullPointerException
83       */
84      public void testConstructor4() {
85 +        Integer[] ints = new Integer[SIZE];
86 +        for (int i = 0; i < SIZE-1; ++i)
87 +            ints[i] = i;
88 +        Collection<Integer> elements = Arrays.asList(ints);
89          try {
90 <            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));
90 >            new LinkedTransferQueue(elements);
91              shouldThrow();
92 <        } catch (NullPointerException success) {
77 <        }
92 >        } catch (NullPointerException success) {}
93      }
94  
95      /**
96       * Queue contains all elements of the collection it is initialized by
97       */
98      public void testConstructor5() {
99 <        try {
100 <            Integer[] ints = new Integer[SIZE];
101 <            for (int i = 0; i < SIZE; ++i) {
102 <                ints[i] = i;
103 <            }
104 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
105 <            for (int i = 0; i < SIZE; ++i) {
106 <                assertEquals(ints[i], q.poll());
107 <            }
108 <        } finally {
99 >        Integer[] ints = new Integer[SIZE];
100 >        for (int i = 0; i < SIZE; ++i) {
101 >            ints[i] = i;
102 >        }
103 >        List intList = Arrays.asList(ints);
104 >        LinkedTransferQueue q
105 >            = new LinkedTransferQueue(intList);
106 >        assertEquals(q.size(), intList.size());
107 >        assertEquals(q.toString(), intList.toString());
108 >        assertTrue(Arrays.equals(q.toArray(),
109 >                                     intList.toArray()));
110 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
111 >                                 intList.toArray(new Object[0])));
112 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
113 >                                 intList.toArray(new Object[SIZE])));
114 >        for (int i = 0; i < SIZE; ++i) {
115 >            assertEquals(ints[i], q.poll());
116          }
117      }
118  
119      /**
120 <     * Remaining capacity never decrease nor increase on add or remove
120 >     * remainingCapacity() always returns Integer.MAX_VALUE
121       */
122      public void testRemainingCapacity() {
123          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 112 | Line 134 | public class LinkedTransferQueueTest ext
134      }
135  
136      /**
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    /**
137       * addAll(this) throws IllegalArgumentException
138       */
139      public void testAddAllSelf() {
# Line 155 | Line 141 | public class LinkedTransferQueueTest ext
141              LinkedTransferQueue q = populatedQueue(SIZE);
142              q.addAll(q);
143              shouldThrow();
144 <        } 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 <        }
144 >        } catch (IllegalArgumentException success) {}
145      }
146  
147      /**
148 <     * addAll of a collection with any null elements throws NullPointerException after
149 <     * possibly adding some elements
148 >     * addAll of a collection with any null elements throws
149 >     * NullPointerException after possibly adding some elements
150       */
151      public void testAddAll3() {
152          try {
# Line 185 | Line 157 | public class LinkedTransferQueueTest ext
157              }
158              q.addAll(Arrays.asList(ints));
159              shouldThrow();
160 <        } catch (NullPointerException success) {
189 <        }
160 >        } catch (NullPointerException success) {}
161      }
162  
163      /**
# Line 207 | Line 178 | public class LinkedTransferQueueTest ext
178      }
179  
180      /**
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    /**
181       * all elements successfully put are contained
182       */
183      public void testPut() {
184          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
185          for (int i = 0; i < SIZE; ++i) {
186 +            assertEquals(q.size(), i);
187              q.put(i);
188              assertTrue(q.contains(i));
189          }
229        assertEquals(q.size(), SIZE);
190      }
191  
192      /**
# Line 240 | Line 200 | public class LinkedTransferQueueTest ext
200      }
201  
202      /**
203 <     * take blocks interruptibly when empty
203 >     * take removes existing elements until empty, then blocks interruptibly
204       */
205 <    public void testTakeFromEmpty() throws InterruptedException {
206 <        final LinkedTransferQueue q = new LinkedTransferQueue();
207 <        Thread t = new Thread(new Runnable() {
208 <            public void run() {
205 >    public void testBlockingTake() throws InterruptedException {
206 >        final BlockingQueue q = populatedQueue(SIZE);
207 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
208 >        Thread t = newStartedThread(new CheckedRunnable() {
209 >            public void realRun() throws InterruptedException {
210 >                for (int i = 0; i < SIZE; ++i) {
211 >                    assertEquals(i, q.take());
212 >                }
213 >
214 >                Thread.currentThread().interrupt();
215                  try {
216                      q.take();
217 <                    threadShouldThrow();
218 <                } catch (InterruptedException success) {
219 <                } catch (Throwable ex) {
254 <                    threadUnexpectedException(ex);
255 <                }
256 <            }});
257 <        t.start();
258 <        Thread.sleep(SHORT_DELAY_MS);
259 <        t.interrupt();
260 <        t.join();
261 <    }
217 >                    shouldThrow();
218 >                } catch (InterruptedException success) {}
219 >                assertFalse(Thread.interrupted());
220  
221 <    /**
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() {
221 >                pleaseInterrupt.countDown();
222                  try {
270                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
271                    for (int i = 0; i < SIZE; ++i) {
272                        threadAssertEquals(i, (int) q.take());
273                    }
223                      q.take();
224 <                    threadShouldThrow();
225 <                } catch (InterruptedException success) {
226 <                } catch (Throwable ex) {
278 <                    threadUnexpectedException(ex);
279 <                }
224 >                    shouldThrow();
225 >                } catch (InterruptedException success) {}
226 >                assertFalse(Thread.interrupted());
227              }});
228 <        t.start();
229 <        Thread.sleep(SHORT_DELAY_MS);
228 >
229 >        await(pleaseInterrupt);
230 >        assertThreadStaysAlive(t);
231          t.interrupt();
232 <        t.join();
232 >        awaitTermination(t);
233      }
234  
235      /**
236       * poll succeeds unless empty
237       */
238 <    public void testPoll() {
238 >    public void testPoll() throws InterruptedException {
239          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
240          for (int i = 0; i < SIZE; ++i) {
241              assertEquals(i, (int) q.poll());
242          }
243          assertNull(q.poll());
244 +        checkEmpty(q);
245      }
246  
247      /**
248 <     * timed pool with zero timeout succeeds when non-empty, else times out
248 >     * timed poll with zero timeout succeeds when non-empty, else times out
249       */
250      public void testTimedPoll0() throws InterruptedException {
251          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
252          for (int i = 0; i < SIZE; ++i) {
253 <            assertEquals(i, (int) q.poll(0, TimeUnit.MILLISECONDS));
253 >            assertEquals(i, (int) q.poll(0, MILLISECONDS));
254          }
255 <        assertNull(q.poll(0, TimeUnit.MILLISECONDS));
255 >        assertNull(q.poll(0, MILLISECONDS));
256 >        checkEmpty(q);
257      }
258  
259      /**
260 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
260 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
261       */
262      public void testTimedPoll() throws InterruptedException {
263          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
264          for (int i = 0; i < SIZE; ++i) {
265 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
266 <        }
267 <        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
265 >            long startTime = System.nanoTime();
266 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
267 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
268 >        }
269 >        long startTime = System.nanoTime();
270 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
271 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
272 >        checkEmpty(q);
273      }
274  
275      /**
# Line 322 | Line 277 | public class LinkedTransferQueueTest ext
277       * returning timeout status
278       */
279      public void testInterruptedTimedPoll() throws InterruptedException {
280 <        Thread t = new Thread(new Runnable() {
281 <            public void run() {
280 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
281 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
282 >        Thread t = newStartedThread(new CheckedRunnable() {
283 >            public void realRun() throws InterruptedException {
284 >                for (int i = 0; i < SIZE; ++i) {
285 >                    long t0 = System.nanoTime();
286 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
287 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
288 >                }
289 >                long t0 = System.nanoTime();
290 >                aboutToWait.countDown();
291                  try {
292 <                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
293 <                    for (int i = 0; i < SIZE; ++i) {
330 <                        threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
331 <                    }
332 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
292 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
293 >                    shouldThrow();
294                  } catch (InterruptedException success) {
295 <                } catch (Throwable ex) {
335 <                    threadUnexpectedException(ex);
295 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
296                  }
297              }});
298 <        t.start();
299 <        Thread.sleep(SHORT_DELAY_MS);
298 >
299 >        aboutToWait.await();
300 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
301          t.interrupt();
302 <        t.join();
302 >        awaitTermination(t, MEDIUM_DELAY_MS);
303 >        checkEmpty(q);
304      }
305  
306      /**
307 <     * timed poll before a delayed offer fails; after offer succeeds;
308 <     * on interruption throws
307 >     * timed poll after thread interrupted throws InterruptedException
308 >     * instead of returning timeout status
309       */
310 <    public void testTimedPollWithOffer() throws InterruptedException {
311 <        final LinkedTransferQueue q = new LinkedTransferQueue();
312 <        Thread t = new Thread(new Runnable() {
313 <            public void run() {
314 <                try {
315 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
316 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
317 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
318 <                    threadShouldThrow();
357 <                } catch (InterruptedException success) {
358 <                } catch (Throwable ex) {
359 <                    threadUnexpectedException(ex);
310 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
311 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
312 >        Thread t = newStartedThread(new CheckedRunnable() {
313 >            public void realRun() throws InterruptedException {
314 >                Thread.currentThread().interrupt();
315 >                for (int i = 0; i < SIZE; ++i) {
316 >                    long t0 = System.nanoTime();
317 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
318 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
319                  }
320 +                try {
321 +                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
322 +                    shouldThrow();
323 +                } catch (InterruptedException success) {}
324              }});
325 <        t.start();
326 <        Thread.sleep(SMALL_DELAY_MS);
327 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
365 <        t.interrupt();
366 <        t.join();
325 >
326 >        awaitTermination(t, MEDIUM_DELAY_MS);
327 >        checkEmpty(q);
328      }
329  
330      /**
331       * peek returns next element, or null if empty
332       */
333 <    public void testPeek() {
333 >    public void testPeek() throws InterruptedException {
334          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
335          for (int i = 0; i < SIZE; ++i) {
336              assertEquals(i, (int) q.peek());
# Line 378 | Line 339 | public class LinkedTransferQueueTest ext
339                         i != (int) q.peek());
340          }
341          assertNull(q.peek());
342 +        checkEmpty(q);
343      }
344  
345      /**
346       * element returns next element, or throws NoSuchElementException if empty
347       */
348 <    public void testElement() {
348 >    public void testElement() throws InterruptedException {
349          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
350          for (int i = 0; i < SIZE; ++i) {
351              assertEquals(i, (int) q.element());
# Line 392 | Line 354 | public class LinkedTransferQueueTest ext
354          try {
355              q.element();
356              shouldThrow();
357 <        } catch (NoSuchElementException success) {
358 <        }
357 >        } catch (NoSuchElementException success) {}
358 >        checkEmpty(q);
359      }
360  
361      /**
362       * remove removes next element, or throws NoSuchElementException if empty
363       */
364 <    public void testRemove() {
364 >    public void testRemove() throws InterruptedException {
365          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
366          for (int i = 0; i < SIZE; ++i) {
367              assertEquals(i, (int) q.remove());
# Line 407 | Line 369 | public class LinkedTransferQueueTest ext
369          try {
370              q.remove();
371              shouldThrow();
372 <        } catch (NoSuchElementException success) {
373 <        }
372 >        } catch (NoSuchElementException success) {}
373 >        checkEmpty(q);
374      }
375  
376      /**
377       * remove(x) removes x and returns true if present
378       */
379 <    public void testRemoveElement() {
379 >    public void testRemoveElement() throws InterruptedException {
380          LinkedTransferQueue q = populatedQueue(SIZE);
381 <        for (int i = 1; i < SIZE; i += 2) {
381 >        for (int i = 1; i < SIZE; i+=2) {
382 >            assertTrue(q.contains(i));
383              assertTrue(q.remove(i));
384 +            assertFalse(q.contains(i));
385 +            assertTrue(q.contains(i-1));
386          }
387 <        for (int i = 0; i < SIZE; i += 2) {
387 >        for (int i = 0; i < SIZE; i+=2) {
388 >            assertTrue(q.contains(i));
389              assertTrue(q.remove(i));
390 <            assertFalse(q.remove(i + 1));
390 >            assertFalse(q.contains(i));
391 >            assertFalse(q.remove(i+1));
392 >            assertFalse(q.contains(i+1));
393          }
394 <        assertTrue(q.isEmpty());
394 >        checkEmpty(q);
395      }
396  
397      /**
# Line 436 | Line 404 | public class LinkedTransferQueueTest ext
404          assertTrue(q.remove(one));
405          assertTrue(q.remove(two));
406          assertTrue(q.add(three));
407 <        assertTrue(q.take() != null);
407 >        assertSame(q.take(), three);
408      }
409  
410      /**
# Line 454 | Line 422 | public class LinkedTransferQueueTest ext
422      /**
423       * clear removes all elements
424       */
425 <    public void testClear() {
425 >    public void testClear() throws InterruptedException {
426          LinkedTransferQueue q = populatedQueue(SIZE);
427          q.clear();
428 <        assertTrue(q.isEmpty());
461 <        assertEquals(0, q.size());
428 >        checkEmpty(q);
429          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
430          q.add(one);
431          assertFalse(q.isEmpty());
432 +        assertEquals(1, q.size());
433          assertTrue(q.contains(one));
434          q.clear();
435 <        assertTrue(q.isEmpty());
435 >        checkEmpty(q);
436      }
437  
438      /**
# Line 482 | Line 450 | public class LinkedTransferQueueTest ext
450      }
451  
452      /**
453 <     * retainAll(c) retains only those elements of c and reports true if changed
453 >     * retainAll(c) retains only those elements of c and reports true
454 >     * if changed
455       */
456      public void testRetainAll() {
457          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 501 | Line 470 | public class LinkedTransferQueueTest ext
470      }
471  
472      /**
473 <     * removeAll(c) removes only those elements of c and reports true if changed
473 >     * removeAll(c) removes only those elements of c and reports true
474 >     * if changed
475       */
476      public void testRemoveAll() {
477          for (int i = 1; i < SIZE; ++i) {
# Line 516 | Line 486 | public class LinkedTransferQueueTest ext
486      }
487  
488      /**
489 <     * toArray contains all elements
489 >     * toArray() contains all elements in FIFO order
490       */
491 <    public void testToArray() throws InterruptedException {
491 >    public void testToArray() {
492          LinkedTransferQueue q = populatedQueue(SIZE);
493          Object[] o = q.toArray();
494          for (int i = 0; i < o.length; i++) {
495 <            assertEquals(o[i], q.take());
495 >            assertSame(o[i], q.poll());
496          }
497      }
498  
499      /**
500 <     * toArray(a) contains all elements
500 >     * toArray(a) contains all elements in FIFO order
501       */
502 <    public void testToArray2() throws InterruptedException {
502 >    public void testToArray2() {
503          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
504          Integer[] ints = new Integer[SIZE];
505 <        ints = q.toArray(ints);
505 >        Integer[] array = q.toArray(ints);
506 >        assertSame(ints, array);
507          for (int i = 0; i < ints.length; i++) {
508 <            assertEquals(ints[i], q.take());
508 >            assertSame(ints[i], q.poll());
509          }
510      }
511  
512      /**
513 <     * 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
513 >     * toArray(incompatible array type) throws ArrayStoreException
514       */
515      public void testToArray1_BadArg() {
516 +        LinkedTransferQueue q = populatedQueue(SIZE);
517          try {
518 <            LinkedTransferQueue q = populatedQueue(SIZE);
559 <            Object o[] = q.toArray(new String[10]);
518 >            q.toArray(new String[10]);
519              shouldThrow();
520 <        } catch (ArrayStoreException success) {
562 <        }
520 >        } catch (ArrayStoreException success) {}
521      }
522  
523      /**
# Line 568 | Line 526 | public class LinkedTransferQueueTest ext
526      public void testIterator() throws InterruptedException {
527          LinkedTransferQueue q = populatedQueue(SIZE);
528          Iterator it = q.iterator();
529 +        int i = 0;
530          while (it.hasNext()) {
531 <            assertEquals(it.next(), q.take());
531 >            assertEquals(it.next(), i++);
532          }
533 +        assertEquals(i, SIZE);
534      }
535  
536      /**
537 <     * iterator.remove removes current element
537 >     * iterator.remove() removes current element
538       */
539      public void testIteratorRemove() {
540          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 587 | Line 547 | public class LinkedTransferQueueTest ext
547          it.remove();
548  
549          it = q.iterator();
550 <        assertEquals(it.next(), one);
551 <        assertEquals(it.next(), three);
550 >        assertSame(it.next(), one);
551 >        assertSame(it.next(), three);
552          assertFalse(it.hasNext());
553      }
554  
# Line 596 | Line 556 | public class LinkedTransferQueueTest ext
556       * iterator ordering is FIFO
557       */
558      public void testIteratorOrdering() {
559 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
559 >        final LinkedTransferQueue<Integer> q
560 >            = new LinkedTransferQueue<Integer>();
561          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
562          q.add(one);
563          q.add(two);
# Line 631 | Line 592 | public class LinkedTransferQueueTest ext
592          LinkedTransferQueue q = populatedQueue(SIZE);
593          String s = q.toString();
594          for (int i = 0; i < SIZE; ++i) {
595 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
595 >            assertTrue(s.contains(String.valueOf(i)));
596          }
597      }
598  
# Line 640 | Line 601 | public class LinkedTransferQueueTest ext
601       */
602      public void testOfferInExecutor() {
603          final LinkedTransferQueue q = new LinkedTransferQueue();
604 <        q.add(one);
644 <        q.add(two);
604 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
605          ExecutorService executor = Executors.newFixedThreadPool(2);
606 <        executor.execute(new Runnable() {
607 <            public void run() {
608 <                try {
609 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
610 <                } catch (Throwable ex) {
651 <                    threadUnexpectedException(ex);
652 <                }
606 >
607 >        executor.execute(new CheckedRunnable() {
608 >            public void realRun() throws InterruptedException {
609 >                threadsStarted.await();
610 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
611              }});
612  
613 <        executor.execute(new Runnable() {
614 <            public void run() {
615 <                try {
616 <                    Thread.sleep(SMALL_DELAY_MS);
617 <                    threadAssertEquals(one, q.take());
660 <                } catch (Throwable ex) {
661 <                    threadUnexpectedException(ex);
662 <                }
613 >        executor.execute(new CheckedRunnable() {
614 >            public void realRun() throws InterruptedException {
615 >                threadsStarted.await();
616 >                assertSame(one, q.take());
617 >                checkEmpty(q);
618              }});
619  
620          joinPool(executor);
621      }
622  
623      /**
624 <     * poll retrieves elements across Executor threads
624 >     * timed poll retrieves elements across Executor threads
625       */
626      public void testPollInExecutor() {
627          final LinkedTransferQueue q = new LinkedTransferQueue();
628 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
629          ExecutorService executor = Executors.newFixedThreadPool(2);
630 <        executor.execute(new Runnable() {
631 <            public void run() {
632 <                try {
633 <                    threadAssertNull(q.poll());
634 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
635 <                    threadAssertTrue(q.isEmpty());
636 <                } catch (Throwable  ex) {
681 <                    threadUnexpectedException(ex);
682 <                }
630 >
631 >        executor.execute(new CheckedRunnable() {
632 >            public void realRun() throws InterruptedException {
633 >                assertNull(q.poll());
634 >                threadsStarted.await();
635 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
636 >                checkEmpty(q);
637              }});
638  
639 <        executor.execute(new Runnable() {
640 <            public void run() {
641 <                try {
642 <                    Thread.sleep(SMALL_DELAY_MS);
689 <                    q.put(one);
690 <                } catch (Throwable ex) {
691 <                    threadUnexpectedException(ex);
692 <                }
639 >        executor.execute(new CheckedRunnable() {
640 >            public void realRun() throws InterruptedException {
641 >                threadsStarted.await();
642 >                q.put(one);
643              }});
644  
645          joinPool(executor);
# Line 702 | Line 652 | public class LinkedTransferQueueTest ext
652          LinkedTransferQueue q = populatedQueue(SIZE);
653  
654          ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
655 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
655 >        ObjectOutputStream out
656 >            = new ObjectOutputStream(new BufferedOutputStream(bout));
657          out.writeObject(q);
658          out.close();
659  
660 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
661 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
660 >        ByteArrayInputStream bin
661 >            = new ByteArrayInputStream(bout.toByteArray());
662 >        ObjectInputStream in
663 >            = new ObjectInputStream(new BufferedInputStream(bin));
664          LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
665  
666          assertEquals(q.size(), r.size());
667 +        assertEquals(q.toString(), r.toString());
668 +        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
669          while (!q.isEmpty()) {
670              assertEquals(q.remove(), r.remove());
671          }
672      }
673  
674      /**
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) {
740        }
741    }
742
743    /**
675       * drainTo(c) empties queue into another collection c
676       */
677      public void testDrainTo() {
# Line 767 | Line 698 | public class LinkedTransferQueueTest ext
698      }
699  
700      /**
701 <     * drainTo empties full queue, unblocking a waiting put.
701 >     * drainTo(c) empties full queue, unblocking a waiting put.
702       */
703      public void testDrainToWithActivePut() throws InterruptedException {
704          final LinkedTransferQueue q = populatedQueue(SIZE);
705 <        Thread t = new Thread(new Runnable() {
706 <            public void run() {
707 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
705 >        Thread t = newStartedThread(new CheckedRunnable() {
706 >            public void realRun() {
707 >                q.put(SIZE + 1);
708              }});
782        t.start();
709          ArrayList l = new ArrayList();
710          q.drainTo(l);
711          assertTrue(l.size() >= SIZE);
712          for (int i = 0; i < SIZE; ++i) {
713              assertEquals(l.get(i), i);
714          }
715 <        t.join();
715 >        awaitTermination(t, MEDIUM_DELAY_MS);
716          assertTrue(q.size() + l.size() >= SIZE);
717      }
718  
719      /**
720 <     * 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
720 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
721       */
722      public void testDrainToN() {
723          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 837 | Line 739 | public class LinkedTransferQueueTest ext
739      }
740  
741      /**
742 <     * poll and take should decrement the waiting consumer count
742 >     * timed poll() or take() increments the waiting consumer count;
743 >     * offer(e) decrements the waiting consumer count
744       */
745      public void testWaitingConsumer() throws InterruptedException {
746          final LinkedTransferQueue q = new LinkedTransferQueue();
747 <        final ConsumerObserver waiting = new ConsumerObserver();
748 <        new Thread(new Runnable() {
749 <            public void run() {
750 <                try {
751 <                    threadAssertTrue(q.hasWaitingConsumer());
752 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
753 <                    threadAssertTrue(q.offer(new Object()));
754 <                } catch (Throwable ex) {
755 <                    threadUnexpectedException(ex);
756 <                }
757 <            }}).start();
758 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
759 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
747 >        assertEquals(q.getWaitingConsumerCount(), 0);
748 >        assertFalse(q.hasWaitingConsumer());
749 >        final CountDownLatch threadStarted = new CountDownLatch(1);
750 >
751 >        Thread t = newStartedThread(new CheckedRunnable() {
752 >            public void realRun() throws InterruptedException {
753 >                threadStarted.countDown();
754 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
755 >                assertEquals(q.getWaitingConsumerCount(), 0);
756 >                assertFalse(q.hasWaitingConsumer());
757 >            }});
758 >
759 >        threadStarted.await();
760 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
761 >        assertEquals(q.getWaitingConsumerCount(), 1);
762 >        assertTrue(q.hasWaitingConsumer());
763 >
764 >        assertTrue(q.offer(one));
765 >        assertEquals(q.getWaitingConsumerCount(), 0);
766 >        assertFalse(q.hasWaitingConsumer());
767 >
768 >        awaitTermination(t, MEDIUM_DELAY_MS);
769      }
770  
771      /**
# Line 864 | Line 776 | public class LinkedTransferQueueTest ext
776              LinkedTransferQueue q = new LinkedTransferQueue();
777              q.transfer(null);
778              shouldThrow();
779 <        } catch (NullPointerException ex) {
868 <        }
779 >        } catch (NullPointerException success) {}
780      }
781  
782      /**
783 <     * transfer attempts to insert into the queue then wait until that
784 <     * object is removed via take or poll.
783 >     * transfer waits until a poll occurs. The transfered element
784 >     * is returned by this associated poll.
785       */
786      public void testTransfer2() throws InterruptedException {
787 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
788 <
789 <        new Thread(new Runnable() {
790 <            public void run() {
791 <                try {
792 <                    q.transfer(SIZE);
793 <                    threadAssertTrue(q.isEmpty());
794 <                } catch (Throwable ex) {
795 <                    threadUnexpectedException(ex);
796 <                }
886 <            }}).start();
787 >        final LinkedTransferQueue<Integer> q
788 >            = new LinkedTransferQueue<Integer>();
789 >        final CountDownLatch threadStarted = new CountDownLatch(1);
790 >
791 >        Thread t = newStartedThread(new CheckedRunnable() {
792 >            public void realRun() throws InterruptedException {
793 >                threadStarted.countDown();
794 >                q.transfer(five);
795 >                checkEmpty(q);
796 >            }});
797  
798 <        Thread.sleep(SHORT_DELAY_MS);
798 >        threadStarted.await();
799 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
800          assertEquals(1, q.size());
801 <        assertEquals(SIZE, (int) q.poll());
802 <        assertTrue(q.isEmpty());
801 >        assertSame(five, q.poll());
802 >        checkEmpty(q);
803 >        awaitTermination(t, MEDIUM_DELAY_MS);
804      }
805  
806      /**
807 <     * transfer will attempt to transfer in fifo order and continue
896 <     * waiting if the element being transfered is not polled or taken
807 >     * transfer waits until a poll occurs, and then transfers in fifo order
808       */
809      public void testTransfer3() throws InterruptedException {
810 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
810 >        final LinkedTransferQueue<Integer> q
811 >            = new LinkedTransferQueue<Integer>();
812  
813 <        Thread first =
814 <            new Thread(new Runnable() {
815 <                public void run() {
816 <                    try {
817 <                        Integer i = SIZE + 1;
818 <                        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();
813 >        Thread first = newStartedThread(new CheckedRunnable() {
814 >            public void realRun() throws InterruptedException {
815 >                q.transfer(four);
816 >                assertTrue(!q.contains(four));
817 >                assertEquals(1, q.size());
818 >            }});
819  
820 <        Thread interruptedThread =
821 <            new Thread(new Runnable() {
822 <                public void run() {
823 <                    try {
824 <                        while (q.size() == 0)
825 <                            Thread.yield();
921 <                        q.transfer(SIZE);
922 <                        threadShouldThrow();
923 <                    } catch (InterruptedException success) {
924 <                    } catch (Throwable ex) {
925 <                        threadUnexpectedException(ex);
926 <                    }
820 >        Thread interruptedThread = newStartedThread(
821 >            new CheckedInterruptedRunnable() {
822 >                public void realRun() throws InterruptedException {
823 >                    while (q.isEmpty())
824 >                        Thread.yield();
825 >                    q.transfer(five);
826                  }});
928        interruptedThread.start();
827  
828          while (q.size() < 2)
829              Thread.yield();
830          assertEquals(2, q.size());
831 <        assertEquals(SIZE + 1, (int) q.poll());
831 >        assertSame(four, q.poll());
832          first.join();
833          assertEquals(1, q.size());
834          interruptedThread.interrupt();
835          interruptedThread.join();
836 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
836 >        checkEmpty(q);
837      }
838  
839      /**
840 <     * transfer will wait as long as a poll or take occurs if one does occur
841 <     * the waiting is finished and the thread that tries to poll/take
945 <     * wins in retrieving the element
840 >     * transfer waits until a poll occurs, at which point the polling
841 >     * thread returns the element
842       */
843      public void testTransfer4() throws InterruptedException {
844          final LinkedTransferQueue q = new LinkedTransferQueue();
845 <        new Thread(new Runnable() {
846 <            public void run() {
847 <                try {
848 <                    q.transfer(four);
849 <                    threadAssertFalse(q.contains(four));
850 <                    threadAssertEquals(three, q.poll());
851 <                } catch (Throwable ex) {
852 <                    threadUnexpectedException(ex);
853 <                }
854 <            }}).start();
855 <        Thread.sleep(MEDIUM_DELAY_MS);
845 >
846 >        Thread t = newStartedThread(new CheckedRunnable() {
847 >            public void realRun() throws InterruptedException {
848 >                q.transfer(four);
849 >                assertFalse(q.contains(four));
850 >                assertSame(three, q.poll());
851 >            }});
852 >
853 >        while (q.isEmpty())
854 >            Thread.yield();
855 >        assertFalse(q.isEmpty());
856 >        assertEquals(1, q.size());
857          assertTrue(q.offer(three));
858 <        assertEquals(four, q.poll());
858 >        assertSame(four, q.poll());
859 >        awaitTermination(t, MEDIUM_DELAY_MS);
860 >    }
861 >
862 >    /**
863 >     * transfer waits until a take occurs. The transfered element
864 >     * is returned by this associated take.
865 >     */
866 >    public void testTransfer5() throws InterruptedException {
867 >        final LinkedTransferQueue<Integer> q
868 >            = new LinkedTransferQueue<Integer>();
869 >
870 >        Thread t = newStartedThread(new CheckedRunnable() {
871 >            public void realRun() throws InterruptedException {
872 >                q.transfer(four);
873 >                checkEmpty(q);
874 >            }});
875 >
876 >        while (q.isEmpty())
877 >            Thread.yield();
878 >        assertFalse(q.isEmpty());
879 >        assertEquals(1, q.size());
880 >        assertSame(four, q.take());
881 >        checkEmpty(q);
882 >        awaitTermination(t, MEDIUM_DELAY_MS);
883      }
884  
885      /**
# Line 968 | Line 889 | public class LinkedTransferQueueTest ext
889          try {
890              final LinkedTransferQueue q = new LinkedTransferQueue();
891              q.tryTransfer(null);
892 <            this.shouldThrow();
893 <        } catch (NullPointerException ex) {
973 <        }
892 >            shouldThrow();
893 >        } catch (NullPointerException success) {}
894      }
895  
896      /**
897       * tryTransfer returns false and does not enqueue if there are no
898       * consumers waiting to poll or take.
899       */
900 <    public void testTryTransfer2() {
900 >    public void testTryTransfer2() throws InterruptedException {
901          final LinkedTransferQueue q = new LinkedTransferQueue();
902          assertFalse(q.tryTransfer(new Object()));
903          assertFalse(q.hasWaitingConsumer());
904 <        assertTrue(q.isEmpty());
985 <        assertEquals(0, q.size());
904 >        checkEmpty(q);
905      }
906  
907      /**
# Line 992 | Line 911 | public class LinkedTransferQueueTest ext
911      public void testTryTransfer3() throws InterruptedException {
912          final Object hotPotato = new Object();
913          final LinkedTransferQueue q = new LinkedTransferQueue();
914 <        new Thread(new Runnable() {
915 <            public void run() {
916 <                try {
917 <                    while (! q.hasWaitingConsumer())
918 <                        Thread.yield();
919 <                    threadAssertTrue(q.hasWaitingConsumer());
920 <                    threadAssertTrue(q.isEmpty());
921 <                    threadAssertTrue(q.size() == 0);
922 <                    threadAssertTrue(q.tryTransfer(hotPotato));
923 <                } catch (Throwable ex) {
924 <                    threadUnexpectedException(ex);
925 <                }
926 <            }}).start();
1008 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
1009 <        assertTrue(q.isEmpty());
914 >
915 >        Thread t = newStartedThread(new CheckedRunnable() {
916 >            public void realRun() {
917 >                while (! q.hasWaitingConsumer())
918 >                    Thread.yield();
919 >                assertTrue(q.hasWaitingConsumer());
920 >                checkEmpty(q);
921 >                assertTrue(q.tryTransfer(hotPotato));
922 >            }});
923 >
924 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
925 >        checkEmpty(q);
926 >        awaitTermination(t, MEDIUM_DELAY_MS);
927      }
928  
929      /**
# Line 1016 | Line 933 | public class LinkedTransferQueueTest ext
933      public void testTryTransfer4() throws InterruptedException {
934          final Object hotPotato = new Object();
935          final LinkedTransferQueue q = new LinkedTransferQueue();
936 <        new Thread(new Runnable() {
937 <            public void run() {
938 <                try {
939 <                    while (! q.hasWaitingConsumer())
940 <                        Thread.yield();
941 <                    threadAssertTrue(q.hasWaitingConsumer());
942 <                    threadAssertTrue(q.isEmpty());
943 <                    threadAssertTrue(q.size() == 0);
944 <                    threadAssertTrue(q.tryTransfer(hotPotato));
945 <                } catch (Throwable ex) {
946 <                    threadUnexpectedException(ex);
947 <                }
948 <            }}).start();
1032 <        assertTrue(q.take() == hotPotato);
1033 <        assertTrue(q.isEmpty());
936 >
937 >        Thread t = newStartedThread(new CheckedRunnable() {
938 >            public void realRun() {
939 >                while (! q.hasWaitingConsumer())
940 >                    Thread.yield();
941 >                assertTrue(q.hasWaitingConsumer());
942 >                checkEmpty(q);
943 >                assertTrue(q.tryTransfer(hotPotato));
944 >            }});
945 >
946 >        assertSame(q.take(), hotPotato);
947 >        checkEmpty(q);
948 >        awaitTermination(t, MEDIUM_DELAY_MS);
949      }
950  
951      /**
952 <     * tryTransfer waits the amount given if interrupted, show an
1038 <     * interrupted exception
952 >     * tryTransfer blocks interruptibly if no takers
953       */
954      public void testTryTransfer5() throws InterruptedException {
955          final LinkedTransferQueue q = new LinkedTransferQueue();
956 <        Thread toInterrupt = new Thread(new Runnable() {
957 <            public void run() {
956 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
957 >        assertTrue(q.isEmpty());
958 >
959 >        Thread t = newStartedThread(new CheckedRunnable() {
960 >            public void realRun() throws InterruptedException {
961 >                Thread.currentThread().interrupt();
962                  try {
963 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
964 <                    threadShouldThrow();
965 <                } catch (InterruptedException success) {
966 <                } catch (Throwable ex) {
967 <                    threadUnexpectedException(ex);
968 <                }
963 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
964 >                    shouldThrow();
965 >                } catch (InterruptedException success) {}
966 >                assertFalse(Thread.interrupted());
967 >
968 >                pleaseInterrupt.countDown();
969 >                try {
970 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
971 >                    shouldThrow();
972 >                } catch (InterruptedException success) {}
973 >                assertFalse(Thread.interrupted());
974              }});
975 <        toInterrupt.start();
976 <        Thread.sleep(SMALL_DELAY_MS);
977 <        toInterrupt.interrupt();
975 >
976 >        await(pleaseInterrupt);
977 >        assertThreadStaysAlive(t);
978 >        t.interrupt();
979 >        awaitTermination(t);
980 >        checkEmpty(q);
981      }
982  
983      /**
984 <     * tryTransfer gives up after the timeout and return false
984 >     * tryTransfer gives up after the timeout and returns false
985       */
986      public void testTryTransfer6() throws InterruptedException {
987          final LinkedTransferQueue q = new LinkedTransferQueue();
988 <        new Thread(new Runnable() {
989 <            public void run() {
990 <                try {
991 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
992 <                } catch (Throwable ex) {
993 <                    threadUnexpectedException(ex);
994 <                }
995 <            }}).start();
996 <        Thread.sleep(LONG_DELAY_MS);
997 <        assertTrue(q.isEmpty());
988 >
989 >        Thread t = newStartedThread(new CheckedRunnable() {
990 >            public void realRun() throws InterruptedException {
991 >                long t0 = System.nanoTime();
992 >                assertFalse(q.tryTransfer(new Object(),
993 >                                          timeoutMillis(), MILLISECONDS));
994 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
995 >                checkEmpty(q);
996 >            }});
997 >
998 >        awaitTermination(t);
999 >        checkEmpty(q);
1000      }
1001  
1002      /**
# Line 1078 | Line 1006 | public class LinkedTransferQueueTest ext
1006      public void testTryTransfer7() throws InterruptedException {
1007          final LinkedTransferQueue q = new LinkedTransferQueue();
1008          assertTrue(q.offer(four));
1009 <        new Thread(new Runnable() {
1010 <            public void run() {
1011 <                try {
1012 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
1013 <                    threadAssertTrue(q.isEmpty());
1014 <                } catch (Throwable ex) {
1015 <                    threadUnexpectedException(ex);
1016 <                }
1017 <            }}).start();
1090 <        Thread.sleep(SHORT_DELAY_MS);
1009 >
1010 >        Thread t = newStartedThread(new CheckedRunnable() {
1011 >            public void realRun() throws InterruptedException {
1012 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1013 >                checkEmpty(q);
1014 >            }});
1015 >
1016 >        while (q.size() != 2)
1017 >            Thread.yield();
1018          assertEquals(2, q.size());
1019 <        assertEquals(four, q.poll());
1020 <        assertEquals(five, q.poll());
1021 <        assertTrue(q.isEmpty());
1019 >        assertSame(four, q.poll());
1020 >        assertSame(five, q.poll());
1021 >        checkEmpty(q);
1022 >        awaitTermination(t, MEDIUM_DELAY_MS);
1023      }
1024  
1025      /**
1026 <     * tryTransfer attempts to enqueue into the q and fails returning
1027 <     * false not enqueueing and the successive poll is null
1026 >     * tryTransfer attempts to enqueue into the queue and fails
1027 >     * returning false not enqueueing and the successive poll is null
1028       */
1029      public void testTryTransfer8() throws InterruptedException {
1030          final LinkedTransferQueue q = new LinkedTransferQueue();
1031          assertTrue(q.offer(four));
1032          assertEquals(1, q.size());
1033 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1033 >        long t0 = System.nanoTime();
1034 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1035 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1036          assertEquals(1, q.size());
1037 <        assertEquals(four, q.poll());
1108 <        threadAssertTrue(q.isEmpty());
1037 >        assertSame(four, q.poll());
1038          assertNull(q.poll());
1039 +        checkEmpty(q);
1040      }
1041  
1042      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1043          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1044 <        assertTrue(q.isEmpty());
1044 >        checkEmpty(q);
1045          for (int i = 0; i < n; i++) {
1046              assertEquals(i, q.size());
1047              assertTrue(q.offer(i));
# Line 1120 | Line 1050 | public class LinkedTransferQueueTest ext
1050          assertFalse(q.isEmpty());
1051          return q;
1052      }
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    }
1053   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines