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.10 by jsr166, Thu Aug 6 03:55:39 2009 UTC vs.
Revision 1.67 by jsr166, Sun Oct 16 20:16:36 2016 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.*;
17 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
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;
22 import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
27 +    public static class Generic extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedTransferQueue();
30 +        }
31 +    }
32  
33      public static void main(String[] args) {
34 <        junit.textui.TestRunner.run(suite());
34 >        main(suite(), args);
35      }
36  
37      public static Test suite() {
38 <        return new TestSuite(LinkedTransferQueueTest.class);
38 >        class Implementation implements CollectionImplementation {
39 >            public Class<?> klazz() { return LinkedTransferQueue.class; }
40 >            public Collection emptyCollection() { return new LinkedTransferQueue(); }
41 >            public Object makeElement(int i) { return i; }
42 >            public boolean isConcurrent() { return true; }
43 >            public boolean permitsNulls() { return false; }
44 >        }
45 >        return newTestSuite(LinkedTransferQueueTest.class,
46 >                            new Generic().testSuite(),
47 >                            CollectionTest.testSuite(new Implementation()));
48      }
49  
50      /**
# Line 49 | Line 64 | public class LinkedTransferQueueTest ext
64          try {
65              new LinkedTransferQueue(null);
66              shouldThrow();
67 <        } catch (NullPointerException success) {
53 <        }
67 >        } catch (NullPointerException success) {}
68      }
69  
70      /**
# Line 58 | Line 72 | public class LinkedTransferQueueTest ext
72       * NullPointerException
73       */
74      public void testConstructor3() {
75 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
76          try {
77 <            Integer[] ints = new Integer[SIZE];
63 <            new LinkedTransferQueue(Arrays.asList(ints));
77 >            new LinkedTransferQueue(elements);
78              shouldThrow();
79 <        } catch (NullPointerException success) {
66 <        }
79 >        } catch (NullPointerException success) {}
80      }
81  
82      /**
# Line 71 | Line 84 | public class LinkedTransferQueueTest ext
84       * throws NullPointerException
85       */
86      public void testConstructor4() {
87 +        Integer[] ints = new Integer[SIZE];
88 +        for (int i = 0; i < SIZE - 1; ++i)
89 +            ints[i] = i;
90 +        Collection<Integer> elements = Arrays.asList(ints);
91          try {
92 <            Integer[] ints = new Integer[SIZE];
76 <            for (int i = 0; i < SIZE - 1; ++i) {
77 <                ints[i] = i;
78 <            }
79 <            new LinkedTransferQueue(Arrays.asList(ints));
92 >            new LinkedTransferQueue(elements);
93              shouldThrow();
94 <        } catch (NullPointerException success) {
82 <        }
94 >        } catch (NullPointerException success) {}
95      }
96  
97      /**
98       * Queue contains all elements of the collection it is initialized by
99       */
100      public void testConstructor5() {
101 <        try {
102 <            Integer[] ints = new Integer[SIZE];
103 <            for (int i = 0; i < SIZE; ++i) {
104 <                ints[i] = i;
105 <            }
106 <            LinkedTransferQueue q
107 <                = new LinkedTransferQueue(Arrays.asList(ints));
108 <            for (int i = 0; i < SIZE; ++i) {
109 <                assertEquals(ints[i], q.poll());
110 <            }
111 <        } finally {
101 >        Integer[] ints = new Integer[SIZE];
102 >        for (int i = 0; i < SIZE; ++i) {
103 >            ints[i] = i;
104 >        }
105 >        List intList = Arrays.asList(ints);
106 >        LinkedTransferQueue q
107 >            = new LinkedTransferQueue(intList);
108 >        assertEquals(q.size(), intList.size());
109 >        assertEquals(q.toString(), intList.toString());
110 >        assertTrue(Arrays.equals(q.toArray(),
111 >                                     intList.toArray()));
112 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
113 >                                 intList.toArray(new Object[0])));
114 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
115 >                                 intList.toArray(new Object[SIZE])));
116 >        for (int i = 0; i < SIZE; ++i) {
117 >            assertEquals(ints[i], q.poll());
118          }
119      }
120  
121      /**
122 <     * Remaining capacity never decrease nor increase on add or remove
122 >     * remainingCapacity() always returns Integer.MAX_VALUE
123       */
124      public void testRemainingCapacity() {
125 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
125 >        BlockingQueue q = populatedQueue(SIZE);
126          for (int i = 0; i < SIZE; ++i) {
127              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
128              assertEquals(SIZE - i, q.size());
129 <            q.remove();
129 >            assertEquals(i, q.remove());
130          }
131          for (int i = 0; i < SIZE; ++i) {
132              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133              assertEquals(i, q.size());
134 <            q.add(i);
117 <        }
118 <    }
119 <
120 <    /**
121 <     * offer(null) throws NullPointerException
122 <     */
123 <    public void testOfferNull() {
124 <        try {
125 <            LinkedTransferQueue q = new LinkedTransferQueue();
126 <            q.offer(null);
127 <            shouldThrow();
128 <        } catch (NullPointerException success) {
129 <        }
130 <    }
131 <
132 <    /**
133 <     * add(null) throws NullPointerException
134 <     */
135 <    public void testAddNull() {
136 <        try {
137 <            LinkedTransferQueue q = new LinkedTransferQueue();
138 <            q.add(null);
139 <            shouldThrow();
140 <        } catch (NullPointerException success) {
141 <        }
142 <    }
143 <
144 <    /**
145 <     * addAll(null) throws NullPointerException
146 <     */
147 <    public void testAddAll1() {
148 <        try {
149 <            LinkedTransferQueue q = new LinkedTransferQueue();
150 <            q.addAll(null);
151 <            shouldThrow();
152 <        } catch (NullPointerException success) {
134 >            assertTrue(q.add(i));
135          }
136      }
137  
# Line 157 | Line 139 | public class LinkedTransferQueueTest ext
139       * addAll(this) throws IllegalArgumentException
140       */
141      public void testAddAllSelf() {
142 +        LinkedTransferQueue q = populatedQueue(SIZE);
143          try {
161            LinkedTransferQueue q = populatedQueue(SIZE);
144              q.addAll(q);
145              shouldThrow();
146 <        } catch (IllegalArgumentException success) {
165 <        }
166 <    }
167 <
168 <    /**
169 <     * addAll of a collection with null elements throws NullPointerException
170 <     */
171 <    public void testAddAll2() {
172 <        try {
173 <            LinkedTransferQueue q = new LinkedTransferQueue();
174 <            Integer[] ints = new Integer[SIZE];
175 <            q.addAll(Arrays.asList(ints));
176 <            shouldThrow();
177 <        } catch (NullPointerException success) {
178 <        }
146 >        } catch (IllegalArgumentException success) {}
147      }
148  
149      /**
# Line 183 | Line 151 | public class LinkedTransferQueueTest ext
151       * NullPointerException after possibly adding some elements
152       */
153      public void testAddAll3() {
154 +        LinkedTransferQueue q = new LinkedTransferQueue();
155 +        Integer[] ints = new Integer[SIZE];
156 +        for (int i = 0; i < SIZE - 1; ++i)
157 +            ints[i] = i;
158          try {
187            LinkedTransferQueue q = new LinkedTransferQueue();
188            Integer[] ints = new Integer[SIZE];
189            for (int i = 0; i < SIZE - 1; ++i) {
190                ints[i] = i;
191            }
159              q.addAll(Arrays.asList(ints));
160              shouldThrow();
161 <        } catch (NullPointerException success) {
195 <        }
161 >        } catch (NullPointerException success) {}
162      }
163  
164      /**
# Line 213 | Line 179 | public class LinkedTransferQueueTest ext
179      }
180  
181      /**
216     * put(null) throws NullPointerException
217     */
218    public void testPutNull() throws InterruptedException {
219        try {
220            LinkedTransferQueue q = new LinkedTransferQueue();
221            q.put(null);
222            shouldThrow();
223        } catch (NullPointerException success) {}
224    }
225
226    /**
182       * all elements successfully put are contained
183       */
184      public void testPut() {
185          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
186          for (int i = 0; i < SIZE; ++i) {
187 +            assertEquals(i, q.size());
188              q.put(i);
189              assertTrue(q.contains(i));
190          }
235        assertEquals(q.size(), SIZE);
191      }
192  
193      /**
# Line 246 | Line 201 | public class LinkedTransferQueueTest ext
201      }
202  
203      /**
204 <     * take blocks interruptibly when empty
250 <     */
251 <    public void testTakeFromEmpty() throws InterruptedException {
252 <        final LinkedTransferQueue q = new LinkedTransferQueue();
253 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
254 <            void realRun() throws InterruptedException {
255 <                q.take();
256 <            }});
257 <        Thread.sleep(SHORT_DELAY_MS);
258 <        t.interrupt();
259 <        t.join();
260 <    }
261 <
262 <    /**
263 <     * Take removes existing elements until empty, then blocks interruptibly
204 >     * take removes existing elements until empty, then blocks interruptibly
205       */
206      public void testBlockingTake() throws InterruptedException {
207 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
208 <            void realRun() throws InterruptedException {
209 <                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
207 >        final BlockingQueue q = populatedQueue(SIZE);
208 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
209 >        Thread t = newStartedThread(new CheckedRunnable() {
210 >            public void realRun() throws InterruptedException {
211                  for (int i = 0; i < SIZE; ++i) {
212 <                    threadAssertEquals(i, (int) q.take());
212 >                    assertEquals(i, q.take());
213                  }
214 <                q.take();
214 >
215 >                Thread.currentThread().interrupt();
216 >                try {
217 >                    q.take();
218 >                    shouldThrow();
219 >                } catch (InterruptedException success) {}
220 >                assertFalse(Thread.interrupted());
221 >
222 >                pleaseInterrupt.countDown();
223 >                try {
224 >                    q.take();
225 >                    shouldThrow();
226 >                } catch (InterruptedException success) {}
227 >                assertFalse(Thread.interrupted());
228              }});
229 <        Thread.sleep(SHORT_DELAY_MS);
229 >
230 >        await(pleaseInterrupt);
231 >        assertThreadStaysAlive(t);
232          t.interrupt();
233 <        t.join();
233 >        awaitTermination(t);
234      }
235  
236      /**
237       * poll succeeds unless empty
238       */
239 <    public void testPoll() {
239 >    public void testPoll() throws InterruptedException {
240          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
241          for (int i = 0; i < SIZE; ++i) {
242              assertEquals(i, (int) q.poll());
243          }
244          assertNull(q.poll());
245 +        checkEmpty(q);
246      }
247  
248      /**
249 <     * timed pool with zero timeout succeeds when non-empty, else times out
249 >     * timed poll with zero timeout succeeds when non-empty, else times out
250       */
251      public void testTimedPoll0() throws InterruptedException {
252          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 296 | Line 254 | public class LinkedTransferQueueTest ext
254              assertEquals(i, (int) q.poll(0, MILLISECONDS));
255          }
256          assertNull(q.poll(0, MILLISECONDS));
257 +        checkEmpty(q);
258      }
259  
260      /**
261 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
261 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
262       */
263      public void testTimedPoll() throws InterruptedException {
264          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
265 <        for (int i = 0; i < SIZE; ++i) {
266 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
267 <        }
268 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
265 >        long startTime = System.nanoTime();
266 >        for (int i = 0; i < SIZE; ++i)
267 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
268 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
269 >
270 >        startTime = System.nanoTime();
271 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
272 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
273 >        checkEmpty(q);
274      }
275  
276      /**
# Line 314 | Line 278 | public class LinkedTransferQueueTest ext
278       * returning timeout status
279       */
280      public void testInterruptedTimedPoll() throws InterruptedException {
281 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
282 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
283 <            void realRun() throws InterruptedException {
284 <                for (int i = 0; i < SIZE; ++i) {
285 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
286 <                                                       MILLISECONDS));
287 <                }
288 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
281 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
282 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
283 >        Thread t = newStartedThread(new CheckedRunnable() {
284 >            public void realRun() throws InterruptedException {
285 >                long startTime = System.nanoTime();
286 >                for (int i = 0; i < SIZE; ++i)
287 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
288 >                aboutToWait.countDown();
289 >                try {
290 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
291 >                    shouldThrow();
292 >                } catch (InterruptedException success) {}
293 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
294              }});
295 <        Thread.sleep(SMALL_DELAY_MS);
295 >
296 >        aboutToWait.await();
297 >        waitForThreadToEnterWaitState(t);
298          t.interrupt();
299 <        t.join();
300 <        assertEquals(q.size(), 0);
330 <        assertNull(q.poll());
299 >        awaitTermination(t);
300 >        checkEmpty(q);
301      }
302  
303      /**
304 <     * timed poll before a delayed offer fails; after offer succeeds;
305 <     * on interruption throws
304 >     * timed poll after thread interrupted throws InterruptedException
305 >     * instead of returning timeout status
306       */
307 <    public void testTimedPollWithOffer() throws InterruptedException {
308 <        final LinkedTransferQueue q = new LinkedTransferQueue();
309 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
310 <            void realRun() throws InterruptedException {
311 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
312 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
313 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
307 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
308 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
309 >        Thread t = newStartedThread(new CheckedRunnable() {
310 >            public void realRun() throws InterruptedException {
311 >                long startTime = System.nanoTime();
312 >                Thread.currentThread().interrupt();
313 >                for (int i = 0; i < SIZE; ++i)
314 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
315 >                try {
316 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
317 >                    shouldThrow();
318 >                } catch (InterruptedException success) {}
319 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
320              }});
321 <        Thread.sleep(SMALL_DELAY_MS);
322 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
323 <        t.interrupt();
348 <        t.join();
321 >
322 >        awaitTermination(t);
323 >        checkEmpty(q);
324      }
325  
326      /**
327       * peek returns next element, or null if empty
328       */
329 <    public void testPeek() {
329 >    public void testPeek() throws InterruptedException {
330          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
331          for (int i = 0; i < SIZE; ++i) {
332              assertEquals(i, (int) q.peek());
# Line 360 | Line 335 | public class LinkedTransferQueueTest ext
335                         i != (int) q.peek());
336          }
337          assertNull(q.peek());
338 +        checkEmpty(q);
339      }
340  
341      /**
342       * element returns next element, or throws NoSuchElementException if empty
343       */
344 <    public void testElement() {
344 >    public void testElement() throws InterruptedException {
345          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
346          for (int i = 0; i < SIZE; ++i) {
347              assertEquals(i, (int) q.element());
# Line 374 | Line 350 | public class LinkedTransferQueueTest ext
350          try {
351              q.element();
352              shouldThrow();
353 <        } catch (NoSuchElementException success) {
354 <        }
353 >        } catch (NoSuchElementException success) {}
354 >        checkEmpty(q);
355      }
356  
357      /**
358       * remove removes next element, or throws NoSuchElementException if empty
359       */
360 <    public void testRemove() {
360 >    public void testRemove() throws InterruptedException {
361          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
362          for (int i = 0; i < SIZE; ++i) {
363              assertEquals(i, (int) q.remove());
# Line 389 | Line 365 | public class LinkedTransferQueueTest ext
365          try {
366              q.remove();
367              shouldThrow();
368 <        } catch (NoSuchElementException success) {
369 <        }
394 <    }
395 <
396 <    /**
397 <     * remove(x) removes x and returns true if present
398 <     */
399 <    public void testRemoveElement() {
400 <        LinkedTransferQueue q = populatedQueue(SIZE);
401 <        for (int i = 1; i < SIZE; i += 2) {
402 <            assertTrue(q.remove(i));
403 <        }
404 <        for (int i = 0; i < SIZE; i += 2) {
405 <            assertTrue(q.remove(i));
406 <            assertFalse(q.remove(i + 1));
407 <        }
408 <        assertTrue(q.isEmpty());
368 >        } catch (NoSuchElementException success) {}
369 >        checkEmpty(q);
370      }
371  
372      /**
# Line 418 | Line 379 | public class LinkedTransferQueueTest ext
379          assertTrue(q.remove(one));
380          assertTrue(q.remove(two));
381          assertTrue(q.add(three));
382 <        assertTrue(q.take() != null);
382 >        assertSame(q.take(), three);
383      }
384  
385      /**
# Line 436 | Line 397 | public class LinkedTransferQueueTest ext
397      /**
398       * clear removes all elements
399       */
400 <    public void testClear() {
400 >    public void testClear() throws InterruptedException {
401          LinkedTransferQueue q = populatedQueue(SIZE);
402          q.clear();
403 <        assertTrue(q.isEmpty());
443 <        assertEquals(0, q.size());
403 >        checkEmpty(q);
404          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
405          q.add(one);
406          assertFalse(q.isEmpty());
407 +        assertEquals(1, q.size());
408          assertTrue(q.contains(one));
409          q.clear();
410 <        assertTrue(q.isEmpty());
410 >        checkEmpty(q);
411      }
412  
413      /**
# Line 500 | Line 461 | public class LinkedTransferQueueTest ext
461      }
462  
463      /**
464 <     * toArray contains all elements
464 >     * toArray() contains all elements in FIFO order
465       */
466 <    public void testToArray() throws InterruptedException {
466 >    public void testToArray() {
467          LinkedTransferQueue q = populatedQueue(SIZE);
468          Object[] o = q.toArray();
469          for (int i = 0; i < o.length; i++) {
470 <            assertEquals(o[i], q.take());
470 >            assertSame(o[i], q.poll());
471          }
472      }
473  
474      /**
475 <     * toArray(a) contains all elements
475 >     * toArray(a) contains all elements in FIFO order
476       */
477 <    public void testToArray2() throws InterruptedException {
477 >    public void testToArray2() {
478          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
479          Integer[] ints = new Integer[SIZE];
480 <        ints = q.toArray(ints);
480 >        Integer[] array = q.toArray(ints);
481 >        assertSame(ints, array);
482          for (int i = 0; i < ints.length; i++) {
483 <            assertEquals(ints[i], q.take());
522 <        }
523 <    }
524 <
525 <    /**
526 <     * toArray(null) throws NullPointerException
527 <     */
528 <    public void testToArray_BadArg() {
529 <        try {
530 <            LinkedTransferQueue q = populatedQueue(SIZE);
531 <            Object o[] = q.toArray(null);
532 <            shouldThrow();
533 <        } catch (NullPointerException success) {
483 >            assertSame(ints[i], q.poll());
484          }
485      }
486  
487      /**
488 <     * toArray with incompatible array type throws CCE
488 >     * toArray(incompatible array type) throws ArrayStoreException
489       */
490      public void testToArray1_BadArg() {
491 +        LinkedTransferQueue q = populatedQueue(SIZE);
492          try {
493 <            LinkedTransferQueue q = populatedQueue(SIZE);
543 <            Object o[] = q.toArray(new String[10]);
493 >            q.toArray(new String[10]);
494              shouldThrow();
495 <        } catch (ArrayStoreException success) {
546 <        }
495 >        } catch (ArrayStoreException success) {}
496      }
497  
498      /**
# Line 552 | Line 501 | public class LinkedTransferQueueTest ext
501      public void testIterator() throws InterruptedException {
502          LinkedTransferQueue q = populatedQueue(SIZE);
503          Iterator it = q.iterator();
504 <        int i = 0;
505 <        while (it.hasNext()) {
506 <            assertEquals(it.next(), i++);
558 <        }
504 >        int i;
505 >        for (i = 0; it.hasNext(); i++)
506 >            assertTrue(q.contains(it.next()));
507          assertEquals(i, SIZE);
508 +        assertIteratorExhausted(it);
509 +
510 +        it = q.iterator();
511 +        for (i = 0; it.hasNext(); i++)
512 +            assertEquals(it.next(), q.take());
513 +        assertEquals(i, SIZE);
514 +        assertIteratorExhausted(it);
515      }
516  
517      /**
518 <     * iterator.remove removes current element
518 >     * iterator of empty collection has no elements
519 >     */
520 >    public void testEmptyIterator() {
521 >        assertIteratorExhausted(new LinkedTransferQueue().iterator());
522 >    }
523 >
524 >    /**
525 >     * iterator.remove() removes current element
526       */
527      public void testIteratorRemove() {
528          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 573 | Line 535 | public class LinkedTransferQueueTest ext
535          it.remove();
536  
537          it = q.iterator();
538 <        assertEquals(it.next(), one);
539 <        assertEquals(it.next(), three);
538 >        assertSame(it.next(), one);
539 >        assertSame(it.next(), three);
540          assertFalse(it.hasNext());
541      }
542  
# Line 618 | Line 580 | public class LinkedTransferQueueTest ext
580          LinkedTransferQueue q = populatedQueue(SIZE);
581          String s = q.toString();
582          for (int i = 0; i < SIZE; ++i) {
583 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
583 >            assertTrue(s.contains(String.valueOf(i)));
584          }
585      }
586  
# Line 627 | Line 589 | public class LinkedTransferQueueTest ext
589       */
590      public void testOfferInExecutor() {
591          final LinkedTransferQueue q = new LinkedTransferQueue();
592 <        q.add(one);
593 <        q.add(two);
594 <        ExecutorService executor = Executors.newFixedThreadPool(2);
595 <
596 <        executor.execute(new CheckedRunnable() {
597 <            void realRun() {
598 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
599 <                                         MILLISECONDS));
600 <            }});
601 <
602 <        executor.execute(new CheckedRunnable() {
641 <            void realRun() throws InterruptedException {
642 <                Thread.sleep(SMALL_DELAY_MS);
643 <                threadAssertEquals(one, q.take());
644 <            }});
592 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
593 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
594 >        try (PoolCleaner cleaner = cleaner(executor)) {
595 >
596 >            executor.execute(new CheckedRunnable() {
597 >                public void realRun() throws InterruptedException {
598 >                    threadsStarted.await();
599 >                    long startTime = System.nanoTime();
600 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
601 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
602 >                }});
603  
604 <        joinPool(executor);
604 >            executor.execute(new CheckedRunnable() {
605 >                public void realRun() throws InterruptedException {
606 >                    threadsStarted.await();
607 >                    assertSame(one, q.take());
608 >                    checkEmpty(q);
609 >                }});
610 >        }
611      }
612  
613      /**
614 <     * poll retrieves elements across Executor threads
614 >     * timed poll retrieves elements across Executor threads
615       */
616      public void testPollInExecutor() {
617          final LinkedTransferQueue q = new LinkedTransferQueue();
618 <        ExecutorService executor = Executors.newFixedThreadPool(2);
619 <
620 <        executor.execute(new CheckedRunnable() {
621 <            void realRun() throws InterruptedException {
622 <                threadAssertNull(q.poll());
623 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
624 <                                                MILLISECONDS));
625 <                threadAssertTrue(q.isEmpty());
626 <            }});
627 <
628 <        executor.execute(new CheckedRunnable() {
629 <            void realRun() throws InterruptedException {
630 <                Thread.sleep(SMALL_DELAY_MS);
667 <                q.put(one);
668 <            }});
618 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
619 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
620 >        try (PoolCleaner cleaner = cleaner(executor)) {
621 >
622 >            executor.execute(new CheckedRunnable() {
623 >                public void realRun() throws InterruptedException {
624 >                    assertNull(q.poll());
625 >                    threadsStarted.await();
626 >                    long startTime = System.nanoTime();
627 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
629 >                    checkEmpty(q);
630 >                }});
631  
632 <        joinPool(executor);
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    threadsStarted.await();
635 >                    q.put(one);
636 >                }});
637 >        }
638      }
639  
640      /**
641       * A deserialized serialized queue has same elements in same order
642       */
643      public void testSerialization() throws Exception {
644 <        LinkedTransferQueue q = populatedQueue(SIZE);
645 <
679 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
680 <        ObjectOutputStream out
681 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
682 <        out.writeObject(q);
683 <        out.close();
684 <
685 <        ByteArrayInputStream bin
686 <            = new ByteArrayInputStream(bout.toByteArray());
687 <        ObjectInputStream in
688 <            = new ObjectInputStream(new BufferedInputStream(bin));
689 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
690 <
691 <        assertEquals(q.size(), r.size());
692 <        while (!q.isEmpty()) {
693 <            assertEquals(q.remove(), r.remove());
694 <        }
695 <    }
696 <
697 <    /**
698 <     * drainTo(null) throws NullPointerException
699 <     */
700 <    public void testDrainToNull() {
701 <        LinkedTransferQueue q = populatedQueue(SIZE);
702 <        try {
703 <            q.drainTo(null);
704 <            shouldThrow();
705 <        } catch (NullPointerException success) {
706 <        }
707 <    }
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646  
647 <    /**
648 <     * drainTo(this) throws IllegalArgumentException
649 <     */
650 <    public void testDrainToSelf() {
651 <        LinkedTransferQueue q = populatedQueue(SIZE);
652 <        try {
653 <            q.drainTo(q);
716 <            shouldThrow();
717 <        } catch (IllegalArgumentException success) {
647 >        assertNotSame(y, x);
648 >        assertEquals(x.size(), y.size());
649 >        assertEquals(x.toString(), y.toString());
650 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
651 >        while (!x.isEmpty()) {
652 >            assertFalse(y.isEmpty());
653 >            assertEquals(x.remove(), y.remove());
654          }
655 +        assertTrue(y.isEmpty());
656      }
657  
658      /**
# Line 725 | Line 662 | public class LinkedTransferQueueTest ext
662          LinkedTransferQueue q = populatedQueue(SIZE);
663          ArrayList l = new ArrayList();
664          q.drainTo(l);
665 <        assertEquals(q.size(), 0);
666 <        assertEquals(l.size(), SIZE);
665 >        assertEquals(0, q.size());
666 >        assertEquals(SIZE, l.size());
667          for (int i = 0; i < SIZE; ++i) {
668 <            assertEquals(l.get(i), i);
668 >            assertEquals(i, l.get(i));
669          }
670          q.add(zero);
671          q.add(one);
# Line 737 | Line 674 | public class LinkedTransferQueueTest ext
674          assertTrue(q.contains(one));
675          l.clear();
676          q.drainTo(l);
677 <        assertEquals(q.size(), 0);
678 <        assertEquals(l.size(), 2);
677 >        assertEquals(0, q.size());
678 >        assertEquals(2, l.size());
679          for (int i = 0; i < 2; ++i) {
680 <            assertEquals(l.get(i), i);
680 >            assertEquals(i, l.get(i));
681          }
682      }
683  
684      /**
685 <     * drainTo empties full queue, unblocking a waiting put.
685 >     * drainTo(c) empties full queue, unblocking a waiting put.
686       */
687      public void testDrainToWithActivePut() throws InterruptedException {
688          final LinkedTransferQueue q = populatedQueue(SIZE);
689          Thread t = newStartedThread(new CheckedRunnable() {
690 <            void realRun() {
690 >            public void realRun() {
691                  q.put(SIZE + 1);
692              }});
693          ArrayList l = new ArrayList();
694          q.drainTo(l);
695          assertTrue(l.size() >= SIZE);
696 <        for (int i = 0; i < SIZE; ++i) {
697 <            assertEquals(l.get(i), i);
698 <        }
762 <        t.join();
696 >        for (int i = 0; i < SIZE; ++i)
697 >            assertEquals(i, l.get(i));
698 >        awaitTermination(t);
699          assertTrue(q.size() + l.size() >= SIZE);
700      }
701  
702      /**
703 <     * drainTo(null, n) throws NullPointerException
768 <     */
769 <    public void testDrainToNullN() {
770 <        LinkedTransferQueue q = populatedQueue(SIZE);
771 <        try {
772 <            q.drainTo(null, 0);
773 <            shouldThrow();
774 <        } catch (NullPointerException success) {
775 <        }
776 <    }
777 <
778 <    /**
779 <     * drainTo(this, n) throws IllegalArgumentException
780 <     */
781 <    public void testDrainToSelfN() {
782 <        LinkedTransferQueue q = populatedQueue(SIZE);
783 <        try {
784 <            q.drainTo(q, 0);
785 <            shouldThrow();
786 <        } catch (IllegalArgumentException success) {
787 <        }
788 <    }
789 <
790 <    /**
791 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
703 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
704       */
705      public void testDrainToN() {
706          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 799 | Line 711 | public class LinkedTransferQueueTest ext
711              ArrayList l = new ArrayList();
712              q.drainTo(l, i);
713              int k = (i < SIZE) ? i : SIZE;
714 <            assertEquals(l.size(), k);
715 <            assertEquals(q.size(), SIZE - k);
716 <            for (int j = 0; j < k; ++j) {
717 <                assertEquals(l.get(j), j);
718 <            }
807 <            while (q.poll() != null)
808 <                ;
714 >            assertEquals(k, l.size());
715 >            assertEquals(SIZE - k, q.size());
716 >            for (int j = 0; j < k; ++j)
717 >                assertEquals(j, l.get(j));
718 >            do {} while (q.poll() != null);
719          }
720      }
721  
722      /**
723 <     * poll and take decrement the waiting consumer count
723 >     * timed poll() or take() increments the waiting consumer count;
724 >     * offer(e) decrements the waiting consumer count
725       */
726      public void testWaitingConsumer() throws InterruptedException {
727          final LinkedTransferQueue q = new LinkedTransferQueue();
728 <        final ConsumerObserver waiting = new ConsumerObserver();
728 >        assertEquals(0, q.getWaitingConsumerCount());
729 >        assertFalse(q.hasWaitingConsumer());
730 >        final CountDownLatch threadStarted = new CountDownLatch(1);
731  
732          Thread t = newStartedThread(new CheckedRunnable() {
733 <            void realRun() throws InterruptedException {
734 <                Thread.sleep(SMALL_DELAY_MS);
735 <                threadAssertTrue(q.hasWaitingConsumer());
736 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
737 <                threadAssertTrue(q.offer(new Object()));
733 >            public void realRun() throws InterruptedException {
734 >                threadStarted.countDown();
735 >                long startTime = System.nanoTime();
736 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
737 >                assertEquals(0, q.getWaitingConsumerCount());
738 >                assertFalse(q.hasWaitingConsumer());
739 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
740              }});
741  
742 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
743 <        assertTrue(q.getWaitingConsumerCount()
744 <                   < waiting.getWaitingConsumers());
745 <        t.join();
742 >        threadStarted.await();
743 >        waitForThreadToEnterWaitState(t);
744 >        assertEquals(1, q.getWaitingConsumerCount());
745 >        assertTrue(q.hasWaitingConsumer());
746 >
747 >        assertTrue(q.offer(one));
748 >        assertEquals(0, q.getWaitingConsumerCount());
749 >        assertFalse(q.hasWaitingConsumer());
750 >
751 >        awaitTermination(t);
752      }
753  
754      /**
# Line 838 | Line 759 | public class LinkedTransferQueueTest ext
759              LinkedTransferQueue q = new LinkedTransferQueue();
760              q.transfer(null);
761              shouldThrow();
762 <        } catch (NullPointerException ex) {
842 <        }
762 >        } catch (NullPointerException success) {}
763      }
764  
765      /**
# Line 849 | Line 769 | public class LinkedTransferQueueTest ext
769      public void testTransfer2() throws InterruptedException {
770          final LinkedTransferQueue<Integer> q
771              = new LinkedTransferQueue<Integer>();
772 +        final CountDownLatch threadStarted = new CountDownLatch(1);
773  
774          Thread t = newStartedThread(new CheckedRunnable() {
775 <            void realRun() throws InterruptedException {
776 <                q.transfer(SIZE);
777 <                threadAssertTrue(q.isEmpty());
775 >            public void realRun() throws InterruptedException {
776 >                threadStarted.countDown();
777 >                q.transfer(five);
778 >                checkEmpty(q);
779              }});
780  
781 <        Thread.sleep(SHORT_DELAY_MS);
781 >        threadStarted.await();
782 >        waitForThreadToEnterWaitState(t);
783          assertEquals(1, q.size());
784 <        assertEquals(SIZE, (int) q.poll());
785 <        assertTrue(q.isEmpty());
786 <        t.join();
784 >        assertSame(five, q.poll());
785 >        checkEmpty(q);
786 >        awaitTermination(t);
787      }
788  
789      /**
# Line 871 | Line 794 | public class LinkedTransferQueueTest ext
794              = new LinkedTransferQueue<Integer>();
795  
796          Thread first = newStartedThread(new CheckedRunnable() {
797 <            void realRun() throws InterruptedException {
798 <                Integer i = SIZE + 1;
799 <                q.transfer(i);
800 <                threadAssertTrue(!q.contains(i));
878 <                threadAssertEquals(1, q.size());
797 >            public void realRun() throws InterruptedException {
798 >                q.transfer(four);
799 >                assertTrue(!q.contains(four));
800 >                assertEquals(1, q.size());
801              }});
802  
803          Thread interruptedThread = newStartedThread(
804              new CheckedInterruptedRunnable() {
805 <                void realRun() throws InterruptedException {
806 <                    while (q.size() == 0)
805 >                public void realRun() throws InterruptedException {
806 >                    while (q.isEmpty())
807                          Thread.yield();
808 <                    q.transfer(SIZE);
808 >                    q.transfer(five);
809                  }});
810  
811          while (q.size() < 2)
812              Thread.yield();
813          assertEquals(2, q.size());
814 <        assertEquals(SIZE + 1, (int) q.poll());
814 >        assertSame(four, q.poll());
815          first.join();
816          assertEquals(1, q.size());
817          interruptedThread.interrupt();
818          interruptedThread.join();
819 <        assertEquals(0, q.size());
898 <        assertTrue(q.isEmpty());
819 >        checkEmpty(q);
820      }
821  
822      /**
# Line 906 | Line 827 | public class LinkedTransferQueueTest ext
827          final LinkedTransferQueue q = new LinkedTransferQueue();
828  
829          Thread t = newStartedThread(new CheckedRunnable() {
830 <            void realRun() throws InterruptedException {
830 >            public void realRun() throws InterruptedException {
831                  q.transfer(four);
832 <                threadAssertFalse(q.contains(four));
833 <                threadAssertEquals(three, q.poll());
832 >                assertFalse(q.contains(four));
833 >                assertSame(three, q.poll());
834              }});
835  
836 <        Thread.sleep(SHORT_DELAY_MS);
836 >        while (q.isEmpty())
837 >            Thread.yield();
838 >        assertFalse(q.isEmpty());
839 >        assertEquals(1, q.size());
840          assertTrue(q.offer(three));
841 <        assertEquals(four, q.poll());
842 <        t.join();
841 >        assertSame(four, q.poll());
842 >        awaitTermination(t);
843      }
844  
845      /**
# Line 927 | Line 851 | public class LinkedTransferQueueTest ext
851              = new LinkedTransferQueue<Integer>();
852  
853          Thread t = newStartedThread(new CheckedRunnable() {
854 <            void realRun() throws InterruptedException {
855 <                q.transfer(SIZE);
856 <                threadAssertTrue(q.isEmpty());
854 >            public void realRun() throws InterruptedException {
855 >                q.transfer(four);
856 >                checkEmpty(q);
857              }});
858  
859 <        Thread.sleep(SHORT_DELAY_MS);
860 <        assertEquals(SIZE, (int) q.take());
861 <        assertTrue(q.isEmpty());
862 <        t.join();
859 >        while (q.isEmpty())
860 >            Thread.yield();
861 >        assertFalse(q.isEmpty());
862 >        assertEquals(1, q.size());
863 >        assertSame(four, q.take());
864 >        checkEmpty(q);
865 >        awaitTermination(t);
866      }
867  
868      /**
869       * tryTransfer(null) throws NullPointerException
870       */
871      public void testTryTransfer1() {
872 +        final LinkedTransferQueue q = new LinkedTransferQueue();
873          try {
946            final LinkedTransferQueue q = new LinkedTransferQueue();
874              q.tryTransfer(null);
875              shouldThrow();
876 <        } catch (NullPointerException ex) {
950 <        }
876 >        } catch (NullPointerException success) {}
877      }
878  
879      /**
880       * tryTransfer returns false and does not enqueue if there are no
881       * consumers waiting to poll or take.
882       */
883 <    public void testTryTransfer2() {
883 >    public void testTryTransfer2() throws InterruptedException {
884          final LinkedTransferQueue q = new LinkedTransferQueue();
885          assertFalse(q.tryTransfer(new Object()));
886          assertFalse(q.hasWaitingConsumer());
887 <        assertTrue(q.isEmpty());
962 <        assertEquals(0, q.size());
887 >        checkEmpty(q);
888      }
889  
890      /**
# Line 971 | Line 896 | public class LinkedTransferQueueTest ext
896          final LinkedTransferQueue q = new LinkedTransferQueue();
897  
898          Thread t = newStartedThread(new CheckedRunnable() {
899 <            void realRun() {
899 >            public void realRun() {
900                  while (! q.hasWaitingConsumer())
901                      Thread.yield();
902 <                threadAssertTrue(q.hasWaitingConsumer());
903 <                threadAssertTrue(q.isEmpty());
904 <                threadAssertTrue(q.size() == 0);
980 <                threadAssertTrue(q.tryTransfer(hotPotato));
902 >                assertTrue(q.hasWaitingConsumer());
903 >                checkEmpty(q);
904 >                assertTrue(q.tryTransfer(hotPotato));
905              }});
906  
907 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
908 <        assertTrue(q.isEmpty());
909 <        t.join();
907 >        long startTime = System.nanoTime();
908 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
909 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
910 >        checkEmpty(q);
911 >        awaitTermination(t);
912      }
913  
914      /**
# Line 994 | Line 920 | public class LinkedTransferQueueTest ext
920          final LinkedTransferQueue q = new LinkedTransferQueue();
921  
922          Thread t = newStartedThread(new CheckedRunnable() {
923 <            void realRun() {
923 >            public void realRun() {
924                  while (! q.hasWaitingConsumer())
925                      Thread.yield();
926 <                threadAssertTrue(q.hasWaitingConsumer());
927 <                threadAssertTrue(q.isEmpty());
928 <                threadAssertTrue(q.size() == 0);
1003 <                threadAssertTrue(q.tryTransfer(hotPotato));
926 >                assertTrue(q.hasWaitingConsumer());
927 >                checkEmpty(q);
928 >                assertTrue(q.tryTransfer(hotPotato));
929              }});
930  
931 <        assertTrue(q.take() == hotPotato);
932 <        assertTrue(q.isEmpty());
933 <        t.join();
931 >        assertSame(q.take(), hotPotato);
932 >        checkEmpty(q);
933 >        awaitTermination(t);
934      }
935  
936      /**
937 <     * tryTransfer waits the amount given if interrupted, and
1013 <     * throws interrupted exception
937 >     * tryTransfer blocks interruptibly if no takers
938       */
939      public void testTryTransfer5() throws InterruptedException {
940          final LinkedTransferQueue q = new LinkedTransferQueue();
941 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
942 +        assertTrue(q.isEmpty());
943  
944 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
945 <            void realRun() throws InterruptedException {
946 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
944 >        Thread t = newStartedThread(new CheckedRunnable() {
945 >            public void realRun() throws InterruptedException {
946 >                long startTime = System.nanoTime();
947 >                Thread.currentThread().interrupt();
948 >                try {
949 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
950 >                    shouldThrow();
951 >                } catch (InterruptedException success) {}
952 >                assertFalse(Thread.interrupted());
953 >
954 >                pleaseInterrupt.countDown();
955 >                try {
956 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
957 >                    shouldThrow();
958 >                } catch (InterruptedException success) {}
959 >                assertFalse(Thread.interrupted());
960 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
961              }});
962  
963 <        Thread.sleep(SMALL_DELAY_MS);
964 <        toInterrupt.interrupt();
965 <        toInterrupt.join();
963 >        await(pleaseInterrupt);
964 >        assertThreadStaysAlive(t);
965 >        t.interrupt();
966 >        awaitTermination(t);
967 >        checkEmpty(q);
968      }
969  
970      /**
971 <     * tryTransfer gives up after the timeout and return false
971 >     * tryTransfer gives up after the timeout and returns false
972       */
973      public void testTryTransfer6() throws InterruptedException {
974          final LinkedTransferQueue q = new LinkedTransferQueue();
975  
976          Thread t = newStartedThread(new CheckedRunnable() {
977 <            void realRun() throws InterruptedException {
978 <                threadAssertFalse
979 <                    (q.tryTransfer(new Object(),
980 <                                   SHORT_DELAY_MS, MILLISECONDS));
977 >            public void realRun() throws InterruptedException {
978 >                long startTime = System.nanoTime();
979 >                assertFalse(q.tryTransfer(new Object(),
980 >                                          timeoutMillis(), MILLISECONDS));
981 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
982 >                checkEmpty(q);
983              }});
984  
985 <        Thread.sleep(SMALL_DELAY_MS);
986 <        assertTrue(q.isEmpty());
1043 <        t.join();
985 >        awaitTermination(t);
986 >        checkEmpty(q);
987      }
988  
989      /**
# Line 1052 | Line 995 | public class LinkedTransferQueueTest ext
995          assertTrue(q.offer(four));
996  
997          Thread t = newStartedThread(new CheckedRunnable() {
998 <            void realRun() throws InterruptedException {
999 <                threadAssertTrue(q.tryTransfer(five,
1000 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1001 <                threadAssertTrue(q.isEmpty());
998 >            public void realRun() throws InterruptedException {
999 >                long startTime = System.nanoTime();
1000 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1001 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1002 >                checkEmpty(q);
1003              }});
1004  
1005 <        Thread.sleep(SHORT_DELAY_MS);
1005 >        while (q.size() != 2)
1006 >            Thread.yield();
1007          assertEquals(2, q.size());
1008 <        assertEquals(four, q.poll());
1009 <        assertEquals(five, q.poll());
1010 <        assertTrue(q.isEmpty());
1011 <        t.join();
1008 >        assertSame(four, q.poll());
1009 >        assertSame(five, q.poll());
1010 >        checkEmpty(q);
1011 >        awaitTermination(t);
1012      }
1013  
1014      /**
1015 <     * tryTransfer attempts to enqueue into the q and fails returning
1016 <     * false not enqueueing and the successive poll is null
1015 >     * tryTransfer attempts to enqueue into the queue and fails
1016 >     * returning false not enqueueing and the successive poll is null
1017       */
1018      public void testTryTransfer8() throws InterruptedException {
1019          final LinkedTransferQueue q = new LinkedTransferQueue();
1020          assertTrue(q.offer(four));
1021          assertEquals(1, q.size());
1022 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1022 >        long startTime = System.nanoTime();
1023 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1024 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1025          assertEquals(1, q.size());
1026 <        assertEquals(four, q.poll());
1080 <        threadAssertTrue(q.isEmpty());
1026 >        assertSame(four, q.poll());
1027          assertNull(q.poll());
1028 +        checkEmpty(q);
1029      }
1030  
1031      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1032          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1033 <        assertTrue(q.isEmpty());
1033 >        checkEmpty(q);
1034          for (int i = 0; i < n; i++) {
1035              assertEquals(i, q.size());
1036              assertTrue(q.offer(i));
# Line 1093 | Line 1040 | public class LinkedTransferQueueTest ext
1040          return q;
1041      }
1042  
1043 <    private static class ConsumerObserver {
1044 <
1045 <        private int waitingConsumers;
1046 <
1047 <        private ConsumerObserver() {
1048 <        }
1049 <
1050 <        private void setWaitingConsumer(int i) {
1051 <            this.waitingConsumers = i;
1052 <        }
1053 <
1054 <        private int getWaitingConsumers() {
1108 <            return waitingConsumers;
1043 >    /**
1044 >     * remove(null), contains(null) always return false
1045 >     */
1046 >    public void testNeverContainsNull() {
1047 >        Collection<?>[] qs = {
1048 >            new LinkedTransferQueue<Object>(),
1049 >            populatedQueue(2),
1050 >        };
1051 >
1052 >        for (Collection<?> q : qs) {
1053 >            assertFalse(q.contains(null));
1054 >            assertFalse(q.remove(null));
1055          }
1056      }
1057   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines