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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines