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.11 by jsr166, Wed Aug 12 02:15:04 2009 UTC vs.
Revision 1.77 by jsr166, Sun May 14 00:56:43 2017 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;
22 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);
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 49 | Line 65 | public class LinkedTransferQueueTest ext
65          try {
66              new LinkedTransferQueue(null);
67              shouldThrow();
68 <        } catch (NullPointerException success) {
53 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
71      /**
# Line 58 | 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];
63 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80 <        } catch (NullPointerException success) {
66 <        }
80 >        } catch (NullPointerException success) {}
81      }
82  
83      /**
# Line 71 | 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];
76 <            for (int i = 0; i < SIZE - 1; ++i) {
77 <                ints[i] = i;
78 <            }
79 <            new LinkedTransferQueue(Arrays.asList(ints));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95 <        } catch (NullPointerException success) {
82 <        }
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);
117 <        }
118 <    }
119 <
120 <    /**
121 <     * offer(null) throws NullPointerException
122 <     */
123 <    public void testOfferNull() {
124 <        try {
125 <            LinkedTransferQueue q = new LinkedTransferQueue();
126 <            q.offer(null);
127 <            shouldThrow();
128 <        } catch (NullPointerException success) {
129 <        }
130 <    }
131 <
132 <    /**
133 <     * add(null) throws NullPointerException
134 <     */
135 <    public void testAddNull() {
136 <        try {
137 <            LinkedTransferQueue q = new LinkedTransferQueue();
138 <            q.add(null);
139 <            shouldThrow();
140 <        } catch (NullPointerException success) {
141 <        }
142 <    }
143 <
144 <    /**
145 <     * addAll(null) throws NullPointerException
146 <     */
147 <    public void testAddAll1() {
148 <        try {
149 <            LinkedTransferQueue q = new LinkedTransferQueue();
150 <            q.addAll(null);
151 <            shouldThrow();
152 <        } catch (NullPointerException success) {
135 >            assertTrue(q.add(i));
136          }
137      }
138  
# Line 157 | Line 140 | public class LinkedTransferQueueTest ext
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
161            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147 <        } catch (IllegalArgumentException success) {
165 <        }
166 <    }
167 <
168 <    /**
169 <     * addAll of a collection with null elements throws NullPointerException
170 <     */
171 <    public void testAddAll2() {
172 <        try {
173 <            LinkedTransferQueue q = new LinkedTransferQueue();
174 <            Integer[] ints = new Integer[SIZE];
175 <            q.addAll(Arrays.asList(ints));
176 <            shouldThrow();
177 <        } catch (NullPointerException success) {
178 <        }
147 >        } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
# Line 183 | 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 {
187            LinkedTransferQueue q = new LinkedTransferQueue();
188            Integer[] ints = new Integer[SIZE];
189            for (int i = 0; i < SIZE - 1; ++i) {
190                ints[i] = i;
191            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162 <        } catch (NullPointerException success) {
195 <        }
162 >        } catch (NullPointerException success) {}
163      }
164  
165      /**
# Line 213 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
216     * put(null) throws NullPointerException
217     */
218    public void testPutNull() throws InterruptedException {
219        try {
220            LinkedTransferQueue q = new LinkedTransferQueue();
221            q.put(null);
222            shouldThrow();
223        } catch (NullPointerException success) {}
224    }
225
226    /**
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(i, q.size());
189              q.put(i);
190              assertTrue(q.contains(i));
191          }
235        assertEquals(q.size(), SIZE);
192      }
193  
194      /**
# Line 246 | Line 202 | public class LinkedTransferQueueTest ext
202      }
203  
204      /**
205 <     * take blocks interruptibly when empty
250 <     */
251 <    public void testTakeFromEmpty() throws InterruptedException {
252 <        final LinkedTransferQueue q = new LinkedTransferQueue();
253 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
254 <            void realRun() throws InterruptedException {
255 <                q.take();
256 <            }});
257 <        Thread.sleep(SHORT_DELAY_MS);
258 <        t.interrupt();
259 <        t.join();
260 <    }
261 <
262 <    /**
263 <     * Take removes existing elements until empty, then blocks interruptibly
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);
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(SHORT_DELAY_MS);
228 >
229 >        await(pleaseInterrupt);
230 >        assertThreadBlocks(t, Thread.State.WAITING);
231          t.interrupt();
232 <        t.join();
232 >        awaitTermination(t);
233      }
234  
235      /**
236       * poll succeeds unless empty
237       */
238 <    public void testPoll() {
238 >    public void testPoll() throws InterruptedException {
239          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
240          for (int i = 0; i < SIZE; ++i) {
241              assertEquals(i, (int) q.poll());
242          }
243          assertNull(q.poll());
244 +        checkEmpty(q);
245      }
246  
247      /**
248 <     * timed pool with zero timeout succeeds when non-empty, else times out
248 >     * timed poll with zero timeout succeeds when non-empty, else times out
249       */
250      public void testTimedPoll0() throws InterruptedException {
251          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 296 | Line 253 | public class LinkedTransferQueueTest ext
253              assertEquals(i, (int) q.poll(0, MILLISECONDS));
254          }
255          assertNull(q.poll(0, MILLISECONDS));
256 +        checkEmpty(q);
257      }
258  
259      /**
260 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
260 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
261       */
262      public void testTimedPoll() throws InterruptedException {
263          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
264 <        for (int i = 0; i < SIZE; ++i) {
265 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
266 <        }
267 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
264 >        long startTime = System.nanoTime();
265 >        for (int i = 0; i < SIZE; ++i)
266 >            assertEquals(i, (int) q.poll(LONG_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  
275      /**
# Line 314 | 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 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
285 <                                                       MILLISECONDS));
286 <                }
287 <                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 >                pleaseInterrupt.countDown();
289 >                try {
290 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
291 >                    shouldThrow();
292 >                } catch (InterruptedException success) {}
293 >                assertFalse(Thread.interrupted());
294 >
295 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296              }});
297 <        Thread.sleep(SMALL_DELAY_MS);
297 >
298 >        await(pleaseInterrupt);
299 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
300          t.interrupt();
301 <        t.join();
302 <        assertEquals(q.size(), 0);
330 <        assertNull(q.poll());
301 >        awaitTermination(t);
302 >        checkEmpty(q);
303      }
304  
305      /**
306 <     * timed poll before a delayed offer fails; after offer succeeds;
307 <     * on interruption throws
306 >     * timed poll after thread interrupted throws InterruptedException
307 >     * instead of returning timeout status
308       */
309 <    public void testTimedPollWithOffer() throws InterruptedException {
310 <        final LinkedTransferQueue q = new LinkedTransferQueue();
311 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
312 <            void realRun() throws InterruptedException {
313 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
314 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
315 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
309 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
310 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
311 >        Thread t = newStartedThread(new CheckedRunnable() {
312 >            public void realRun() throws InterruptedException {
313 >                long startTime = System.nanoTime();
314 >                Thread.currentThread().interrupt();
315 >                for (int i = 0; i < SIZE; ++i)
316 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
317 >                try {
318 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
319 >                    shouldThrow();
320 >                } catch (InterruptedException success) {}
321 >                assertFalse(Thread.interrupted());
322 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
323              }});
324 <        Thread.sleep(SMALL_DELAY_MS);
325 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
326 <        t.interrupt();
348 <        t.join();
324 >
325 >        awaitTermination(t);
326 >        checkEmpty(q);
327      }
328  
329      /**
330       * peek returns next element, or null if empty
331       */
332 <    public void testPeek() {
332 >    public void testPeek() throws InterruptedException {
333          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
334          for (int i = 0; i < SIZE; ++i) {
335              assertEquals(i, (int) q.peek());
# Line 360 | Line 338 | public class LinkedTransferQueueTest ext
338                         i != (int) q.peek());
339          }
340          assertNull(q.peek());
341 +        checkEmpty(q);
342      }
343  
344      /**
345       * element returns next element, or throws NoSuchElementException if empty
346       */
347 <    public void testElement() {
347 >    public void testElement() throws InterruptedException {
348          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
349          for (int i = 0; i < SIZE; ++i) {
350              assertEquals(i, (int) q.element());
# Line 374 | Line 353 | public class LinkedTransferQueueTest ext
353          try {
354              q.element();
355              shouldThrow();
356 <        } catch (NoSuchElementException success) {
357 <        }
356 >        } catch (NoSuchElementException success) {}
357 >        checkEmpty(q);
358      }
359  
360      /**
361       * remove removes next element, or throws NoSuchElementException if empty
362       */
363 <    public void testRemove() {
363 >    public void testRemove() throws InterruptedException {
364          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
365          for (int i = 0; i < SIZE; ++i) {
366              assertEquals(i, (int) q.remove());
# Line 389 | Line 368 | public class LinkedTransferQueueTest ext
368          try {
369              q.remove();
370              shouldThrow();
371 <        } catch (NoSuchElementException success) {
372 <        }
394 <    }
395 <
396 <    /**
397 <     * remove(x) removes x and returns true if present
398 <     */
399 <    public void testRemoveElement() {
400 <        LinkedTransferQueue q = populatedQueue(SIZE);
401 <        for (int i = 1; i < SIZE; i += 2) {
402 <            assertTrue(q.remove(i));
403 <        }
404 <        for (int i = 0; i < SIZE; i += 2) {
405 <            assertTrue(q.remove(i));
406 <            assertFalse(q.remove(i + 1));
407 <        }
408 <        assertTrue(q.isEmpty());
371 >        } catch (NoSuchElementException success) {}
372 >        checkEmpty(q);
373      }
374  
375      /**
# Line 418 | Line 382 | public class LinkedTransferQueueTest ext
382          assertTrue(q.remove(one));
383          assertTrue(q.remove(two));
384          assertTrue(q.add(three));
385 <        assertTrue(q.take() == three);
385 >        assertSame(q.take(), three);
386      }
387  
388      /**
# Line 436 | Line 400 | public class LinkedTransferQueueTest ext
400      /**
401       * clear removes all elements
402       */
403 <    public void testClear() {
403 >    public void testClear() throws InterruptedException {
404          LinkedTransferQueue q = populatedQueue(SIZE);
405          q.clear();
406 <        assertTrue(q.isEmpty());
443 <        assertEquals(0, q.size());
406 >        checkEmpty(q);
407          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
408          q.add(one);
409          assertFalse(q.isEmpty());
410 +        assertEquals(1, q.size());
411          assertTrue(q.contains(one));
412          q.clear();
413 <        assertTrue(q.isEmpty());
413 >        checkEmpty(q);
414      }
415  
416      /**
# Line 454 | Line 418 | public class LinkedTransferQueueTest ext
418       */
419      public void testContainsAll() {
420          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
421 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
421 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
422          for (int i = 0; i < SIZE; ++i) {
423              assertTrue(q.containsAll(p));
424              assertFalse(p.containsAll(q));
# Line 500 | Line 464 | public class LinkedTransferQueueTest ext
464      }
465  
466      /**
467 <     * toArray contains all elements
467 >     * toArray() contains all elements in FIFO order
468       */
469 <    public void testToArray() throws InterruptedException {
469 >    public void testToArray() {
470          LinkedTransferQueue q = populatedQueue(SIZE);
471          Object[] o = q.toArray();
472          for (int i = 0; i < o.length; i++) {
473 <            assertEquals(o[i], q.take());
473 >            assertSame(o[i], q.poll());
474          }
475      }
476  
477      /**
478 <     * toArray(a) contains all elements
478 >     * toArray(a) contains all elements in FIFO order
479       */
480 <    public void testToArray2() throws InterruptedException {
480 >    public void testToArray2() {
481          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
482          Integer[] ints = new Integer[SIZE];
483 <        ints = q.toArray(ints);
483 >        Integer[] array = q.toArray(ints);
484 >        assertSame(ints, array);
485          for (int i = 0; i < ints.length; i++) {
486 <            assertEquals(ints[i], q.take());
522 <        }
523 <    }
524 <
525 <    /**
526 <     * toArray(null) throws NullPointerException
527 <     */
528 <    public void testToArray_BadArg() {
529 <        try {
530 <            LinkedTransferQueue q = populatedQueue(SIZE);
531 <            Object o[] = q.toArray(null);
532 <            shouldThrow();
533 <        } catch (NullPointerException success) {
486 >            assertSame(ints[i], q.poll());
487          }
488      }
489  
490      /**
491 <     * toArray with incompatible array type throws CCE
491 >     * toArray(incompatible array type) throws ArrayStoreException
492       */
493      public void testToArray1_BadArg() {
494 +        LinkedTransferQueue q = populatedQueue(SIZE);
495          try {
496 <            LinkedTransferQueue q = populatedQueue(SIZE);
543 <            Object o[] = q.toArray(new String[10]);
496 >            q.toArray(new String[10]);
497              shouldThrow();
498 <        } catch (ArrayStoreException success) {
546 <        }
498 >        } catch (ArrayStoreException success) {}
499      }
500  
501      /**
# Line 552 | Line 504 | public class LinkedTransferQueueTest ext
504      public void testIterator() throws InterruptedException {
505          LinkedTransferQueue q = populatedQueue(SIZE);
506          Iterator it = q.iterator();
507 <        int i = 0;
508 <        while (it.hasNext()) {
509 <            assertEquals(it.next(), i++);
558 <        }
507 >        int i;
508 >        for (i = 0; it.hasNext(); i++)
509 >            assertTrue(q.contains(it.next()));
510          assertEquals(i, SIZE);
511 +        assertIteratorExhausted(it);
512 +
513 +        it = q.iterator();
514 +        for (i = 0; it.hasNext(); i++)
515 +            assertEquals(it.next(), q.take());
516 +        assertEquals(i, SIZE);
517 +        assertIteratorExhausted(it);
518      }
519  
520      /**
521 <     * iterator.remove removes current element
521 >     * iterator of empty collection has no elements
522 >     */
523 >    public void testEmptyIterator() {
524 >        assertIteratorExhausted(new LinkedTransferQueue().iterator());
525 >    }
526 >
527 >    /**
528 >     * iterator.remove() removes current element
529       */
530      public void testIteratorRemove() {
531          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 573 | Line 538 | public class LinkedTransferQueueTest ext
538          it.remove();
539  
540          it = q.iterator();
541 <        assertEquals(it.next(), one);
542 <        assertEquals(it.next(), three);
541 >        assertSame(it.next(), one);
542 >        assertSame(it.next(), three);
543          assertFalse(it.hasNext());
544      }
545  
# Line 582 | Line 547 | public class LinkedTransferQueueTest ext
547       * iterator ordering is FIFO
548       */
549      public void testIteratorOrdering() {
550 <        final LinkedTransferQueue<Integer> q
586 <            = new LinkedTransferQueue<Integer>();
550 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
551          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
552          q.add(one);
553          q.add(two);
# Line 618 | Line 582 | public class LinkedTransferQueueTest ext
582          LinkedTransferQueue q = populatedQueue(SIZE);
583          String s = q.toString();
584          for (int i = 0; i < SIZE; ++i) {
585 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
585 >            assertTrue(s.contains(String.valueOf(i)));
586          }
587      }
588  
# Line 627 | Line 591 | public class LinkedTransferQueueTest ext
591       */
592      public void testOfferInExecutor() {
593          final LinkedTransferQueue q = new LinkedTransferQueue();
594 <        q.add(one);
595 <        q.add(two);
596 <        ExecutorService executor = Executors.newFixedThreadPool(2);
597 <
598 <        executor.execute(new CheckedRunnable() {
599 <            void realRun() {
600 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
601 <                                         MILLISECONDS));
602 <            }});
603 <
604 <        executor.execute(new CheckedRunnable() {
641 <            void realRun() throws InterruptedException {
642 <                Thread.sleep(SMALL_DELAY_MS);
643 <                threadAssertEquals(one, q.take());
644 <            }});
594 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
595 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
596 >        try (PoolCleaner cleaner = cleaner(executor)) {
597 >
598 >            executor.execute(new CheckedRunnable() {
599 >                public void realRun() throws InterruptedException {
600 >                    threadsStarted.await();
601 >                    long startTime = System.nanoTime();
602 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
603 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
604 >                }});
605  
606 <        joinPool(executor);
606 >            executor.execute(new CheckedRunnable() {
607 >                public void realRun() throws InterruptedException {
608 >                    threadsStarted.await();
609 >                    assertSame(one, q.take());
610 >                    checkEmpty(q);
611 >                }});
612 >        }
613      }
614  
615      /**
616 <     * poll retrieves elements across Executor threads
616 >     * timed poll retrieves elements across Executor threads
617       */
618      public void testPollInExecutor() {
619          final LinkedTransferQueue q = new LinkedTransferQueue();
620 <        ExecutorService executor = Executors.newFixedThreadPool(2);
621 <
622 <        executor.execute(new CheckedRunnable() {
623 <            void realRun() throws InterruptedException {
624 <                threadAssertNull(q.poll());
625 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
626 <                                                MILLISECONDS));
627 <                threadAssertTrue(q.isEmpty());
628 <            }});
629 <
630 <        executor.execute(new CheckedRunnable() {
631 <            void realRun() throws InterruptedException {
632 <                Thread.sleep(SMALL_DELAY_MS);
667 <                q.put(one);
668 <            }});
620 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
621 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
622 >        try (PoolCleaner cleaner = cleaner(executor)) {
623 >
624 >            executor.execute(new CheckedRunnable() {
625 >                public void realRun() throws InterruptedException {
626 >                    assertNull(q.poll());
627 >                    threadsStarted.await();
628 >                    long startTime = System.nanoTime();
629 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
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 <
679 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
680 <        ObjectOutputStream out
681 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
682 <        out.writeObject(q);
683 <        out.close();
684 <
685 <        ByteArrayInputStream bin
686 <            = new ByteArrayInputStream(bout.toByteArray());
687 <        ObjectInputStream in
688 <            = new ObjectInputStream(new BufferedInputStream(bin));
689 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
690 <
691 <        assertEquals(q.size(), r.size());
692 <        while (!q.isEmpty()) {
693 <            assertEquals(q.remove(), r.remove());
694 <        }
695 <    }
696 <
697 <    /**
698 <     * drainTo(null) throws NullPointerException
699 <     */
700 <    public void testDrainToNull() {
701 <        LinkedTransferQueue q = populatedQueue(SIZE);
702 <        try {
703 <            q.drainTo(null);
704 <            shouldThrow();
705 <        } catch (NullPointerException success) {
706 <        }
707 <    }
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);
716 <            shouldThrow();
717 <        } 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 725 | 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 737 | 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 <        }
762 <        t.join();
698 >        for (int i = 0; i < SIZE; ++i)
699 >            assertEquals(i, l.get(i));
700 >        awaitTermination(t);
701          assertTrue(q.size() + l.size() >= SIZE);
702      }
703  
704      /**
705 <     * drainTo(null, n) throws NullPointerException
768 <     */
769 <    public void testDrainToNullN() {
770 <        LinkedTransferQueue q = populatedQueue(SIZE);
771 <        try {
772 <            q.drainTo(null, 0);
773 <            shouldThrow();
774 <        } catch (NullPointerException success) {
775 <        }
776 <    }
777 <
778 <    /**
779 <     * drainTo(this, n) throws IllegalArgumentException
780 <     */
781 <    public void testDrainToSelfN() {
782 <        LinkedTransferQueue q = populatedQueue(SIZE);
783 <        try {
784 <            q.drainTo(q, 0);
785 <            shouldThrow();
786 <        } catch (IllegalArgumentException success) {
787 <        }
788 <    }
789 <
790 <    /**
791 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
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 799 | 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 <            }
807 <            while (q.poll() != null)
808 <                ;
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 >                long startTime = System.nanoTime();
738 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
739 >                assertEquals(0, q.getWaitingConsumerCount());
740 >                assertFalse(q.hasWaitingConsumer());
741 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
742              }});
743  
744 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
745 <        assertTrue(q.getWaitingConsumerCount()
746 <                   < waiting.getWaitingConsumers());
747 <        t.join();
744 >        threadStarted.await();
745 >        Callable<Boolean> oneConsumer
746 >            = new Callable<Boolean>() { public Boolean call() {
747 >                return q.hasWaitingConsumer()
748 >                && q.getWaitingConsumerCount() == 1; }};
749 >        waitForThreadToEnterWaitState(t, oneConsumer);
750 >
751 >        assertTrue(q.offer(one));
752 >        assertEquals(0, q.getWaitingConsumerCount());
753 >        assertFalse(q.hasWaitingConsumer());
754 >
755 >        awaitTermination(t);
756      }
757  
758      /**
# Line 838 | Line 763 | public class LinkedTransferQueueTest ext
763              LinkedTransferQueue q = new LinkedTransferQueue();
764              q.transfer(null);
765              shouldThrow();
766 <        } catch (NullPointerException ex) {
842 <        }
766 >        } catch (NullPointerException success) {}
767      }
768  
769      /**
770       * transfer waits until a poll occurs. The transfered element
771 <     * is returned by this associated poll.
771 >     * is returned by the associated poll.
772       */
773      public void testTransfer2() throws InterruptedException {
774 <        final LinkedTransferQueue<Integer> q
775 <            = new LinkedTransferQueue<Integer>();
774 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
775 >        final CountDownLatch threadStarted = new CountDownLatch(1);
776  
777          Thread t = newStartedThread(new CheckedRunnable() {
778 <            void realRun() throws InterruptedException {
779 <                q.transfer(SIZE);
780 <                threadAssertTrue(q.isEmpty());
778 >            public void realRun() throws InterruptedException {
779 >                threadStarted.countDown();
780 >                q.transfer(five);
781 >                checkEmpty(q);
782              }});
783  
784 <        Thread.sleep(SHORT_DELAY_MS);
785 <        assertEquals(1, q.size());
786 <        assertEquals(SIZE, (int) q.poll());
787 <        assertTrue(q.isEmpty());
788 <        t.join();
784 >        threadStarted.await();
785 >        Callable<Boolean> oneElement
786 >            = new Callable<Boolean>() { public Boolean call() {
787 >                return !q.isEmpty() && q.size() == 1; }};
788 >        waitForThreadToEnterWaitState(t, oneElement);
789 >
790 >        assertSame(five, q.poll());
791 >        checkEmpty(q);
792 >        awaitTermination(t);
793      }
794  
795      /**
796       * transfer waits until a poll occurs, and then transfers in fifo order
797       */
798      public void testTransfer3() throws InterruptedException {
799 <        final LinkedTransferQueue<Integer> q
871 <            = new LinkedTransferQueue<Integer>();
799 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
800  
801          Thread first = newStartedThread(new CheckedRunnable() {
802 <            void realRun() throws InterruptedException {
803 <                Integer i = SIZE + 1;
804 <                q.transfer(i);
805 <                threadAssertTrue(!q.contains(i));
878 <                threadAssertEquals(1, q.size());
802 >            public void realRun() throws InterruptedException {
803 >                q.transfer(four);
804 >                assertFalse(q.contains(four));
805 >                assertEquals(1, q.size());
806              }});
807  
808          Thread interruptedThread = newStartedThread(
809              new CheckedInterruptedRunnable() {
810 <                void realRun() throws InterruptedException {
811 <                    while (q.size() == 0)
810 >                public void realRun() throws InterruptedException {
811 >                    while (q.isEmpty())
812                          Thread.yield();
813 <                    q.transfer(SIZE);
813 >                    q.transfer(five);
814                  }});
815  
816          while (q.size() < 2)
817              Thread.yield();
818          assertEquals(2, q.size());
819 <        assertEquals(SIZE + 1, (int) q.poll());
819 >        assertSame(four, q.poll());
820          first.join();
821          assertEquals(1, q.size());
822          interruptedThread.interrupt();
823          interruptedThread.join();
824 <        assertEquals(0, q.size());
898 <        assertTrue(q.isEmpty());
824 >        checkEmpty(q);
825      }
826  
827      /**
# Line 906 | Line 832 | public class LinkedTransferQueueTest ext
832          final LinkedTransferQueue q = new LinkedTransferQueue();
833  
834          Thread t = newStartedThread(new CheckedRunnable() {
835 <            void realRun() throws InterruptedException {
835 >            public void realRun() throws InterruptedException {
836                  q.transfer(four);
837 <                threadAssertFalse(q.contains(four));
838 <                threadAssertEquals(three, q.poll());
837 >                assertFalse(q.contains(four));
838 >                assertSame(three, q.poll());
839              }});
840  
841 <        Thread.sleep(SHORT_DELAY_MS);
841 >        while (q.isEmpty())
842 >            Thread.yield();
843 >        assertFalse(q.isEmpty());
844 >        assertEquals(1, q.size());
845          assertTrue(q.offer(three));
846 <        assertEquals(four, q.poll());
847 <        t.join();
846 >        assertSame(four, q.poll());
847 >        awaitTermination(t);
848      }
849  
850      /**
851       * transfer waits until a take occurs. The transfered element
852 <     * is returned by this associated take.
852 >     * is returned by the associated take.
853       */
854      public void testTransfer5() throws InterruptedException {
855 <        final LinkedTransferQueue<Integer> q
927 <            = new LinkedTransferQueue<Integer>();
855 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
856  
857          Thread t = newStartedThread(new CheckedRunnable() {
858 <            void realRun() throws InterruptedException {
859 <                q.transfer(SIZE);
860 <                threadAssertTrue(q.isEmpty());
858 >            public void realRun() throws InterruptedException {
859 >                q.transfer(four);
860 >                checkEmpty(q);
861              }});
862  
863 <        Thread.sleep(SHORT_DELAY_MS);
864 <        assertEquals(SIZE, (int) q.take());
865 <        assertTrue(q.isEmpty());
866 <        t.join();
863 >        while (q.isEmpty())
864 >            Thread.yield();
865 >        assertFalse(q.isEmpty());
866 >        assertEquals(1, q.size());
867 >        assertSame(four, q.take());
868 >        checkEmpty(q);
869 >        awaitTermination(t);
870      }
871  
872      /**
873       * tryTransfer(null) throws NullPointerException
874       */
875      public void testTryTransfer1() {
876 +        final LinkedTransferQueue q = new LinkedTransferQueue();
877          try {
946            final LinkedTransferQueue q = new LinkedTransferQueue();
878              q.tryTransfer(null);
879              shouldThrow();
880 <        } catch (NullPointerException ex) {
950 <        }
880 >        } catch (NullPointerException success) {}
881      }
882  
883      /**
884       * tryTransfer returns false and does not enqueue if there are no
885       * consumers waiting to poll or take.
886       */
887 <    public void testTryTransfer2() {
887 >    public void testTryTransfer2() throws InterruptedException {
888          final LinkedTransferQueue q = new LinkedTransferQueue();
889          assertFalse(q.tryTransfer(new Object()));
890          assertFalse(q.hasWaitingConsumer());
891 <        assertTrue(q.isEmpty());
962 <        assertEquals(0, q.size());
891 >        checkEmpty(q);
892      }
893  
894      /**
# Line 971 | Line 900 | public class LinkedTransferQueueTest ext
900          final LinkedTransferQueue q = new LinkedTransferQueue();
901  
902          Thread t = newStartedThread(new CheckedRunnable() {
903 <            void realRun() {
903 >            public void realRun() {
904                  while (! q.hasWaitingConsumer())
905                      Thread.yield();
906 <                threadAssertTrue(q.hasWaitingConsumer());
907 <                threadAssertTrue(q.isEmpty());
908 <                threadAssertTrue(q.size() == 0);
980 <                threadAssertTrue(q.tryTransfer(hotPotato));
906 >                assertTrue(q.hasWaitingConsumer());
907 >                checkEmpty(q);
908 >                assertTrue(q.tryTransfer(hotPotato));
909              }});
910  
911 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
912 <        assertTrue(q.isEmpty());
913 <        t.join();
911 >        long startTime = System.nanoTime();
912 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
913 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
914 >        checkEmpty(q);
915 >        awaitTermination(t);
916      }
917  
918      /**
# Line 994 | Line 924 | public class LinkedTransferQueueTest ext
924          final LinkedTransferQueue q = new LinkedTransferQueue();
925  
926          Thread t = newStartedThread(new CheckedRunnable() {
927 <            void realRun() {
927 >            public void realRun() {
928                  while (! q.hasWaitingConsumer())
929                      Thread.yield();
930 <                threadAssertTrue(q.hasWaitingConsumer());
931 <                threadAssertTrue(q.isEmpty());
932 <                threadAssertTrue(q.size() == 0);
1003 <                threadAssertTrue(q.tryTransfer(hotPotato));
930 >                assertTrue(q.hasWaitingConsumer());
931 >                checkEmpty(q);
932 >                assertTrue(q.tryTransfer(hotPotato));
933              }});
934  
935 <        assertTrue(q.take() == hotPotato);
936 <        assertTrue(q.isEmpty());
937 <        t.join();
935 >        assertSame(q.take(), hotPotato);
936 >        checkEmpty(q);
937 >        awaitTermination(t);
938      }
939  
940      /**
941 <     * tryTransfer waits the amount given if interrupted, and
1013 <     * throws interrupted exception
941 >     * tryTransfer blocks interruptibly if no takers
942       */
943      public void testTryTransfer5() throws InterruptedException {
944          final LinkedTransferQueue q = new LinkedTransferQueue();
945 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
946 +        assertTrue(q.isEmpty());
947  
948 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
949 <            void realRun() throws InterruptedException {
950 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
948 >        Thread t = newStartedThread(new CheckedRunnable() {
949 >            public void realRun() throws InterruptedException {
950 >                long startTime = System.nanoTime();
951 >                Thread.currentThread().interrupt();
952 >                try {
953 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
954 >                    shouldThrow();
955 >                } catch (InterruptedException success) {}
956 >                assertFalse(Thread.interrupted());
957 >
958 >                pleaseInterrupt.countDown();
959 >                try {
960 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
961 >                    shouldThrow();
962 >                } catch (InterruptedException success) {}
963 >                assertFalse(Thread.interrupted());
964 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
965              }});
966  
967 <        Thread.sleep(SMALL_DELAY_MS);
968 <        toInterrupt.interrupt();
969 <        toInterrupt.join();
967 >        await(pleaseInterrupt);
968 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
969 >        t.interrupt();
970 >        awaitTermination(t);
971 >        checkEmpty(q);
972      }
973  
974      /**
975 <     * tryTransfer gives up after the timeout and return false
975 >     * tryTransfer gives up after the timeout and returns false
976       */
977      public void testTryTransfer6() throws InterruptedException {
978          final LinkedTransferQueue q = new LinkedTransferQueue();
979  
980          Thread t = newStartedThread(new CheckedRunnable() {
981 <            void realRun() throws InterruptedException {
982 <                threadAssertFalse
983 <                    (q.tryTransfer(new Object(),
984 <                                   SHORT_DELAY_MS, MILLISECONDS));
981 >            public void realRun() throws InterruptedException {
982 >                long startTime = System.nanoTime();
983 >                assertFalse(q.tryTransfer(new Object(),
984 >                                          timeoutMillis(), MILLISECONDS));
985 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
986 >                checkEmpty(q);
987              }});
988  
989 <        Thread.sleep(SMALL_DELAY_MS);
990 <        assertTrue(q.isEmpty());
1043 <        t.join();
989 >        awaitTermination(t);
990 >        checkEmpty(q);
991      }
992  
993      /**
# Line 1052 | Line 999 | public class LinkedTransferQueueTest ext
999          assertTrue(q.offer(four));
1000  
1001          Thread t = newStartedThread(new CheckedRunnable() {
1002 <            void realRun() throws InterruptedException {
1003 <                threadAssertTrue(q.tryTransfer(five,
1004 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1005 <                threadAssertTrue(q.isEmpty());
1002 >            public void realRun() throws InterruptedException {
1003 >                long startTime = System.nanoTime();
1004 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1005 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1006 >                checkEmpty(q);
1007              }});
1008  
1009 <        Thread.sleep(SHORT_DELAY_MS);
1009 >        while (q.size() != 2)
1010 >            Thread.yield();
1011          assertEquals(2, q.size());
1012 <        assertEquals(four, q.poll());
1013 <        assertEquals(five, q.poll());
1014 <        assertTrue(q.isEmpty());
1015 <        t.join();
1012 >        assertSame(four, q.poll());
1013 >        assertSame(five, q.poll());
1014 >        checkEmpty(q);
1015 >        awaitTermination(t);
1016      }
1017  
1018      /**
1019 <     * tryTransfer attempts to enqueue into the q and fails returning
1020 <     * false not enqueueing and the successive poll is null
1019 >     * tryTransfer attempts to enqueue into the queue and fails
1020 >     * returning false not enqueueing and the successive poll is null
1021       */
1022      public void testTryTransfer8() throws InterruptedException {
1023          final LinkedTransferQueue q = new LinkedTransferQueue();
1024          assertTrue(q.offer(four));
1025          assertEquals(1, q.size());
1026 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1026 >        long startTime = System.nanoTime();
1027 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1028 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1029          assertEquals(1, q.size());
1030 <        assertEquals(four, q.poll());
1080 <        threadAssertTrue(q.isEmpty());
1030 >        assertSame(four, q.poll());
1031          assertNull(q.poll());
1032 +        checkEmpty(q);
1033      }
1034  
1035      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1036 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1037 <        assertTrue(q.isEmpty());
1036 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1037 >        checkEmpty(q);
1038          for (int i = 0; i < n; i++) {
1039              assertEquals(i, q.size());
1040              assertTrue(q.offer(i));
# Line 1093 | Line 1044 | public class LinkedTransferQueueTest ext
1044          return q;
1045      }
1046  
1047 <    private static class ConsumerObserver {
1048 <
1049 <        private int waitingConsumers;
1050 <
1051 <        private ConsumerObserver() {
1052 <        }
1053 <
1054 <        private void setWaitingConsumer(int i) {
1055 <            this.waitingConsumers = i;
1056 <        }
1057 <
1058 <        private int getWaitingConsumers() {
1108 <            return waitingConsumers;
1047 >    /**
1048 >     * remove(null), contains(null) always return false
1049 >     */
1050 >    public void testNeverContainsNull() {
1051 >        Collection<?>[] qs = {
1052 >            new LinkedTransferQueue<Object>(),
1053 >            populatedQueue(2),
1054 >        };
1055 >
1056 >        for (Collection<?> q : qs) {
1057 >            assertFalse(q.contains(null));
1058 >            assertFalse(q.remove(null));
1059          }
1060      }
1061   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines