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.55 by jsr166, Wed Dec 31 19:05:43 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines