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.12 by jsr166, Sat Aug 15 00:35:01 2009 UTC vs.
Revision 1.82 by jsr166, Sun Aug 11 22:29:27 2019 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.Callable;
19 > import java.util.concurrent.CountDownLatch;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.LinkedTransferQueue;
23 >
24   import junit.framework.Test;
23 import junit.framework.TestSuite;
25  
26   @SuppressWarnings({"unchecked", "rawtypes"})
27   public class LinkedTransferQueueTest extends JSR166TestCase {
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new LinkedTransferQueue();
31 +        }
32 +    }
33  
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run(suite());
35 >        main(suite(), args);
36      }
37  
38      public static Test suite() {
39 <        return new TestSuite(LinkedTransferQueueTest.class);
40 <    }
41 <
42 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
43 <        assertTrue(q.isEmpty());
44 <        assertEquals(0, q.size());
45 <        assertNull(q.peek());
46 <        assertNull(q.poll());
47 <        assertNull(q.poll(0, MILLISECONDS));
48 <        assertEquals(q.toString(), "[]");
43 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
44 <        assertFalse(q.iterator().hasNext());
45 <        try {
46 <            q.element();
47 <            shouldThrow();
48 <        } catch (NoSuchElementException success) {
49 <        }
50 <        try {
51 <            q.iterator().next();
52 <            shouldThrow();
53 <        } catch (NoSuchElementException success) {
54 <        }
55 <        try {
56 <            q.remove();
57 <            shouldThrow();
58 <        } catch (NoSuchElementException success) {
59 <        }
39 >        class Implementation implements CollectionImplementation {
40 >            public Class<?> klazz() { return LinkedTransferQueue.class; }
41 >            public Collection emptyCollection() { return new LinkedTransferQueue(); }
42 >            public Object makeElement(int i) { return i; }
43 >            public boolean isConcurrent() { return true; }
44 >            public boolean permitsNulls() { return false; }
45 >        }
46 >        return newTestSuite(LinkedTransferQueueTest.class,
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
# Line 76 | Line 65 | public class LinkedTransferQueueTest ext
65          try {
66              new LinkedTransferQueue(null);
67              shouldThrow();
68 <        } catch (NullPointerException success) {
80 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
71      /**
# Line 85 | 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];
90 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80 <        } catch (NullPointerException success) {
93 <        }
80 >        } catch (NullPointerException success) {}
81      }
82  
83      /**
# Line 98 | 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];
103 <            for (int i = 0; i < SIZE - 1; ++i) {
104 <                ints[i] = i;
105 <            }
106 <            new LinkedTransferQueue(Arrays.asList(ints));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95 <        } catch (NullPointerException success) {
109 <        }
95 >        } catch (NullPointerException success) {}
96      }
97  
98      /**
# Line 137 | Line 123 | public class LinkedTransferQueueTest ext
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);
150 <        }
151 <    }
152 <
153 <    /**
154 <     * offer(null) throws NullPointerException
155 <     */
156 <    public void testOfferNull() {
157 <        try {
158 <            LinkedTransferQueue q = new LinkedTransferQueue();
159 <            q.offer(null);
160 <            shouldThrow();
161 <        } catch (NullPointerException success) {
162 <        }
163 <    }
164 <
165 <    /**
166 <     * add(null) throws NullPointerException
167 <     */
168 <    public void testAddNull() {
169 <        try {
170 <            LinkedTransferQueue q = new LinkedTransferQueue();
171 <            q.add(null);
172 <            shouldThrow();
173 <        } catch (NullPointerException success) {
174 <        }
175 <    }
176 <
177 <    /**
178 <     * addAll(null) throws NullPointerException
179 <     */
180 <    public void testAddAll1() {
181 <        try {
182 <            LinkedTransferQueue q = new LinkedTransferQueue();
183 <            q.addAll(null);
184 <            shouldThrow();
185 <        } catch (NullPointerException success) {
135 >            assertTrue(q.add(i));
136          }
137      }
138  
# Line 190 | Line 140 | public class LinkedTransferQueueTest ext
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
194            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147 <        } catch (IllegalArgumentException success) {
198 <        }
199 <    }
200 <
201 <    /**
202 <     * addAll of a collection with null elements throws NullPointerException
203 <     */
204 <    public void testAddAll2() {
205 <        try {
206 <            LinkedTransferQueue q = new LinkedTransferQueue();
207 <            Integer[] ints = new Integer[SIZE];
208 <            q.addAll(Arrays.asList(ints));
209 <            shouldThrow();
210 <        } catch (NullPointerException success) {
211 <        }
147 >        } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
# Line 216 | 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 {
220            LinkedTransferQueue q = new LinkedTransferQueue();
221            Integer[] ints = new Integer[SIZE];
222            for (int i = 0; i < SIZE - 1; ++i) {
223                ints[i] = i;
224            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162 <        } catch (NullPointerException success) {
228 <        }
162 >        } catch (NullPointerException success) {}
163      }
164  
165      /**
# Line 246 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
249     * put(null) throws NullPointerException
250     */
251    public void testPutNull() throws InterruptedException {
252        try {
253            LinkedTransferQueue q = new LinkedTransferQueue();
254            q.put(null);
255            shouldThrow();
256        } catch (NullPointerException success) {}
257    }
258
259    /**
183       * all elements successfully put are contained
184       */
185      public void testPut() {
186 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
186 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
187          for (int i = 0; i < SIZE; ++i) {
188 <            assertEquals(q.size(), i);
188 >            assertEquals(i, q.size());
189              q.put(i);
190              assertTrue(q.contains(i));
191          }
# Line 279 | Line 202 | public class LinkedTransferQueueTest ext
202      }
203  
204      /**
205 <     * take blocks interruptibly when empty
283 <     */
284 <    public void testTakeFromEmpty() throws InterruptedException {
285 <        final LinkedTransferQueue q = new LinkedTransferQueue();
286 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
287 <            void realRun() throws InterruptedException {
288 <                q.take();
289 <            }});
290 <        Thread.sleep(SHORT_DELAY_MS);
291 <        t.interrupt();
292 <        t.join();
293 <    }
294 <
295 <    /**
296 <     * 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 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
209 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
210 <            void realRun() throws InterruptedException {
211 <                for (int i = 0; i < SIZE; ++i) {
212 <                    threadAssertEquals(i, (int) q.take());
213 <                }
214 <                q.take();
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++) assertEquals(i, q.take());
213 >
214 >                Thread.currentThread().interrupt();
215 >                try {
216 >                    q.take();
217 >                    shouldThrow();
218 >                } catch (InterruptedException success) {}
219 >                assertFalse(Thread.interrupted());
220 >
221 >                pleaseInterrupt.countDown();
222 >                try {
223 >                    q.take();
224 >                    shouldThrow();
225 >                } catch (InterruptedException success) {}
226 >                assertFalse(Thread.interrupted());
227              }});
228 <        Thread.sleep(SMALL_DELAY_MS);
228 >
229 >        await(pleaseInterrupt);
230 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
231          t.interrupt();
232 <        t.join();
310 <        checkEmpty(q);
232 >        awaitTermination(t);
233      }
234  
235      /**
# Line 323 | Line 245 | public class LinkedTransferQueueTest ext
245      }
246  
247      /**
248 <     * timed pool with zero timeout succeeds when non-empty, else times out
248 >     * timed poll with zero timeout succeeds when non-empty, else times out
249       */
250      public void testTimedPoll0() throws InterruptedException {
251          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 335 | Line 257 | public class LinkedTransferQueueTest ext
257      }
258  
259      /**
260 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
260 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
261       */
262      public void testTimedPoll() throws InterruptedException {
263          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
264 <        for (int i = 0; i < SIZE; ++i) {
265 <            long t0 = System.nanoTime();
264 >        long startTime = System.nanoTime();
265 >        for (int i = 0; i < SIZE; ++i)
266              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
267 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
268 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
269 <        }
270 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
267 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
268 >
269 >        startTime = System.nanoTime();
270 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
271 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
272          checkEmpty(q);
273      }
274  
# Line 354 | Line 277 | public class LinkedTransferQueueTest ext
277       * returning timeout status
278       */
279      public void testInterruptedTimedPoll() throws InterruptedException {
280 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
281 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
282 <            void realRun() throws InterruptedException {
283 <                for (int i = 0; i < SIZE; ++i) {
284 <                    long t0 = System.nanoTime();
285 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
286 <                                                       MILLISECONDS));
287 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
288 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
289 <                }
290 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
280 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
281 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
282 >        Thread t = newStartedThread(new CheckedRunnable() {
283 >            public void realRun() throws InterruptedException {
284 >                long startTime = System.nanoTime();
285 >                for (int i = 0; i < SIZE; i++)
286 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
287 >
288 >                Thread.currentThread().interrupt();
289 >                try {
290 >                    q.poll(randomTimeout(), randomTimeUnit());
291 >                    shouldThrow();
292 >                } catch (InterruptedException success) {}
293 >                assertFalse(Thread.interrupted());
294 >
295 >                pleaseInterrupt.countDown();
296 >                try {
297 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
298 >                    shouldThrow();
299 >                } catch (InterruptedException success) {}
300 >                assertFalse(Thread.interrupted());
301 >
302 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
303              }});
304 <        Thread.sleep(SMALL_DELAY_MS);
304 >
305 >        await(pleaseInterrupt);
306 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
307          t.interrupt();
308 <        t.join();
308 >        awaitTermination(t);
309          checkEmpty(q);
310      }
311  
312      /**
313 <     * timed poll before a delayed offer fails; after offer succeeds;
314 <     * on interruption throws
313 >     * timed poll after thread interrupted throws InterruptedException
314 >     * instead of returning timeout status
315       */
316 <    public void testTimedPollWithOffer() throws InterruptedException {
317 <        final LinkedTransferQueue q = new LinkedTransferQueue();
318 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
319 <            void realRun() throws InterruptedException {
320 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
321 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
322 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
316 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
317 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
318 >        Thread t = newStartedThread(new CheckedRunnable() {
319 >            public void realRun() throws InterruptedException {
320 >                long startTime = System.nanoTime();
321 >                Thread.currentThread().interrupt();
322 >                for (int i = 0; i < SIZE; ++i)
323 >                    assertEquals(i, (int) q.poll(randomTimeout(), randomTimeUnit()));
324 >                try {
325 >                    q.poll(randomTimeout(), randomTimeUnit());
326 >                    shouldThrow();
327 >                } catch (InterruptedException success) {}
328 >                assertFalse(Thread.interrupted());
329 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
330              }});
331 <        Thread.sleep(SMALL_DELAY_MS);
332 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
333 <        t.interrupt();
390 <        t.join();
331 >
332 >        awaitTermination(t);
333 >        checkEmpty(q);
334      }
335  
336      /**
# Line 417 | Line 360 | public class LinkedTransferQueueTest ext
360          try {
361              q.element();
362              shouldThrow();
363 <        } catch (NoSuchElementException success) {
421 <        }
363 >        } catch (NoSuchElementException success) {}
364          checkEmpty(q);
365      }
366  
# Line 433 | Line 375 | public class LinkedTransferQueueTest ext
375          try {
376              q.remove();
377              shouldThrow();
378 <        } catch (NoSuchElementException success) {
437 <        }
438 <        checkEmpty(q);
439 <    }
440 <
441 <    /**
442 <     * remove(x) removes x and returns true if present
443 <     */
444 <    public void testRemoveElement() throws InterruptedException {
445 <        LinkedTransferQueue q = populatedQueue(SIZE);
446 <        for (int i = 1; i < SIZE; i += 2) {
447 <            assertTrue(q.remove(i));
448 <        }
449 <        for (int i = 0; i < SIZE; i += 2) {
450 <            assertTrue(q.remove(i));
451 <            assertFalse(q.remove(i + 1));
452 <        }
378 >        } catch (NoSuchElementException success) {}
379          checkEmpty(q);
380      }
381  
# Line 463 | Line 389 | public class LinkedTransferQueueTest ext
389          assertTrue(q.remove(one));
390          assertTrue(q.remove(two));
391          assertTrue(q.add(three));
392 <        assertTrue(q.take() == three);
392 >        assertSame(q.take(), three);
393      }
394  
395      /**
# Line 499 | Line 425 | public class LinkedTransferQueueTest ext
425       */
426      public void testContainsAll() {
427          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
428 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
428 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
429          for (int i = 0; i < SIZE; ++i) {
430              assertTrue(q.containsAll(p));
431              assertFalse(p.containsAll(q));
# Line 545 | Line 471 | public class LinkedTransferQueueTest ext
471      }
472  
473      /**
474 <     * toArray contains all elements
474 >     * toArray() contains all elements in FIFO order
475       */
476 <    public void testToArray() throws InterruptedException {
476 >    public void testToArray() {
477          LinkedTransferQueue q = populatedQueue(SIZE);
478 <        Object[] o = q.toArray();
479 <        for (int i = 0; i < o.length; i++) {
480 <            assertEquals(o[i], q.take());
481 <        }
478 >        Object[] a = q.toArray();
479 >        assertSame(Object[].class, a.getClass());
480 >        for (Object o : a)
481 >            assertSame(o, q.poll());
482 >        assertTrue(q.isEmpty());
483      }
484  
485      /**
486 <     * toArray(a) contains all elements
486 >     * toArray(a) contains all elements in FIFO order
487       */
488 <    public void testToArray2() throws InterruptedException {
488 >    public void testToArray2() {
489          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
490          Integer[] ints = new Integer[SIZE];
491 <        ints = q.toArray(ints);
492 <        for (int i = 0; i < ints.length; i++) {
493 <            assertEquals(ints[i], q.take());
494 <        }
495 <    }
569 <
570 <    /**
571 <     * toArray(null) throws NullPointerException
572 <     */
573 <    public void testToArray_BadArg() {
574 <        try {
575 <            LinkedTransferQueue q = populatedQueue(SIZE);
576 <            Object o[] = q.toArray(null);
577 <            shouldThrow();
578 <        } catch (NullPointerException success) {
579 <        }
491 >        Integer[] array = q.toArray(ints);
492 >        assertSame(ints, array);
493 >        for (Integer o : ints)
494 >            assertSame(o, q.poll());
495 >        assertTrue(q.isEmpty());
496      }
497  
498      /**
499 <     * toArray with incompatible array type throws CCE
499 >     * toArray(incompatible array type) throws ArrayStoreException
500       */
501      public void testToArray1_BadArg() {
502 +        LinkedTransferQueue q = populatedQueue(SIZE);
503          try {
504 <            LinkedTransferQueue q = populatedQueue(SIZE);
588 <            Object o[] = q.toArray(new String[10]);
504 >            q.toArray(new String[10]);
505              shouldThrow();
506 <        } catch (ArrayStoreException success) {
591 <        }
506 >        } catch (ArrayStoreException success) {}
507      }
508  
509      /**
# Line 597 | Line 512 | public class LinkedTransferQueueTest ext
512      public void testIterator() throws InterruptedException {
513          LinkedTransferQueue q = populatedQueue(SIZE);
514          Iterator it = q.iterator();
515 <        int i = 0;
516 <        while (it.hasNext()) {
517 <            assertEquals(it.next(), i++);
603 <        }
515 >        int i;
516 >        for (i = 0; it.hasNext(); i++)
517 >            assertTrue(q.contains(it.next()));
518          assertEquals(i, SIZE);
519 +        assertIteratorExhausted(it);
520 +
521 +        it = q.iterator();
522 +        for (i = 0; it.hasNext(); i++)
523 +            assertEquals(it.next(), q.take());
524 +        assertEquals(i, SIZE);
525 +        assertIteratorExhausted(it);
526 +    }
527 +
528 +    /**
529 +     * iterator of empty collection has no elements
530 +     */
531 +    public void testEmptyIterator() {
532 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
533      }
534  
535      /**
# Line 618 | Line 546 | public class LinkedTransferQueueTest ext
546          it.remove();
547  
548          it = q.iterator();
549 <        assertEquals(it.next(), one);
550 <        assertEquals(it.next(), three);
549 >        assertSame(it.next(), one);
550 >        assertSame(it.next(), three);
551          assertFalse(it.hasNext());
552      }
553  
# Line 627 | Line 555 | public class LinkedTransferQueueTest ext
555       * iterator ordering is FIFO
556       */
557      public void testIteratorOrdering() {
558 <        final LinkedTransferQueue<Integer> q
631 <            = new LinkedTransferQueue<Integer>();
558 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
559          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
560          q.add(one);
561          q.add(two);
# Line 663 | Line 590 | public class LinkedTransferQueueTest ext
590          LinkedTransferQueue q = populatedQueue(SIZE);
591          String s = q.toString();
592          for (int i = 0; i < SIZE; ++i) {
593 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
593 >            assertTrue(s.contains(String.valueOf(i)));
594          }
595      }
596  
# Line 672 | Line 599 | public class LinkedTransferQueueTest ext
599       */
600      public void testOfferInExecutor() {
601          final LinkedTransferQueue q = new LinkedTransferQueue();
602 <        q.add(one);
603 <        q.add(two);
604 <        ExecutorService executor = Executors.newFixedThreadPool(2);
605 <
606 <        executor.execute(new CheckedRunnable() {
607 <            void realRun() {
608 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
609 <                                         MILLISECONDS));
610 <            }});
611 <
612 <        executor.execute(new CheckedRunnable() {
686 <            void realRun() throws InterruptedException {
687 <                Thread.sleep(SMALL_DELAY_MS);
688 <                threadAssertEquals(one, q.take());
689 <            }});
602 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
604 >        try (PoolCleaner cleaner = cleaner(executor)) {
605 >
606 >            executor.execute(new CheckedRunnable() {
607 >                public void realRun() throws InterruptedException {
608 >                    threadsStarted.await();
609 >                    long startTime = System.nanoTime();
610 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
611 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
612 >                }});
613  
614 <        joinPool(executor);
614 >            executor.execute(new CheckedRunnable() {
615 >                public void realRun() throws InterruptedException {
616 >                    threadsStarted.await();
617 >                    assertSame(one, q.take());
618 >                    checkEmpty(q);
619 >                }});
620 >        }
621      }
622  
623      /**
624 <     * poll retrieves elements across Executor threads
624 >     * timed poll retrieves elements across Executor threads
625       */
626      public void testPollInExecutor() {
627          final LinkedTransferQueue q = new LinkedTransferQueue();
628 <        ExecutorService executor = Executors.newFixedThreadPool(2);
629 <
630 <        executor.execute(new CheckedRunnable() {
631 <            void realRun() throws InterruptedException {
632 <                threadAssertNull(q.poll());
633 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
634 <                                                MILLISECONDS));
635 <                threadAssertTrue(q.isEmpty());
636 <            }});
637 <
638 <        executor.execute(new CheckedRunnable() {
639 <            void realRun() throws InterruptedException {
640 <                Thread.sleep(SMALL_DELAY_MS);
712 <                q.put(one);
713 <            }});
714 <
715 <        joinPool(executor);
716 <    }
717 <
718 <    /**
719 <     * A deserialized serialized queue has same elements in same order
720 <     */
721 <    public void testSerialization() throws Exception {
722 <        LinkedTransferQueue q = populatedQueue(SIZE);
723 <
724 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
725 <        ObjectOutputStream out
726 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
727 <        out.writeObject(q);
728 <        out.close();
729 <
730 <        ByteArrayInputStream bin
731 <            = new ByteArrayInputStream(bout.toByteArray());
732 <        ObjectInputStream in
733 <            = new ObjectInputStream(new BufferedInputStream(bin));
734 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
628 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
629 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
630 >        try (PoolCleaner cleaner = cleaner(executor)) {
631 >
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    assertNull(q.poll());
635 >                    threadsStarted.await();
636 >                    long startTime = System.nanoTime();
637 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
638 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
639 >                    checkEmpty(q);
640 >                }});
641  
642 <        assertEquals(q.size(), r.size());
643 <        while (!q.isEmpty()) {
644 <            assertEquals(q.remove(), r.remove());
642 >            executor.execute(new CheckedRunnable() {
643 >                public void realRun() throws InterruptedException {
644 >                    threadsStarted.await();
645 >                    q.put(one);
646 >                }});
647          }
648      }
649  
650      /**
651 <     * drainTo(null) throws NullPointerException
651 >     * A deserialized/reserialized queue has same elements in same order
652       */
653 <    public void testDrainToNull() {
654 <        LinkedTransferQueue q = populatedQueue(SIZE);
655 <        try {
748 <            q.drainTo(null);
749 <            shouldThrow();
750 <        } catch (NullPointerException success) {
751 <        }
752 <    }
653 >    public void testSerialization() throws Exception {
654 >        Queue x = populatedQueue(SIZE);
655 >        Queue y = serialClone(x);
656  
657 <    /**
658 <     * drainTo(this) throws IllegalArgumentException
659 <     */
660 <    public void testDrainToSelf() {
661 <        LinkedTransferQueue q = populatedQueue(SIZE);
662 <        try {
663 <            q.drainTo(q);
761 <            shouldThrow();
762 <        } catch (IllegalArgumentException success) {
657 >        assertNotSame(y, x);
658 >        assertEquals(x.size(), y.size());
659 >        assertEquals(x.toString(), y.toString());
660 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
661 >        while (!x.isEmpty()) {
662 >            assertFalse(y.isEmpty());
663 >            assertEquals(x.remove(), y.remove());
664          }
665 +        assertTrue(y.isEmpty());
666      }
667  
668      /**
# Line 770 | Line 672 | public class LinkedTransferQueueTest ext
672          LinkedTransferQueue q = populatedQueue(SIZE);
673          ArrayList l = new ArrayList();
674          q.drainTo(l);
675 <        assertEquals(q.size(), 0);
676 <        assertEquals(l.size(), SIZE);
675 >        assertEquals(0, q.size());
676 >        assertEquals(SIZE, l.size());
677          for (int i = 0; i < SIZE; ++i) {
678 <            assertEquals(l.get(i), i);
678 >            assertEquals(i, l.get(i));
679          }
680          q.add(zero);
681          q.add(one);
# Line 782 | Line 684 | public class LinkedTransferQueueTest ext
684          assertTrue(q.contains(one));
685          l.clear();
686          q.drainTo(l);
687 <        assertEquals(q.size(), 0);
688 <        assertEquals(l.size(), 2);
687 >        assertEquals(0, q.size());
688 >        assertEquals(2, l.size());
689          for (int i = 0; i < 2; ++i) {
690 <            assertEquals(l.get(i), i);
690 >            assertEquals(i, l.get(i));
691          }
692      }
693  
694      /**
695 <     * drainTo empties full queue, unblocking a waiting put.
695 >     * drainTo(c) empties full queue, unblocking a waiting put.
696       */
697      public void testDrainToWithActivePut() throws InterruptedException {
698          final LinkedTransferQueue q = populatedQueue(SIZE);
699          Thread t = newStartedThread(new CheckedRunnable() {
700 <            void realRun() {
700 >            public void realRun() {
701                  q.put(SIZE + 1);
702              }});
703          ArrayList l = new ArrayList();
704          q.drainTo(l);
705          assertTrue(l.size() >= SIZE);
706 <        for (int i = 0; i < SIZE; ++i) {
707 <            assertEquals(l.get(i), i);
708 <        }
807 <        t.join();
706 >        for (int i = 0; i < SIZE; ++i)
707 >            assertEquals(i, l.get(i));
708 >        awaitTermination(t);
709          assertTrue(q.size() + l.size() >= SIZE);
710      }
711  
712      /**
713 <     * drainTo(null, n) throws NullPointerException
813 <     */
814 <    public void testDrainToNullN() {
815 <        LinkedTransferQueue q = populatedQueue(SIZE);
816 <        try {
817 <            q.drainTo(null, SIZE);
818 <            shouldThrow();
819 <        } catch (NullPointerException success) {
820 <        }
821 <    }
822 <
823 <    /**
824 <     * drainTo(this, n) throws IllegalArgumentException
825 <     */
826 <    public void testDrainToSelfN() {
827 <        LinkedTransferQueue q = populatedQueue(SIZE);
828 <        try {
829 <            q.drainTo(q, SIZE);
830 <            shouldThrow();
831 <        } catch (IllegalArgumentException success) {
832 <        }
833 <    }
834 <
835 <    /**
836 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
713 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
714       */
715      public void testDrainToN() {
716          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 844 | Line 721 | public class LinkedTransferQueueTest ext
721              ArrayList l = new ArrayList();
722              q.drainTo(l, i);
723              int k = (i < SIZE) ? i : SIZE;
724 <            assertEquals(l.size(), k);
725 <            assertEquals(q.size(), SIZE - k);
726 <            for (int j = 0; j < k; ++j) {
727 <                assertEquals(l.get(j), j);
728 <            }
852 <            while (q.poll() != null)
853 <                ;
724 >            assertEquals(k, l.size());
725 >            assertEquals(SIZE - k, q.size());
726 >            for (int j = 0; j < k; ++j)
727 >                assertEquals(j, l.get(j));
728 >            do {} while (q.poll() != null);
729          }
730      }
731  
732      /**
733 <     * poll and take decrement the waiting consumer count
733 >     * timed poll() or take() increments the waiting consumer count;
734 >     * offer(e) decrements the waiting consumer count
735       */
736      public void testWaitingConsumer() throws InterruptedException {
737          final LinkedTransferQueue q = new LinkedTransferQueue();
738 <        final ConsumerObserver waiting = new ConsumerObserver();
738 >        assertEquals(0, q.getWaitingConsumerCount());
739 >        assertFalse(q.hasWaitingConsumer());
740 >        final CountDownLatch threadStarted = new CountDownLatch(1);
741  
742          Thread t = newStartedThread(new CheckedRunnable() {
743 <            void realRun() throws InterruptedException {
744 <                Thread.sleep(SMALL_DELAY_MS);
745 <                threadAssertTrue(q.hasWaitingConsumer());
746 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
747 <                threadAssertTrue(q.offer(new Object()));
743 >            public void realRun() throws InterruptedException {
744 >                threadStarted.countDown();
745 >                long startTime = System.nanoTime();
746 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
747 >                assertEquals(0, q.getWaitingConsumerCount());
748 >                assertFalse(q.hasWaitingConsumer());
749 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
750              }});
751  
752 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
753 <        assertTrue(q.getWaitingConsumerCount()
754 <                   < waiting.getWaitingConsumers());
755 <        t.join();
752 >        threadStarted.await();
753 >        Callable<Boolean> oneConsumer
754 >            = new Callable<Boolean>() { public Boolean call() {
755 >                return q.hasWaitingConsumer()
756 >                && q.getWaitingConsumerCount() == 1; }};
757 >        waitForThreadToEnterWaitState(t, oneConsumer);
758 >
759 >        assertTrue(q.offer(one));
760 >        assertEquals(0, q.getWaitingConsumerCount());
761 >        assertFalse(q.hasWaitingConsumer());
762 >
763 >        awaitTermination(t);
764      }
765  
766      /**
# Line 883 | Line 771 | public class LinkedTransferQueueTest ext
771              LinkedTransferQueue q = new LinkedTransferQueue();
772              q.transfer(null);
773              shouldThrow();
774 <        } catch (NullPointerException ex) {
887 <        }
774 >        } catch (NullPointerException success) {}
775      }
776  
777      /**
778 <     * transfer waits until a poll occurs. The transfered element
779 <     * is returned by this associated poll.
778 >     * transfer waits until a poll occurs. The transferred element
779 >     * is returned by the associated poll.
780       */
781      public void testTransfer2() throws InterruptedException {
782 <        final LinkedTransferQueue<Integer> q
783 <            = new LinkedTransferQueue<Integer>();
782 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
783 >        final CountDownLatch threadStarted = new CountDownLatch(1);
784  
785          Thread t = newStartedThread(new CheckedRunnable() {
786 <            void realRun() throws InterruptedException {
787 <                q.transfer(SIZE);
788 <                threadAssertTrue(q.isEmpty());
786 >            public void realRun() throws InterruptedException {
787 >                threadStarted.countDown();
788 >                q.transfer(five);
789 >                checkEmpty(q);
790              }});
791  
792 <        Thread.sleep(SHORT_DELAY_MS);
793 <        assertEquals(1, q.size());
794 <        assertEquals(SIZE, (int) q.poll());
795 <        assertTrue(q.isEmpty());
796 <        t.join();
792 >        threadStarted.await();
793 >        Callable<Boolean> oneElement
794 >            = new Callable<Boolean>() { public Boolean call() {
795 >                return !q.isEmpty() && q.size() == 1; }};
796 >        waitForThreadToEnterWaitState(t, oneElement);
797 >
798 >        assertSame(five, q.poll());
799 >        checkEmpty(q);
800 >        awaitTermination(t);
801      }
802  
803      /**
804       * transfer waits until a poll occurs, and then transfers in fifo order
805       */
806      public void testTransfer3() throws InterruptedException {
807 <        final LinkedTransferQueue<Integer> q
916 <            = new LinkedTransferQueue<Integer>();
807 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
808  
809          Thread first = newStartedThread(new CheckedRunnable() {
810 <            void realRun() throws InterruptedException {
811 <                Integer i = SIZE + 1;
812 <                q.transfer(i);
813 <                threadAssertTrue(!q.contains(i));
923 <                threadAssertEquals(1, q.size());
810 >            public void realRun() throws InterruptedException {
811 >                q.transfer(four);
812 >                assertFalse(q.contains(four));
813 >                assertEquals(1, q.size());
814              }});
815  
816          Thread interruptedThread = newStartedThread(
817              new CheckedInterruptedRunnable() {
818 <                void realRun() throws InterruptedException {
819 <                    while (q.size() == 0)
818 >                public void realRun() throws InterruptedException {
819 >                    while (q.isEmpty())
820                          Thread.yield();
821 <                    q.transfer(SIZE);
821 >                    q.transfer(five);
822                  }});
823  
824          while (q.size() < 2)
825              Thread.yield();
826          assertEquals(2, q.size());
827 <        assertEquals(SIZE + 1, (int) q.poll());
827 >        assertSame(four, q.poll());
828          first.join();
829          assertEquals(1, q.size());
830          interruptedThread.interrupt();
831          interruptedThread.join();
832 <        assertEquals(0, q.size());
943 <        assertTrue(q.isEmpty());
832 >        checkEmpty(q);
833      }
834  
835      /**
# Line 951 | Line 840 | public class LinkedTransferQueueTest ext
840          final LinkedTransferQueue q = new LinkedTransferQueue();
841  
842          Thread t = newStartedThread(new CheckedRunnable() {
843 <            void realRun() throws InterruptedException {
843 >            public void realRun() throws InterruptedException {
844                  q.transfer(four);
845 <                threadAssertFalse(q.contains(four));
846 <                threadAssertEquals(three, q.poll());
845 >                assertFalse(q.contains(four));
846 >                assertSame(three, q.poll());
847              }});
848  
849 <        Thread.sleep(SHORT_DELAY_MS);
849 >        while (q.isEmpty())
850 >            Thread.yield();
851 >        assertFalse(q.isEmpty());
852 >        assertEquals(1, q.size());
853          assertTrue(q.offer(three));
854 <        assertEquals(four, q.poll());
855 <        t.join();
854 >        assertSame(four, q.poll());
855 >        awaitTermination(t);
856      }
857  
858      /**
859 <     * transfer waits until a take occurs. The transfered element
860 <     * is returned by this associated take.
859 >     * transfer waits until a take occurs. The transferred element
860 >     * is returned by the associated take.
861       */
862      public void testTransfer5() throws InterruptedException {
863 <        final LinkedTransferQueue<Integer> q
972 <            = new LinkedTransferQueue<Integer>();
863 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
864  
865          Thread t = newStartedThread(new CheckedRunnable() {
866 <            void realRun() throws InterruptedException {
867 <                q.transfer(SIZE);
866 >            public void realRun() throws InterruptedException {
867 >                q.transfer(four);
868                  checkEmpty(q);
869              }});
870  
871 <        Thread.sleep(SHORT_DELAY_MS);
872 <        assertEquals(SIZE, (int) q.take());
871 >        while (q.isEmpty())
872 >            Thread.yield();
873 >        assertFalse(q.isEmpty());
874 >        assertEquals(1, q.size());
875 >        assertSame(four, q.take());
876          checkEmpty(q);
877 <        t.join();
877 >        awaitTermination(t);
878      }
879  
880      /**
881       * tryTransfer(null) throws NullPointerException
882       */
883      public void testTryTransfer1() {
884 +        final LinkedTransferQueue q = new LinkedTransferQueue();
885          try {
991            final LinkedTransferQueue q = new LinkedTransferQueue();
886              q.tryTransfer(null);
887              shouldThrow();
888 <        } catch (NullPointerException ex) {
995 <        }
888 >        } catch (NullPointerException success) {}
889      }
890  
891      /**
# Line 1015 | Line 908 | public class LinkedTransferQueueTest ext
908          final LinkedTransferQueue q = new LinkedTransferQueue();
909  
910          Thread t = newStartedThread(new CheckedRunnable() {
911 <            void realRun() {
911 >            public void realRun() {
912                  while (! q.hasWaitingConsumer())
913                      Thread.yield();
914 <                threadAssertTrue(q.hasWaitingConsumer());
915 <                threadAssertTrue(q.isEmpty());
916 <                threadAssertTrue(q.size() == 0);
1024 <                threadAssertTrue(q.tryTransfer(hotPotato));
914 >                assertTrue(q.hasWaitingConsumer());
915 >                checkEmpty(q);
916 >                assertTrue(q.tryTransfer(hotPotato));
917              }});
918  
919 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
919 >        long startTime = System.nanoTime();
920 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
921 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
922          checkEmpty(q);
923 <        t.join();
923 >        awaitTermination(t);
924      }
925  
926      /**
# Line 1038 | Line 932 | public class LinkedTransferQueueTest ext
932          final LinkedTransferQueue q = new LinkedTransferQueue();
933  
934          Thread t = newStartedThread(new CheckedRunnable() {
935 <            void realRun() {
935 >            public void realRun() {
936                  while (! q.hasWaitingConsumer())
937                      Thread.yield();
938 <                threadAssertTrue(q.hasWaitingConsumer());
939 <                threadAssertTrue(q.isEmpty());
940 <                threadAssertTrue(q.size() == 0);
1047 <                threadAssertTrue(q.tryTransfer(hotPotato));
938 >                assertTrue(q.hasWaitingConsumer());
939 >                checkEmpty(q);
940 >                assertTrue(q.tryTransfer(hotPotato));
941              }});
942  
943 <        assertTrue(q.take() == hotPotato);
943 >        assertSame(q.take(), hotPotato);
944          checkEmpty(q);
945 <        t.join();
945 >        awaitTermination(t);
946      }
947  
948      /**
949 <     * tryTransfer waits the amount given if interrupted, and
1057 <     * throws interrupted exception
949 >     * tryTransfer blocks interruptibly if no takers
950       */
951      public void testTryTransfer5() throws InterruptedException {
952          final LinkedTransferQueue q = new LinkedTransferQueue();
953 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
954 +        assertTrue(q.isEmpty());
955  
956 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
957 <            void realRun() throws InterruptedException {
958 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
956 >        Thread t = newStartedThread(new CheckedRunnable() {
957 >            public void realRun() throws InterruptedException {
958 >                long startTime = System.nanoTime();
959 >                Thread.currentThread().interrupt();
960 >                try {
961 >                    q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit());
962 >                    shouldThrow();
963 >                } catch (InterruptedException success) {}
964 >                assertFalse(Thread.interrupted());
965 >
966 >                pleaseInterrupt.countDown();
967 >                try {
968 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
969 >                    shouldThrow();
970 >                } catch (InterruptedException success) {}
971 >                assertFalse(Thread.interrupted());
972 >
973 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
974              }});
975  
976 <        Thread.sleep(SMALL_DELAY_MS);
977 <        toInterrupt.interrupt();
978 <        toInterrupt.join();
976 >        await(pleaseInterrupt);
977 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
978 >        t.interrupt();
979 >        awaitTermination(t);
980 >        checkEmpty(q);
981      }
982  
983      /**
984 <     * tryTransfer gives up after the timeout and return false
984 >     * tryTransfer gives up after the timeout and returns false
985       */
986      public void testTryTransfer6() throws InterruptedException {
987          final LinkedTransferQueue q = new LinkedTransferQueue();
988  
989          Thread t = newStartedThread(new CheckedRunnable() {
990 <            void realRun() throws InterruptedException {
991 <                threadAssertFalse
992 <                    (q.tryTransfer(new Object(),
993 <                                   SHORT_DELAY_MS, MILLISECONDS));
990 >            public void realRun() throws InterruptedException {
991 >                long startTime = System.nanoTime();
992 >                assertFalse(q.tryTransfer(new Object(),
993 >                                          timeoutMillis(), MILLISECONDS));
994 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
995 >                checkEmpty(q);
996              }});
997  
998 <        Thread.sleep(SMALL_DELAY_MS);
998 >        awaitTermination(t);
999          checkEmpty(q);
1087        t.join();
1000      }
1001  
1002      /**
# Line 1096 | Line 1008 | public class LinkedTransferQueueTest ext
1008          assertTrue(q.offer(four));
1009  
1010          Thread t = newStartedThread(new CheckedRunnable() {
1011 <            void realRun() throws InterruptedException {
1012 <                threadAssertTrue(q.tryTransfer(five,
1013 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1014 <                threadAssertTrue(q.isEmpty());
1011 >            public void realRun() throws InterruptedException {
1012 >                long startTime = System.nanoTime();
1013 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1014 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1015 >                checkEmpty(q);
1016              }});
1017  
1018 <        Thread.sleep(SHORT_DELAY_MS);
1018 >        while (q.size() != 2)
1019 >            Thread.yield();
1020          assertEquals(2, q.size());
1021 <        assertEquals(four, q.poll());
1022 <        assertEquals(five, q.poll());
1021 >        assertSame(four, q.poll());
1022 >        assertSame(five, q.poll());
1023          checkEmpty(q);
1024 <        t.join();
1024 >        awaitTermination(t);
1025      }
1026  
1027      /**
1028 <     * tryTransfer attempts to enqueue into the q and fails returning
1029 <     * false not enqueueing and the successive poll is null
1028 >     * tryTransfer attempts to enqueue into the queue and fails
1029 >     * returning false not enqueueing and the successive poll is null
1030       */
1031      public void testTryTransfer8() throws InterruptedException {
1032          final LinkedTransferQueue q = new LinkedTransferQueue();
1033          assertTrue(q.offer(four));
1034          assertEquals(1, q.size());
1035 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1035 >        long startTime = System.nanoTime();
1036 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1037 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1038          assertEquals(1, q.size());
1039 <        assertEquals(four, q.poll());
1124 <        checkEmpty(q);
1039 >        assertSame(four, q.poll());
1040          assertNull(q.poll());
1041 +        checkEmpty(q);
1042      }
1043  
1044      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1045 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1046 <        assertTrue(q.isEmpty());
1045 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1046 >        checkEmpty(q);
1047          for (int i = 0; i < n; i++) {
1048              assertEquals(i, q.size());
1049              assertTrue(q.offer(i));
# Line 1137 | Line 1053 | public class LinkedTransferQueueTest ext
1053          return q;
1054      }
1055  
1056 <    private static class ConsumerObserver {
1057 <
1058 <        private int waitingConsumers;
1059 <
1060 <        private ConsumerObserver() {
1061 <        }
1062 <
1063 <        private void setWaitingConsumer(int i) {
1064 <            this.waitingConsumers = i;
1065 <        }
1066 <
1067 <        private int getWaitingConsumers() {
1152 <            return waitingConsumers;
1056 >    /**
1057 >     * remove(null), contains(null) always return false
1058 >     */
1059 >    public void testNeverContainsNull() {
1060 >        Collection<?>[] qs = {
1061 >            new LinkedTransferQueue<Object>(),
1062 >            populatedQueue(2),
1063 >        };
1064 >
1065 >        for (Collection<?> q : qs) {
1066 >            assertFalse(q.contains(null));
1067 >            assertFalse(q.remove(null));
1068          }
1069      }
1070   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines