ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedTransferQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.9 by jsr166, Wed Aug 5 00:43:23 2009 UTC vs.
Revision 1.87 by jsr166, Wed Jan 27 01:57:24 2021 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 JSR166TestCase.itemFor(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 36 | Line 53 | public class LinkedTransferQueueTest ext
53       * being true
54       */
55      public void testConstructor1() {
56 <        assertEquals(0, new LinkedTransferQueue().size());
56 >        mustEqual(0, new LinkedTransferQueue().size());
57          assertTrue(new LinkedTransferQueue().isEmpty());
58      }
59  
# Line 48 | Line 65 | public class LinkedTransferQueueTest ext
65          try {
66              new LinkedTransferQueue(null);
67              shouldThrow();
68 <        } catch (NullPointerException success) {
52 <        }
68 >        } catch (NullPointerException success) {}
69      }
70  
71      /**
# Line 57 | Line 73 | public class LinkedTransferQueueTest ext
73       * NullPointerException
74       */
75      public void testConstructor3() {
76 +        Collection<Item> elements = Arrays.asList(new Item[SIZE]);
77          try {
78 <            Integer[] ints = new Integer[SIZE];
62 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80 <        } catch (NullPointerException success) {
65 <        }
80 >        } catch (NullPointerException success) {}
81      }
82  
83      /**
# Line 70 | Line 85 | public class LinkedTransferQueueTest ext
85       * throws NullPointerException
86       */
87      public void testConstructor4() {
88 +        Item[] items = new Item[2];
89 +        items[0] = zero;
90 +        Collection<Item> elements = Arrays.asList(items);
91          try {
92 <            Integer[] ints = new Integer[SIZE];
75 <            for (int i = 0; i < SIZE - 1; ++i) {
76 <                ints[i] = i;
77 <            }
78 <            new LinkedTransferQueue(Arrays.asList(ints));
92 >            new LinkedTransferQueue(elements);
93              shouldThrow();
94 <        } catch (NullPointerException success) {
81 <        }
94 >        } catch (NullPointerException success) {}
95      }
96  
97      /**
98       * Queue contains all elements of the collection it is initialized by
99       */
100      public void testConstructor5() {
101 <        try {
102 <            Integer[] ints = new Integer[SIZE];
103 <            for (int i = 0; i < SIZE; ++i) {
104 <                ints[i] = i;
105 <            }
106 <            LinkedTransferQueue q
107 <                = new LinkedTransferQueue(Arrays.asList(ints));
108 <            for (int i = 0; i < SIZE; ++i) {
109 <                assertEquals(ints[i], q.poll());
110 <            }
111 <        } finally {
101 >        Item[] items = defaultItems;
102 >        List<Item> intList = Arrays.asList(items);
103 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>(intList);
104 >        mustEqual(q.size(), intList.size());
105 >        mustEqual(q.toString(), intList.toString());
106 >        assertTrue(Arrays.equals(q.toArray(),
107 >                                     intList.toArray()));
108 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
109 >                                 intList.toArray(new Object[0])));
110 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
111 >                                 intList.toArray(new Object[SIZE])));
112 >        for (int i = 0; i < SIZE; ++i) {
113 >            mustEqual(items[i], q.poll());
114          }
115      }
116  
117      /**
118 <     * Remaining capacity never decrease nor increase on add or remove
118 >     * remainingCapacity() always returns Integer.MAX_VALUE
119       */
120      public void testRemainingCapacity() {
121 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
121 >        BlockingQueue<Item> q = populatedQueue(SIZE);
122          for (int i = 0; i < SIZE; ++i) {
123 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
124 <            assertEquals(SIZE - i, q.size());
125 <            q.remove();
123 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
124 >            mustEqual(SIZE - i, q.size());
125 >            mustEqual(i, q.remove());
126          }
127          for (int i = 0; i < SIZE; ++i) {
128 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
129 <            assertEquals(i, q.size());
130 <            q.add(i);
116 <        }
117 <    }
118 <
119 <    /**
120 <     * offer(null) throws NullPointerException
121 <     */
122 <    public void testOfferNull() {
123 <        try {
124 <            LinkedTransferQueue q = new LinkedTransferQueue();
125 <            q.offer(null);
126 <            shouldThrow();
127 <        } catch (NullPointerException success) {
128 <        }
129 <    }
130 <
131 <    /**
132 <     * add(null) throws NullPointerException
133 <     */
134 <    public void testAddNull() {
135 <        try {
136 <            LinkedTransferQueue q = new LinkedTransferQueue();
137 <            q.add(null);
138 <            shouldThrow();
139 <        } catch (NullPointerException success) {
140 <        }
141 <    }
142 <
143 <    /**
144 <     * addAll(null) throws NullPointerException
145 <     */
146 <    public void testAddAll1() {
147 <        try {
148 <            LinkedTransferQueue q = new LinkedTransferQueue();
149 <            q.addAll(null);
150 <            shouldThrow();
151 <        } catch (NullPointerException success) {
128 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
129 >            mustEqual(i, q.size());
130 >            mustAdd(q, i);
131          }
132      }
133  
# Line 156 | Line 135 | public class LinkedTransferQueueTest ext
135       * addAll(this) throws IllegalArgumentException
136       */
137      public void testAddAllSelf() {
138 +        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
139          try {
160            LinkedTransferQueue q = populatedQueue(SIZE);
140              q.addAll(q);
141              shouldThrow();
142 <        } catch (IllegalArgumentException success) {
164 <        }
165 <    }
166 <
167 <    /**
168 <     * addAll of a collection with null elements throws NullPointerException
169 <     */
170 <    public void testAddAll2() {
171 <        try {
172 <            LinkedTransferQueue q = new LinkedTransferQueue();
173 <            Integer[] ints = new Integer[SIZE];
174 <            q.addAll(Arrays.asList(ints));
175 <            shouldThrow();
176 <        } catch (NullPointerException success) {
177 <        }
142 >        } catch (IllegalArgumentException success) {}
143      }
144  
145      /**
# Line 182 | Line 147 | public class LinkedTransferQueueTest ext
147       * NullPointerException after possibly adding some elements
148       */
149      public void testAddAll3() {
150 +        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
151 +        Item[] items = new Item[2]; items[0] = zero;
152          try {
153 <            LinkedTransferQueue q = new LinkedTransferQueue();
187 <            Integer[] ints = new Integer[SIZE];
188 <            for (int i = 0; i < SIZE - 1; ++i) {
189 <                ints[i] = i;
190 <            }
191 <            q.addAll(Arrays.asList(ints));
153 >            q.addAll(Arrays.asList(items));
154              shouldThrow();
155 <        } catch (NullPointerException success) {
194 <        }
155 >        } catch (NullPointerException success) {}
156      }
157  
158      /**
159       * Queue contains all elements, in traversal order, of successful addAll
160       */
161      public void testAddAll5() {
162 <        Integer[] empty = new Integer[0];
163 <        Integer[] ints = new Integer[SIZE];
203 <        for (int i = 0; i < SIZE; ++i) {
204 <            ints[i] = i;
205 <        }
162 >        Item[] empty = new Item[0];
163 >        Item[] items = defaultItems;
164          LinkedTransferQueue q = new LinkedTransferQueue();
165          assertFalse(q.addAll(Arrays.asList(empty)));
166 <        assertTrue(q.addAll(Arrays.asList(ints)));
166 >        assertTrue(q.addAll(Arrays.asList(items)));
167          for (int i = 0; i < SIZE; ++i) {
168 <            assertEquals(ints[i], q.poll());
168 >            mustEqual(items[i], q.poll());
169          }
170      }
171  
172      /**
215     * put(null) throws NullPointerException
216     */
217    public void testPutNull() throws InterruptedException {
218        try {
219            LinkedTransferQueue q = new LinkedTransferQueue();
220            q.put(null);
221            shouldThrow();
222        } catch (NullPointerException success) {}
223    }
224
225    /**
173       * all elements successfully put are contained
174       */
175      public void testPut() {
176 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
176 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
177 >        Item[] items = defaultItems;
178          for (int i = 0; i < SIZE; ++i) {
179 <            q.put(i);
180 <            assertTrue(q.contains(i));
179 >            mustEqual(i, q.size());
180 >            q.put(items[i]);
181 >            mustContain(q, items[i]);
182          }
234        assertEquals(q.size(), SIZE);
183      }
184  
185      /**
186       * take retrieves elements in FIFO order
187       */
188      public void testTake() throws InterruptedException {
189 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
189 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
190          for (int i = 0; i < SIZE; ++i) {
191 <            assertEquals(i, (int) q.take());
191 >            mustEqual(i, q.take());
192          }
193      }
194  
195      /**
196 <     * take blocks interruptibly when empty
249 <     */
250 <    public void testTakeFromEmpty() throws InterruptedException {
251 <        final LinkedTransferQueue q = new LinkedTransferQueue();
252 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
253 <            void realRun() throws InterruptedException {
254 <                q.take();
255 <            }});
256 <        Thread.sleep(SHORT_DELAY_MS);
257 <        t.interrupt();
258 <        t.join();
259 <    }
260 <
261 <    /**
262 <     * Take removes existing elements until empty, then blocks interruptibly
196 >     * take removes existing elements until empty, then blocks interruptibly
197       */
198      public void testBlockingTake() throws InterruptedException {
199 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
200 <            void realRun() throws InterruptedException {
201 <                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
202 <                for (int i = 0; i < SIZE; ++i) {
203 <                    threadAssertEquals(i, (int) q.take());
204 <                }
205 <                q.take();
199 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
200 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
201 >        Thread t = newStartedThread(new CheckedRunnable() {
202 >            public void realRun() throws InterruptedException {
203 >                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
204 >
205 >                Thread.currentThread().interrupt();
206 >                try {
207 >                    q.take();
208 >                    shouldThrow();
209 >                } catch (InterruptedException success) {}
210 >                assertFalse(Thread.interrupted());
211 >
212 >                pleaseInterrupt.countDown();
213 >                try {
214 >                    q.take();
215 >                    shouldThrow();
216 >                } catch (InterruptedException success) {}
217 >                assertFalse(Thread.interrupted());
218              }});
219 <        Thread.sleep(SHORT_DELAY_MS);
219 >
220 >        await(pleaseInterrupt);
221 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
222          t.interrupt();
223 <        t.join();
223 >        awaitTermination(t);
224      }
225  
226      /**
227       * poll succeeds unless empty
228       */
229 <    public void testPoll() {
230 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
229 >    public void testPoll() throws InterruptedException {
230 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
231          for (int i = 0; i < SIZE; ++i) {
232 <            assertEquals(i, (int) q.poll());
232 >            mustEqual(i, q.poll());
233          }
234          assertNull(q.poll());
235 +        checkEmpty(q);
236      }
237  
238      /**
239 <     * timed pool with zero timeout succeeds when non-empty, else times out
239 >     * timed poll with zero timeout succeeds when non-empty, else times out
240       */
241      public void testTimedPoll0() throws InterruptedException {
242 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
242 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
243          for (int i = 0; i < SIZE; ++i) {
244 <            assertEquals(i, (int) q.poll(0, MILLISECONDS));
244 >            mustEqual(i, q.poll(0, MILLISECONDS));
245          }
246          assertNull(q.poll(0, MILLISECONDS));
247 +        checkEmpty(q);
248      }
249  
250      /**
251 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
251 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
252       */
253      public void testTimedPoll() throws InterruptedException {
254 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
255 <        for (int i = 0; i < SIZE; ++i) {
256 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
257 <        }
258 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
254 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
255 >        long startTime = System.nanoTime();
256 >        for (int i = 0; i < SIZE; ++i)
257 >            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
258 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
259 >
260 >        startTime = System.nanoTime();
261 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
262 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
263 >        checkEmpty(q);
264      }
265  
266      /**
# Line 313 | Line 268 | public class LinkedTransferQueueTest ext
268       * returning timeout status
269       */
270      public void testInterruptedTimedPoll() throws InterruptedException {
271 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
272 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
273 <            void realRun() throws InterruptedException {
274 <                for (int i = 0; i < SIZE; ++i) {
275 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
276 <                                                       MILLISECONDS));
277 <                }
278 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
271 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
272 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
273 >        Thread t = newStartedThread(new CheckedRunnable() {
274 >            public void realRun() throws InterruptedException {
275 >                for (int i = 0; i < SIZE; i++)
276 >                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
277 >
278 >                Thread.currentThread().interrupt();
279 >                try {
280 >                    q.poll(randomTimeout(), randomTimeUnit());
281 >                    shouldThrow();
282 >                } catch (InterruptedException success) {}
283 >                assertFalse(Thread.interrupted());
284 >
285 >                pleaseInterrupt.countDown();
286 >                try {
287 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
288 >                    shouldThrow();
289 >                } catch (InterruptedException success) {}
290 >                assertFalse(Thread.interrupted());
291              }});
292 <        Thread.sleep(SMALL_DELAY_MS);
292 >
293 >        await(pleaseInterrupt);
294 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
295          t.interrupt();
296 <        t.join();
297 <        assertEquals(q.size(), 0);
329 <        assertNull(q.poll());
296 >        awaitTermination(t);
297 >        checkEmpty(q);
298      }
299  
300      /**
301 <     * timed poll before a delayed offer fails; after offer succeeds;
302 <     * on interruption throws
301 >     * timed poll after thread interrupted throws InterruptedException
302 >     * instead of returning timeout status
303       */
304 <    public void testTimedPollWithOffer() throws InterruptedException {
305 <        final LinkedTransferQueue q = new LinkedTransferQueue();
306 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
307 <            void realRun() throws InterruptedException {
308 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
309 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
310 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
304 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
305 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
306 >        Thread t = newStartedThread(new CheckedRunnable() {
307 >            public void realRun() throws InterruptedException {
308 >                Thread.currentThread().interrupt();
309 >                for (int i = 0; i < SIZE; ++i)
310 >                    mustEqual(i, q.poll(randomTimeout(), randomTimeUnit()));
311 >                try {
312 >                    q.poll(randomTimeout(), randomTimeUnit());
313 >                    shouldThrow();
314 >                } catch (InterruptedException success) {}
315 >                assertFalse(Thread.interrupted());
316              }});
317 <        Thread.sleep(SMALL_DELAY_MS);
318 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
319 <        t.interrupt();
347 <        t.join();
317 >
318 >        awaitTermination(t);
319 >        checkEmpty(q);
320      }
321  
322      /**
323       * peek returns next element, or null if empty
324       */
325 <    public void testPeek() {
326 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
325 >    public void testPeek() throws InterruptedException {
326 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
327          for (int i = 0; i < SIZE; ++i) {
328 <            assertEquals(i, (int) q.peek());
329 <            assertEquals(i, (int) q.poll());
328 >            mustEqual(i, q.peek());
329 >            mustEqual(i, q.poll());
330              assertTrue(q.peek() == null ||
331 <                       i != (int) q.peek());
331 >                       i != q.peek().value);
332          }
333          assertNull(q.peek());
334 +        checkEmpty(q);
335      }
336  
337      /**
338       * element returns next element, or throws NoSuchElementException if empty
339       */
340 <    public void testElement() {
341 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
340 >    public void testElement() throws InterruptedException {
341 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
342          for (int i = 0; i < SIZE; ++i) {
343 <            assertEquals(i, (int) q.element());
344 <            assertEquals(i, (int) q.poll());
343 >            mustEqual(i, q.element());
344 >            mustEqual(i, q.poll());
345          }
346          try {
347              q.element();
348              shouldThrow();
349 <        } catch (NoSuchElementException success) {
350 <        }
349 >        } catch (NoSuchElementException success) {}
350 >        checkEmpty(q);
351      }
352  
353      /**
354       * remove removes next element, or throws NoSuchElementException if empty
355       */
356 <    public void testRemove() {
357 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
356 >    public void testRemove() throws InterruptedException {
357 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
358          for (int i = 0; i < SIZE; ++i) {
359 <            assertEquals(i, (int) q.remove());
359 >            mustEqual(i, q.remove());
360          }
361          try {
362              q.remove();
363              shouldThrow();
364 <        } catch (NoSuchElementException success) {
365 <        }
393 <    }
394 <
395 <    /**
396 <     * remove(x) removes x and returns true if present
397 <     */
398 <    public void testRemoveElement() {
399 <        LinkedTransferQueue q = populatedQueue(SIZE);
400 <        for (int i = 1; i < SIZE; i += 2) {
401 <            assertTrue(q.remove(i));
402 <        }
403 <        for (int i = 0; i < SIZE; i += 2) {
404 <            assertTrue(q.remove(i));
405 <            assertFalse(q.remove(i + 1));
406 <        }
407 <        assertTrue(q.isEmpty());
364 >        } catch (NoSuchElementException success) {}
365 >        checkEmpty(q);
366      }
367  
368      /**
369       * An add following remove(x) succeeds
370       */
371      public void testRemoveElementAndAdd() throws InterruptedException {
372 <        LinkedTransferQueue q = new LinkedTransferQueue();
373 <        assertTrue(q.add(one));
374 <        assertTrue(q.add(two));
375 <        assertTrue(q.remove(one));
376 <        assertTrue(q.remove(two));
377 <        assertTrue(q.add(three));
378 <        assertTrue(q.take() != null);
372 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
373 >        mustAdd(q, one);
374 >        mustAdd(q, two);
375 >        mustRemove(q, one);
376 >        mustRemove(q, two);
377 >        mustAdd(q, three);
378 >        mustEqual(q.take(), three);
379      }
380  
381      /**
382       * contains(x) reports true when elements added but not yet removed
383       */
384      public void testContains() {
385 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
385 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
386          for (int i = 0; i < SIZE; ++i) {
387 <            assertTrue(q.contains(i));
388 <            assertEquals(i, (int) q.poll());
389 <            assertFalse(q.contains(i));
387 >            mustContain(q, i);
388 >            mustEqual(i, q.poll());
389 >            mustNotContain(q, i);
390          }
391      }
392  
393      /**
394       * clear removes all elements
395       */
396 <    public void testClear() {
397 <        LinkedTransferQueue q = populatedQueue(SIZE);
396 >    public void testClear() throws InterruptedException {
397 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
398          q.clear();
399 <        assertTrue(q.isEmpty());
400 <        assertEquals(0, q.size());
443 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
399 >        checkEmpty(q);
400 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
401          q.add(one);
402          assertFalse(q.isEmpty());
403 <        assertTrue(q.contains(one));
403 >        mustEqual(1, q.size());
404 >        mustContain(q, one);
405          q.clear();
406 <        assertTrue(q.isEmpty());
406 >        checkEmpty(q);
407      }
408  
409      /**
410       * containsAll(c) is true when c contains a subset of elements
411       */
412      public void testContainsAll() {
413 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
414 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
413 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
414 >        LinkedTransferQueue<Item> p = new LinkedTransferQueue<>();
415          for (int i = 0; i < SIZE; ++i) {
416              assertTrue(q.containsAll(p));
417              assertFalse(p.containsAll(q));
418 <            p.add(i);
418 >            mustAdd(p, i);
419          }
420          assertTrue(p.containsAll(q));
421      }
# Line 467 | Line 425 | public class LinkedTransferQueueTest ext
425       * if changed
426       */
427      public void testRetainAll() {
428 <        LinkedTransferQueue q = populatedQueue(SIZE);
429 <        LinkedTransferQueue p = populatedQueue(SIZE);
428 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
429 >        LinkedTransferQueue<Item> p = populatedQueue(SIZE);
430          for (int i = 0; i < SIZE; ++i) {
431              boolean changed = q.retainAll(p);
432              if (i == 0) {
# Line 477 | Line 435 | public class LinkedTransferQueueTest ext
435                  assertTrue(changed);
436              }
437              assertTrue(q.containsAll(p));
438 <            assertEquals(SIZE - i, q.size());
438 >            mustEqual(SIZE - i, q.size());
439              p.remove();
440          }
441      }
# Line 488 | Line 446 | public class LinkedTransferQueueTest ext
446       */
447      public void testRemoveAll() {
448          for (int i = 1; i < SIZE; ++i) {
449 <            LinkedTransferQueue q = populatedQueue(SIZE);
450 <            LinkedTransferQueue p = populatedQueue(i);
449 >            LinkedTransferQueue<Item> q = populatedQueue(SIZE);
450 >            LinkedTransferQueue<Item> p = populatedQueue(i);
451              assertTrue(q.removeAll(p));
452 <            assertEquals(SIZE - i, q.size());
452 >            mustEqual(SIZE - i, q.size());
453              for (int j = 0; j < i; ++j) {
454 <                assertFalse(q.contains(p.remove()));
454 >                mustNotContain(q, p.remove());
455              }
456          }
457      }
458  
459      /**
460 <     * toArray contains all elements
460 >     * toArray() contains all elements in FIFO order
461       */
462 <    public void testToArray() throws InterruptedException {
463 <        LinkedTransferQueue q = populatedQueue(SIZE);
464 <        Object[] o = q.toArray();
465 <        for (int i = 0; i < o.length; i++) {
466 <            assertEquals(o[i], q.take());
467 <        }
462 >    public void testToArray() {
463 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
464 >        Object[] a = q.toArray();
465 >        assertSame(Object[].class, a.getClass());
466 >        for (Object o : a)
467 >            assertSame(o, q.poll());
468 >        assertTrue(q.isEmpty());
469      }
470  
471      /**
472 <     * toArray(a) contains all elements
472 >     * toArray(a) contains all elements in FIFO order
473       */
474 <    public void testToArray2() throws InterruptedException {
475 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
476 <        Integer[] ints = new Integer[SIZE];
477 <        ints = q.toArray(ints);
478 <        for (int i = 0; i < ints.length; i++) {
479 <            assertEquals(ints[i], q.take());
480 <        }
474 >    public void testToArray2() {
475 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
476 >        Item[] items = new Item[SIZE];
477 >        Item[] array = q.toArray(items);
478 >        assertSame(items, array);
479 >        for (Item o : items)
480 >            assertSame(o, q.poll());
481 >        assertTrue(q.isEmpty());
482      }
483  
484      /**
485 <     * toArray(null) throws NullPointerException
485 >     * toArray(incompatible array type) throws ArrayStoreException
486       */
487 <    public void testToArray_BadArg() {
487 >    public void testToArray1_BadArg() {
488 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
489          try {
490 <            LinkedTransferQueue q = populatedQueue(SIZE);
530 <            Object o[] = q.toArray(null);
490 >            q.toArray(new String[10]);
491              shouldThrow();
492 <        } catch (NullPointerException success) {
533 <        }
492 >        } catch (ArrayStoreException success) {}
493      }
494  
495      /**
496 <     * toArray with incompatible array type throws CCE
496 >     * iterator iterates through all elements
497       */
498 <    public void testToArray1_BadArg() {
499 <        try {
500 <            LinkedTransferQueue q = populatedQueue(SIZE);
501 <            Object o[] = q.toArray(new String[10]);
502 <            shouldThrow();
503 <        } catch (ArrayStoreException success) {
504 <        }
498 >    public void testIterator() throws InterruptedException {
499 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
500 >        Iterator<? extends Item> it = q.iterator();
501 >        int i;
502 >        for (i = 0; it.hasNext(); i++)
503 >            mustContain(q, it.next());
504 >        mustEqual(i, SIZE);
505 >        assertIteratorExhausted(it);
506 >
507 >        it = q.iterator();
508 >        for (i = 0; it.hasNext(); i++)
509 >            mustEqual(it.next(), q.take());
510 >        mustEqual(i, SIZE);
511 >        assertIteratorExhausted(it);
512      }
513  
514      /**
515 <     * iterator iterates through all elements
515 >     * iterator of empty collection has no elements
516       */
517 <    public void testIterator() throws InterruptedException {
518 <        LinkedTransferQueue q = populatedQueue(SIZE);
553 <        Iterator it = q.iterator();
554 <        while (it.hasNext()) {
555 <            assertEquals(it.next(), q.take());
556 <        }
517 >    public void testEmptyIterator() {
518 >        assertIteratorExhausted(new LinkedTransferQueue().iterator());
519      }
520  
521      /**
522 <     * iterator.remove removes current element
522 >     * iterator.remove() removes current element
523       */
524      public void testIteratorRemove() {
525 <        final LinkedTransferQueue q = new LinkedTransferQueue();
525 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
526          q.add(two);
527          q.add(one);
528          q.add(three);
529  
530 <        Iterator it = q.iterator();
530 >        Iterator<? extends Item> it = q.iterator();
531          it.next();
532          it.remove();
533  
534          it = q.iterator();
535 <        assertEquals(it.next(), one);
536 <        assertEquals(it.next(), three);
535 >        assertSame(it.next(), one);
536 >        assertSame(it.next(), three);
537          assertFalse(it.hasNext());
538      }
539  
# Line 579 | Line 541 | public class LinkedTransferQueueTest ext
541       * iterator ordering is FIFO
542       */
543      public void testIteratorOrdering() {
544 <        final LinkedTransferQueue<Integer> q
545 <            = new LinkedTransferQueue<Integer>();
584 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
544 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
545 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
546          q.add(one);
547          q.add(two);
548          q.add(three);
549 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
549 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
550          int k = 0;
551 <        for (Integer n : q) {
552 <            assertEquals(++k, (int) n);
551 >        for (Item n : q) {
552 >            mustEqual(++k, n);
553          }
554 <        assertEquals(3, k);
554 >        mustEqual(3, k);
555      }
556  
557      /**
558       * Modifications do not cause iterators to fail
559       */
560      public void testWeaklyConsistentIteration() {
561 <        final LinkedTransferQueue q = new LinkedTransferQueue();
561 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
562          q.add(one);
563          q.add(two);
564          q.add(three);
565 <        for (Iterator it = q.iterator(); it.hasNext();) {
565 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
566              q.remove();
567              it.next();
568          }
569 <        assertEquals(0, q.size());
569 >        mustEqual(0, q.size());
570      }
571  
572      /**
573       * toString contains toStrings of elements
574       */
575      public void testToString() {
576 <        LinkedTransferQueue q = populatedQueue(SIZE);
576 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
577          String s = q.toString();
578          for (int i = 0; i < SIZE; ++i) {
579 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
579 >            assertTrue(s.contains(String.valueOf(i)));
580          }
581      }
582  
# Line 623 | Line 584 | public class LinkedTransferQueueTest ext
584       * offer transfers elements across Executor tasks
585       */
586      public void testOfferInExecutor() {
587 <        final LinkedTransferQueue q = new LinkedTransferQueue();
588 <        q.add(one);
589 <        q.add(two);
590 <        ExecutorService executor = Executors.newFixedThreadPool(2);
591 <
592 <        executor.execute(new CheckedRunnable() {
593 <            void realRun() {
594 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
595 <                                         MILLISECONDS));
596 <            }});
597 <
598 <        executor.execute(new CheckedRunnable() {
638 <            void realRun() throws InterruptedException {
639 <                Thread.sleep(SMALL_DELAY_MS);
640 <                threadAssertEquals(one, q.take());
641 <            }});
587 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
588 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
589 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
590 >        try (PoolCleaner cleaner = cleaner(executor)) {
591 >
592 >            executor.execute(new CheckedRunnable() {
593 >                public void realRun() throws InterruptedException {
594 >                    threadsStarted.await();
595 >                    long startTime = System.nanoTime();
596 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
597 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
598 >                }});
599  
600 <        joinPool(executor);
600 >            executor.execute(new CheckedRunnable() {
601 >                public void realRun() throws InterruptedException {
602 >                    threadsStarted.await();
603 >                    assertSame(one, q.take());
604 >                    checkEmpty(q);
605 >                }});
606 >        }
607      }
608  
609      /**
610 <     * poll retrieves elements across Executor threads
610 >     * timed poll retrieves elements across Executor threads
611       */
612      public void testPollInExecutor() {
613 <        final LinkedTransferQueue q = new LinkedTransferQueue();
614 <        ExecutorService executor = Executors.newFixedThreadPool(2);
615 <
616 <        executor.execute(new CheckedRunnable() {
617 <            void realRun() throws InterruptedException {
618 <                threadAssertNull(q.poll());
619 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
620 <                                                MILLISECONDS));
621 <                threadAssertTrue(q.isEmpty());
622 <            }});
623 <
624 <        executor.execute(new CheckedRunnable() {
625 <            void realRun() throws InterruptedException {
626 <                Thread.sleep(SMALL_DELAY_MS);
664 <                q.put(one);
665 <            }});
666 <
667 <        joinPool(executor);
668 <    }
669 <
670 <    /**
671 <     * A deserialized serialized queue has same elements in same order
672 <     */
673 <    public void testSerialization() throws Exception {
674 <        LinkedTransferQueue q = populatedQueue(SIZE);
675 <
676 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
677 <        ObjectOutputStream out
678 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
679 <        out.writeObject(q);
680 <        out.close();
681 <
682 <        ByteArrayInputStream bin
683 <            = new ByteArrayInputStream(bout.toByteArray());
684 <        ObjectInputStream in
685 <            = new ObjectInputStream(new BufferedInputStream(bin));
686 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
613 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
614 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
615 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
616 >        try (PoolCleaner cleaner = cleaner(executor)) {
617 >
618 >            executor.execute(new CheckedRunnable() {
619 >                public void realRun() throws InterruptedException {
620 >                    assertNull(q.poll());
621 >                    threadsStarted.await();
622 >                    long startTime = System.nanoTime();
623 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
624 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
625 >                    checkEmpty(q);
626 >                }});
627  
628 <        assertEquals(q.size(), r.size());
629 <        while (!q.isEmpty()) {
630 <            assertEquals(q.remove(), r.remove());
628 >            executor.execute(new CheckedRunnable() {
629 >                public void realRun() throws InterruptedException {
630 >                    threadsStarted.await();
631 >                    q.put(one);
632 >                }});
633          }
634      }
635  
636      /**
637 <     * drainTo(null) throws NullPointerException
637 >     * A deserialized/reserialized queue has same elements in same order
638       */
639 <    public void testDrainToNull() {
640 <        LinkedTransferQueue q = populatedQueue(SIZE);
641 <        try {
700 <            q.drainTo(null);
701 <            shouldThrow();
702 <        } catch (NullPointerException success) {
703 <        }
704 <    }
639 >    public void testSerialization() throws Exception {
640 >        Queue<Item> x = populatedQueue(SIZE);
641 >        Queue<Item> y = serialClone(x);
642  
643 <    /**
644 <     * drainTo(this) throws IllegalArgumentException
645 <     */
646 <    public void testDrainToSelf() {
647 <        LinkedTransferQueue q = populatedQueue(SIZE);
648 <        try {
649 <            q.drainTo(q);
713 <            shouldThrow();
714 <        } catch (IllegalArgumentException success) {
643 >        assertNotSame(y, x);
644 >        mustEqual(x.size(), y.size());
645 >        mustEqual(x.toString(), y.toString());
646 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
647 >        while (!x.isEmpty()) {
648 >            assertFalse(y.isEmpty());
649 >            mustEqual(x.remove(), y.remove());
650          }
651 +        assertTrue(y.isEmpty());
652      }
653  
654      /**
655       * drainTo(c) empties queue into another collection c
656       */
657      public void testDrainTo() {
658 <        LinkedTransferQueue q = populatedQueue(SIZE);
658 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
659          ArrayList l = new ArrayList();
660          q.drainTo(l);
661 <        assertEquals(q.size(), 0);
662 <        assertEquals(l.size(), SIZE);
661 >        mustEqual(0, q.size());
662 >        mustEqual(SIZE, l.size());
663          for (int i = 0; i < SIZE; ++i) {
664 <            assertEquals(l.get(i), i);
664 >            mustEqual(i, l.get(i));
665          }
666          q.add(zero);
667          q.add(one);
668          assertFalse(q.isEmpty());
669 <        assertTrue(q.contains(zero));
670 <        assertTrue(q.contains(one));
669 >        mustContain(q, zero);
670 >        mustContain(q, one);
671          l.clear();
672          q.drainTo(l);
673 <        assertEquals(q.size(), 0);
674 <        assertEquals(l.size(), 2);
673 >        mustEqual(0, q.size());
674 >        mustEqual(2, l.size());
675          for (int i = 0; i < 2; ++i) {
676 <            assertEquals(l.get(i), i);
676 >            mustEqual(i, l.get(i));
677          }
678      }
679  
680      /**
681 <     * drainTo empties full queue, unblocking a waiting put.
681 >     * drainTo(c) empties full queue, unblocking a waiting put.
682       */
683      public void testDrainToWithActivePut() throws InterruptedException {
684 <        final LinkedTransferQueue q = populatedQueue(SIZE);
684 >        final LinkedTransferQueue<Item> q = populatedQueue(SIZE);
685          Thread t = newStartedThread(new CheckedRunnable() {
686 <            void realRun() {
687 <                q.put(SIZE + 1);
686 >            public void realRun() {
687 >                q.put(new Item(SIZE + 1));
688              }});
689          ArrayList l = new ArrayList();
690          q.drainTo(l);
691          assertTrue(l.size() >= SIZE);
692 <        for (int i = 0; i < SIZE; ++i) {
693 <            assertEquals(l.get(i), i);
694 <        }
759 <        t.join();
692 >        for (int i = 0; i < SIZE; ++i)
693 >            mustEqual(i, l.get(i));
694 >        awaitTermination(t);
695          assertTrue(q.size() + l.size() >= SIZE);
696      }
697  
698      /**
699 <     * drainTo(null, n) throws NullPointerException
765 <     */
766 <    public void testDrainToNullN() {
767 <        LinkedTransferQueue q = populatedQueue(SIZE);
768 <        try {
769 <            q.drainTo(null, 0);
770 <            shouldThrow();
771 <        } catch (NullPointerException success) {
772 <        }
773 <    }
774 <
775 <    /**
776 <     * drainTo(this, n) throws IllegalArgumentException
777 <     */
778 <    public void testDrainToSelfN() {
779 <        LinkedTransferQueue q = populatedQueue(SIZE);
780 <        try {
781 <            q.drainTo(q, 0);
782 <            shouldThrow();
783 <        } catch (IllegalArgumentException success) {
784 <        }
785 <    }
786 <
787 <    /**
788 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
699 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
700       */
701      public void testDrainToN() {
702 <        LinkedTransferQueue q = new LinkedTransferQueue();
702 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
703          for (int i = 0; i < SIZE + 2; ++i) {
704              for (int j = 0; j < SIZE; j++) {
705 <                assertTrue(q.offer(j));
705 >                mustOffer(q, j);
706              }
707              ArrayList l = new ArrayList();
708              q.drainTo(l, i);
709              int k = (i < SIZE) ? i : SIZE;
710 <            assertEquals(l.size(), k);
711 <            assertEquals(q.size(), SIZE - k);
712 <            for (int j = 0; j < k; ++j) {
713 <                assertEquals(l.get(j), j);
714 <            }
804 <            while (q.poll() != null)
805 <                ;
710 >            mustEqual(k, l.size());
711 >            mustEqual(SIZE - k, q.size());
712 >            for (int j = 0; j < k; ++j)
713 >                mustEqual(j, l.get(j));
714 >            do {} while (q.poll() != null);
715          }
716      }
717  
718      /**
719 <     * poll and take decrement the waiting consumer count
719 >     * timed poll() or take() increments the waiting consumer count;
720 >     * offer(e) decrements the waiting consumer count
721       */
722      public void testWaitingConsumer() throws InterruptedException {
723 <        final LinkedTransferQueue q = new LinkedTransferQueue();
724 <        final ConsumerObserver waiting = new ConsumerObserver();
723 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
724 >        mustEqual(0, q.getWaitingConsumerCount());
725 >        assertFalse(q.hasWaitingConsumer());
726 >        final CountDownLatch threadStarted = new CountDownLatch(1);
727  
728          Thread t = newStartedThread(new CheckedRunnable() {
729 <            void realRun() throws InterruptedException {
730 <                Thread.sleep(SMALL_DELAY_MS);
731 <                threadAssertTrue(q.hasWaitingConsumer());
732 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
733 <                threadAssertTrue(q.offer(new Object()));
729 >            public void realRun() throws InterruptedException {
730 >                threadStarted.countDown();
731 >                long startTime = System.nanoTime();
732 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
733 >                mustEqual(0, q.getWaitingConsumerCount());
734 >                assertFalse(q.hasWaitingConsumer());
735 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
736              }});
737  
738 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
739 <        assertTrue(q.getWaitingConsumerCount()
740 <                   < waiting.getWaitingConsumers());
741 <        t.join();
738 >        threadStarted.await();
739 >        Callable<Boolean> oneConsumer = new Callable<>() {
740 >            public Boolean call() {
741 >                return q.hasWaitingConsumer()
742 >                && q.getWaitingConsumerCount() == 1; }};
743 >        waitForThreadToEnterWaitState(t, oneConsumer);
744 >
745 >        assertTrue(q.offer(one));
746 >        mustEqual(0, q.getWaitingConsumerCount());
747 >        assertFalse(q.hasWaitingConsumer());
748 >
749 >        awaitTermination(t);
750      }
751  
752      /**
# Line 832 | Line 754 | public class LinkedTransferQueueTest ext
754       */
755      public void testTransfer1() throws InterruptedException {
756          try {
757 <            LinkedTransferQueue q = new LinkedTransferQueue();
757 >            LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
758              q.transfer(null);
759              shouldThrow();
760 <        } catch (NullPointerException ex) {
839 <        }
760 >        } catch (NullPointerException success) {}
761      }
762  
763      /**
764 <     * transfer waits until a poll occurs. The transfered element
765 <     * is returned by this associated poll.
764 >     * transfer waits until a poll occurs. The transferred element
765 >     * is returned by the associated poll.
766       */
767      public void testTransfer2() throws InterruptedException {
768 <        final LinkedTransferQueue<Integer> q
769 <            = new LinkedTransferQueue<Integer>();
768 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
769 >        final CountDownLatch threadStarted = new CountDownLatch(1);
770  
771          Thread t = newStartedThread(new CheckedRunnable() {
772 <            void realRun() throws InterruptedException {
773 <                q.transfer(SIZE);
774 <                threadAssertTrue(q.isEmpty());
772 >            public void realRun() throws InterruptedException {
773 >                threadStarted.countDown();
774 >                q.transfer(five);
775 >                checkEmpty(q);
776              }});
777  
778 <        Thread.sleep(SHORT_DELAY_MS);
779 <        assertEquals(1, q.size());
780 <        assertEquals(SIZE, (int) q.poll());
781 <        assertTrue(q.isEmpty());
782 <        t.join();
778 >        threadStarted.await();
779 >        Callable<Boolean> oneElement = new Callable<>() {
780 >            public Boolean call() {
781 >                return !q.isEmpty() && q.size() == 1; }};
782 >        waitForThreadToEnterWaitState(t, oneElement);
783 >
784 >        assertSame(five, q.poll());
785 >        checkEmpty(q);
786 >        awaitTermination(t);
787      }
788  
789      /**
790       * transfer waits until a poll occurs, and then transfers in fifo order
791       */
792      public void testTransfer3() throws InterruptedException {
793 <        final LinkedTransferQueue<Integer> q
868 <            = new LinkedTransferQueue<Integer>();
793 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
794  
795          Thread first = newStartedThread(new CheckedRunnable() {
796 <            void realRun() throws InterruptedException {
797 <                Integer i = SIZE + 1;
798 <                q.transfer(i);
799 <                threadAssertTrue(!q.contains(i));
875 <                threadAssertEquals(1, q.size());
796 >            public void realRun() throws InterruptedException {
797 >                q.transfer(four);
798 >                mustNotContain(q, four);
799 >                mustEqual(1, q.size());
800              }});
801  
802          Thread interruptedThread = newStartedThread(
803              new CheckedInterruptedRunnable() {
804 <                void realRun() throws InterruptedException {
805 <                    while (q.size() == 0)
804 >                public void realRun() throws InterruptedException {
805 >                    while (q.isEmpty())
806                          Thread.yield();
807 <                    q.transfer(SIZE);
807 >                    q.transfer(five);
808                  }});
809  
810          while (q.size() < 2)
811              Thread.yield();
812 <        assertEquals(2, q.size());
813 <        assertEquals(SIZE + 1, (int) q.poll());
812 >        mustEqual(2, q.size());
813 >        assertSame(four, q.poll());
814          first.join();
815 <        assertEquals(1, q.size());
815 >        mustEqual(1, q.size());
816          interruptedThread.interrupt();
817          interruptedThread.join();
818 <        assertEquals(0, q.size());
895 <        assertTrue(q.isEmpty());
818 >        checkEmpty(q);
819      }
820  
821      /**
# Line 900 | Line 823 | public class LinkedTransferQueueTest ext
823       * thread returns the element
824       */
825      public void testTransfer4() throws InterruptedException {
826 <        final LinkedTransferQueue q = new LinkedTransferQueue();
826 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
827  
828          Thread t = newStartedThread(new CheckedRunnable() {
829 <            void realRun() throws InterruptedException {
829 >            public void realRun() throws InterruptedException {
830                  q.transfer(four);
831 <                threadAssertFalse(q.contains(four));
832 <                threadAssertEquals(three, q.poll());
831 >                mustNotContain(q, four);
832 >                assertSame(three, q.poll());
833              }});
834  
835 <        Thread.sleep(SHORT_DELAY_MS);
835 >        while (q.isEmpty())
836 >            Thread.yield();
837 >        assertFalse(q.isEmpty());
838 >        mustEqual(1, q.size());
839          assertTrue(q.offer(three));
840 <        assertEquals(four, q.poll());
841 <        t.join();
840 >        assertSame(four, q.poll());
841 >        awaitTermination(t);
842      }
843  
844      /**
845 <     * transfer waits until a take occurs. The transfered element
846 <     * is returned by this associated take.
845 >     * transfer waits until a take occurs. The transferred element
846 >     * is returned by the associated take.
847       */
848      public void testTransfer5() throws InterruptedException {
849 <        final LinkedTransferQueue<Integer> q
924 <            = new LinkedTransferQueue<Integer>();
849 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
850  
851          Thread t = newStartedThread(new CheckedRunnable() {
852 <            void realRun() throws InterruptedException {
853 <                q.transfer(SIZE);
854 <                threadAssertTrue(q.isEmpty());
852 >            public void realRun() throws InterruptedException {
853 >                q.transfer(four);
854 >                checkEmpty(q);
855              }});
856  
857 <        Thread.sleep(SHORT_DELAY_MS);
858 <        assertEquals(SIZE, (int) q.take());
859 <        assertTrue(q.isEmpty());
860 <        t.join();
857 >        while (q.isEmpty())
858 >            Thread.yield();
859 >        assertFalse(q.isEmpty());
860 >        mustEqual(1, q.size());
861 >        assertSame(four, q.take());
862 >        checkEmpty(q);
863 >        awaitTermination(t);
864      }
865  
866      /**
867       * tryTransfer(null) throws NullPointerException
868       */
869      public void testTryTransfer1() {
870 +        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
871          try {
943            final LinkedTransferQueue q = new LinkedTransferQueue();
872              q.tryTransfer(null);
873              shouldThrow();
874 <        } catch (NullPointerException ex) {
947 <        }
874 >        } catch (NullPointerException success) {}
875      }
876  
877      /**
878       * tryTransfer returns false and does not enqueue if there are no
879       * consumers waiting to poll or take.
880       */
881 <    public void testTryTransfer2() {
882 <        final LinkedTransferQueue q = new LinkedTransferQueue();
881 >    public void testTryTransfer2() throws InterruptedException {
882 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
883          assertFalse(q.tryTransfer(new Object()));
884          assertFalse(q.hasWaitingConsumer());
885 <        assertTrue(q.isEmpty());
959 <        assertEquals(0, q.size());
885 >        checkEmpty(q);
886      }
887  
888      /**
# Line 965 | Line 891 | public class LinkedTransferQueueTest ext
891       */
892      public void testTryTransfer3() throws InterruptedException {
893          final Object hotPotato = new Object();
894 <        final LinkedTransferQueue q = new LinkedTransferQueue();
894 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
895  
896          Thread t = newStartedThread(new CheckedRunnable() {
897 <            void realRun() {
897 >            public void realRun() {
898                  while (! q.hasWaitingConsumer())
899                      Thread.yield();
900 <                threadAssertTrue(q.hasWaitingConsumer());
901 <                threadAssertTrue(q.isEmpty());
902 <                threadAssertTrue(q.size() == 0);
977 <                threadAssertTrue(q.tryTransfer(hotPotato));
900 >                assertTrue(q.hasWaitingConsumer());
901 >                checkEmpty(q);
902 >                assertTrue(q.tryTransfer(hotPotato));
903              }});
904  
905 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
906 <        assertTrue(q.isEmpty());
907 <        t.join();
905 >        long startTime = System.nanoTime();
906 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
907 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
908 >        checkEmpty(q);
909 >        awaitTermination(t);
910      }
911  
912      /**
# Line 988 | Line 915 | public class LinkedTransferQueueTest ext
915       */
916      public void testTryTransfer4() throws InterruptedException {
917          final Object hotPotato = new Object();
918 <        final LinkedTransferQueue q = new LinkedTransferQueue();
918 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
919  
920          Thread t = newStartedThread(new CheckedRunnable() {
921 <            void realRun() {
921 >            public void realRun() {
922                  while (! q.hasWaitingConsumer())
923                      Thread.yield();
924 <                threadAssertTrue(q.hasWaitingConsumer());
925 <                threadAssertTrue(q.isEmpty());
926 <                threadAssertTrue(q.size() == 0);
1000 <                threadAssertTrue(q.tryTransfer(hotPotato));
924 >                assertTrue(q.hasWaitingConsumer());
925 >                checkEmpty(q);
926 >                assertTrue(q.tryTransfer(hotPotato));
927              }});
928  
929 <        assertTrue(q.take() == hotPotato);
930 <        assertTrue(q.isEmpty());
931 <        t.join();
929 >        assertSame(q.take(), hotPotato);
930 >        checkEmpty(q);
931 >        awaitTermination(t);
932      }
933  
934      /**
935 <     * tryTransfer waits the amount given if interrupted, and
1010 <     * throws interrupted exception
935 >     * tryTransfer blocks interruptibly if no takers
936       */
937      public void testTryTransfer5() throws InterruptedException {
938 <        final LinkedTransferQueue q = new LinkedTransferQueue();
938 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
939 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
940 >        assertTrue(q.isEmpty());
941  
942 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
943 <            void realRun() throws InterruptedException {
944 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
942 >        Thread t = newStartedThread(new CheckedRunnable() {
943 >            public void realRun() throws InterruptedException {
944 >                Thread.currentThread().interrupt();
945 >                try {
946 >                    q.tryTransfer(new Object(), randomTimeout(), randomTimeUnit());
947 >                    shouldThrow();
948 >                } catch (InterruptedException success) {}
949 >                assertFalse(Thread.interrupted());
950 >
951 >                pleaseInterrupt.countDown();
952 >                try {
953 >                    q.tryTransfer(new Object(), LONGER_DELAY_MS, MILLISECONDS);
954 >                    shouldThrow();
955 >                } catch (InterruptedException success) {}
956 >                assertFalse(Thread.interrupted());
957              }});
958  
959 <        Thread.sleep(SMALL_DELAY_MS);
960 <        toInterrupt.interrupt();
961 <        toInterrupt.join();
959 >        await(pleaseInterrupt);
960 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
961 >        t.interrupt();
962 >        awaitTermination(t);
963 >        checkEmpty(q);
964      }
965  
966      /**
967 <     * tryTransfer gives up after the timeout and return false
967 >     * tryTransfer gives up after the timeout and returns false
968       */
969      public void testTryTransfer6() throws InterruptedException {
970 <        final LinkedTransferQueue q = new LinkedTransferQueue();
970 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<>();
971  
972          Thread t = newStartedThread(new CheckedRunnable() {
973 <            void realRun() throws InterruptedException {
974 <                threadAssertFalse
975 <                    (q.tryTransfer(new Object(),
976 <                                   SHORT_DELAY_MS, MILLISECONDS));
973 >            public void realRun() throws InterruptedException {
974 >                long startTime = System.nanoTime();
975 >                assertFalse(q.tryTransfer(new Object(),
976 >                                          timeoutMillis(), MILLISECONDS));
977 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
978 >                checkEmpty(q);
979              }});
980  
981 <        Thread.sleep(SMALL_DELAY_MS);
982 <        assertTrue(q.isEmpty());
1040 <        t.join();
981 >        awaitTermination(t);
982 >        checkEmpty(q);
983      }
984  
985      /**
# Line 1045 | Line 987 | public class LinkedTransferQueueTest ext
987       * before transfering to a poll or take
988       */
989      public void testTryTransfer7() throws InterruptedException {
990 <        final LinkedTransferQueue q = new LinkedTransferQueue();
990 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
991          assertTrue(q.offer(four));
992  
993          Thread t = newStartedThread(new CheckedRunnable() {
994 <            void realRun() throws InterruptedException {
995 <                threadAssertTrue(q.tryTransfer(five,
996 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
997 <                threadAssertTrue(q.isEmpty());
994 >            public void realRun() throws InterruptedException {
995 >                long startTime = System.nanoTime();
996 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
997 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
998 >                checkEmpty(q);
999              }});
1000  
1001 <        Thread.sleep(SHORT_DELAY_MS);
1002 <        assertEquals(2, q.size());
1003 <        assertEquals(four, q.poll());
1004 <        assertEquals(five, q.poll());
1005 <        assertTrue(q.isEmpty());
1006 <        t.join();
1001 >        while (q.size() != 2)
1002 >            Thread.yield();
1003 >        mustEqual(2, q.size());
1004 >        assertSame(four, q.poll());
1005 >        assertSame(five, q.poll());
1006 >        checkEmpty(q);
1007 >        awaitTermination(t);
1008      }
1009  
1010      /**
1011 <     * tryTransfer attempts to enqueue into the q and fails returning
1012 <     * false not enqueueing and the successive poll is null
1011 >     * tryTransfer attempts to enqueue into the queue and fails
1012 >     * returning false not enqueueing and the successive poll is null
1013       */
1014      public void testTryTransfer8() throws InterruptedException {
1015 <        final LinkedTransferQueue q = new LinkedTransferQueue();
1015 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
1016          assertTrue(q.offer(four));
1017 <        assertEquals(1, q.size());
1018 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1019 <        assertEquals(1, q.size());
1020 <        assertEquals(four, q.poll());
1021 <        threadAssertTrue(q.isEmpty());
1017 >        mustEqual(1, q.size());
1018 >        long startTime = System.nanoTime();
1019 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1020 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1021 >        mustEqual(1, q.size());
1022 >        assertSame(four, q.poll());
1023          assertNull(q.poll());
1024 +        checkEmpty(q);
1025      }
1026  
1027 <    private LinkedTransferQueue<Integer> populatedQueue(int n) {
1028 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1029 <        assertTrue(q.isEmpty());
1027 >    private LinkedTransferQueue<Item> populatedQueue(int n) {
1028 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
1029 >        checkEmpty(q);
1030          for (int i = 0; i < n; i++) {
1031 <            assertEquals(i, q.size());
1032 <            assertTrue(q.offer(i));
1033 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
1031 >            mustEqual(i, q.size());
1032 >            mustOffer(q, i);
1033 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
1034          }
1035          assertFalse(q.isEmpty());
1036          return q;
1037      }
1038  
1039 <    private static class ConsumerObserver {
1040 <
1041 <        private int waitingConsumers;
1042 <
1043 <        private ConsumerObserver() {
1044 <        }
1045 <
1046 <        private void setWaitingConsumer(int i) {
1047 <            this.waitingConsumers = i;
1048 <        }
1049 <
1050 <        private int getWaitingConsumers() {
1105 <            return waitingConsumers;
1039 >    /**
1040 >     * remove(null), contains(null) always return false
1041 >     */
1042 >    public void testNeverContainsNull() {
1043 >        Collection<?>[] qs = {
1044 >            new LinkedTransferQueue<>(),
1045 >            populatedQueue(2),
1046 >        };
1047 >
1048 >        for (Collection<?> q : qs) {
1049 >            assertFalse(q.contains(null));
1050 >            assertFalse(q.remove(null));
1051          }
1052      }
1053   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines