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.16 by jsr166, Sat Nov 21 19:11:53 2009 UTC vs.
Revision 1.69 by jsr166, Sat Feb 18 01:17:06 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.Collection;
13   import java.util.Iterator;
14   import java.util.List;
15   import java.util.NoSuchElementException;
16 < import java.util.concurrent.*;
17 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
16 > import java.util.Queue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedTransferQueue;
22 >
23   import junit.framework.Test;
22 import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
27 +    public static class Generic extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedTransferQueue();
30 +        }
31 +    }
32  
33      public static void main(String[] args) {
34 <        junit.textui.TestRunner.run(suite());
34 >        main(suite(), args);
35      }
36  
37      public static Test suite() {
38 <        return new TestSuite(LinkedTransferQueueTest.class);
39 <    }
40 <
41 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
42 <        assertTrue(q.isEmpty());
43 <        assertEquals(0, q.size());
44 <        assertNull(q.peek());
45 <        assertNull(q.poll());
46 <        assertNull(q.poll(0, MILLISECONDS));
47 <        assertEquals(q.toString(), "[]");
42 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
43 <        assertFalse(q.iterator().hasNext());
44 <        try {
45 <            q.element();
46 <            shouldThrow();
47 <        } catch (NoSuchElementException success) {
48 <        }
49 <        try {
50 <            q.iterator().next();
51 <            shouldThrow();
52 <        } catch (NoSuchElementException success) {
53 <        }
54 <        try {
55 <            q.remove();
56 <            shouldThrow();
57 <        } catch (NoSuchElementException success) {
58 <        }
38 >        class Implementation implements CollectionImplementation {
39 >            public Class<?> klazz() { return LinkedTransferQueue.class; }
40 >            public Collection emptyCollection() { return new LinkedTransferQueue(); }
41 >            public Object makeElement(int i) { return i; }
42 >            public boolean isConcurrent() { return true; }
43 >            public boolean permitsNulls() { return false; }
44 >        }
45 >        return newTestSuite(LinkedTransferQueueTest.class,
46 >                            new Generic().testSuite(),
47 >                            CollectionTest.testSuite(new Implementation()));
48      }
49  
50      /**
# Line 75 | Line 64 | public class LinkedTransferQueueTest ext
64          try {
65              new LinkedTransferQueue(null);
66              shouldThrow();
67 <        } catch (NullPointerException success) {
79 <        }
67 >        } catch (NullPointerException success) {}
68      }
69  
70      /**
# Line 84 | Line 72 | public class LinkedTransferQueueTest ext
72       * NullPointerException
73       */
74      public void testConstructor3() {
75 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
76          try {
77 <            Integer[] ints = new Integer[SIZE];
89 <            new LinkedTransferQueue(Arrays.asList(ints));
77 >            new LinkedTransferQueue(elements);
78              shouldThrow();
79 <        } catch (NullPointerException success) {
92 <        }
79 >        } catch (NullPointerException success) {}
80      }
81  
82      /**
# Line 97 | Line 84 | public class LinkedTransferQueueTest ext
84       * throws NullPointerException
85       */
86      public void testConstructor4() {
87 +        Integer[] ints = new Integer[SIZE];
88 +        for (int i = 0; i < SIZE - 1; ++i)
89 +            ints[i] = i;
90 +        Collection<Integer> elements = Arrays.asList(ints);
91          try {
92 <            Integer[] ints = new Integer[SIZE];
102 <            for (int i = 0; i < SIZE - 1; ++i) {
103 <                ints[i] = i;
104 <            }
105 <            new LinkedTransferQueue(Arrays.asList(ints));
92 >            new LinkedTransferQueue(elements);
93              shouldThrow();
94 <        } catch (NullPointerException success) {
108 <        }
94 >        } catch (NullPointerException success) {}
95      }
96  
97      /**
# Line 136 | Line 122 | public class LinkedTransferQueueTest ext
122       * remainingCapacity() always returns Integer.MAX_VALUE
123       */
124      public void testRemainingCapacity() {
125 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
125 >        BlockingQueue q = populatedQueue(SIZE);
126          for (int i = 0; i < SIZE; ++i) {
127              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
128              assertEquals(SIZE - i, q.size());
129 <            q.remove();
129 >            assertEquals(i, q.remove());
130          }
131          for (int i = 0; i < SIZE; ++i) {
132              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133              assertEquals(i, q.size());
134 <            q.add(i);
149 <        }
150 <    }
151 <
152 <    /**
153 <     * offer(null) throws NullPointerException
154 <     */
155 <    public void testOfferNull() {
156 <        try {
157 <            LinkedTransferQueue q = new LinkedTransferQueue();
158 <            q.offer(null);
159 <            shouldThrow();
160 <        } catch (NullPointerException success) {
161 <        }
162 <    }
163 <
164 <    /**
165 <     * add(null) throws NullPointerException
166 <     */
167 <    public void testAddNull() {
168 <        try {
169 <            LinkedTransferQueue q = new LinkedTransferQueue();
170 <            q.add(null);
171 <            shouldThrow();
172 <        } catch (NullPointerException success) {
173 <        }
174 <    }
175 <
176 <    /**
177 <     * addAll(null) throws NullPointerException
178 <     */
179 <    public void testAddAll1() {
180 <        try {
181 <            LinkedTransferQueue q = new LinkedTransferQueue();
182 <            q.addAll(null);
183 <            shouldThrow();
184 <        } catch (NullPointerException success) {
134 >            assertTrue(q.add(i));
135          }
136      }
137  
# Line 189 | Line 139 | public class LinkedTransferQueueTest ext
139       * addAll(this) throws IllegalArgumentException
140       */
141      public void testAddAllSelf() {
142 +        LinkedTransferQueue q = populatedQueue(SIZE);
143          try {
193            LinkedTransferQueue q = populatedQueue(SIZE);
144              q.addAll(q);
145              shouldThrow();
146 <        } catch (IllegalArgumentException success) {
197 <        }
198 <    }
199 <
200 <    /**
201 <     * addAll of a collection with null elements throws NullPointerException
202 <     */
203 <    public void testAddAll2() {
204 <        try {
205 <            LinkedTransferQueue q = new LinkedTransferQueue();
206 <            Integer[] ints = new Integer[SIZE];
207 <            q.addAll(Arrays.asList(ints));
208 <            shouldThrow();
209 <        } catch (NullPointerException success) {
210 <        }
146 >        } catch (IllegalArgumentException success) {}
147      }
148  
149      /**
# Line 215 | Line 151 | public class LinkedTransferQueueTest ext
151       * NullPointerException after possibly adding some elements
152       */
153      public void testAddAll3() {
154 +        LinkedTransferQueue q = new LinkedTransferQueue();
155 +        Integer[] ints = new Integer[SIZE];
156 +        for (int i = 0; i < SIZE - 1; ++i)
157 +            ints[i] = i;
158          try {
219            LinkedTransferQueue q = new LinkedTransferQueue();
220            Integer[] ints = new Integer[SIZE];
221            for (int i = 0; i < SIZE - 1; ++i) {
222                ints[i] = i;
223            }
159              q.addAll(Arrays.asList(ints));
160              shouldThrow();
161 <        } catch (NullPointerException success) {
227 <        }
161 >        } catch (NullPointerException success) {}
162      }
163  
164      /**
# Line 245 | Line 179 | public class LinkedTransferQueueTest ext
179      }
180  
181      /**
248     * put(null) throws NullPointerException
249     */
250    public void testPutNull() throws InterruptedException {
251        try {
252            LinkedTransferQueue q = new LinkedTransferQueue();
253            q.put(null);
254            shouldThrow();
255        } catch (NullPointerException success) {}
256    }
257
258    /**
182       * all elements successfully put are contained
183       */
184      public void testPut() {
185 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
185 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
186          for (int i = 0; i < SIZE; ++i) {
187 <            assertEquals(q.size(), i);
187 >            assertEquals(i, q.size());
188              q.put(i);
189              assertTrue(q.contains(i));
190          }
# Line 278 | Line 201 | public class LinkedTransferQueueTest ext
201      }
202  
203      /**
204 <     * take blocks interruptibly when empty
282 <     */
283 <    public void testTakeFromEmpty() throws InterruptedException {
284 <        final LinkedTransferQueue q = new LinkedTransferQueue();
285 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
286 <            void realRun() throws InterruptedException {
287 <                q.take();
288 <            }});
289 <        Thread.sleep(SHORT_DELAY_MS);
290 <        t.interrupt();
291 <        t.join();
292 <    }
293 <
294 <    /**
295 <     * Take removes existing elements until empty, then blocks interruptibly
204 >     * take removes existing elements until empty, then blocks interruptibly
205       */
206      public void testBlockingTake() throws InterruptedException {
207 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
208 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
209 <            void realRun() throws InterruptedException {
207 >        final BlockingQueue q = populatedQueue(SIZE);
208 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
209 >        Thread t = newStartedThread(new CheckedRunnable() {
210 >            public void realRun() throws InterruptedException {
211                  for (int i = 0; i < SIZE; ++i) {
212 <                    threadAssertEquals(i, (int) q.take());
212 >                    assertEquals(i, q.take());
213                  }
214 <                q.take();
214 >
215 >                Thread.currentThread().interrupt();
216 >                try {
217 >                    q.take();
218 >                    shouldThrow();
219 >                } catch (InterruptedException success) {}
220 >                assertFalse(Thread.interrupted());
221 >
222 >                pleaseInterrupt.countDown();
223 >                try {
224 >                    q.take();
225 >                    shouldThrow();
226 >                } catch (InterruptedException success) {}
227 >                assertFalse(Thread.interrupted());
228              }});
229 <        Thread.sleep(SMALL_DELAY_MS);
229 >
230 >        await(pleaseInterrupt);
231 >        assertThreadStaysAlive(t);
232          t.interrupt();
233 <        t.join();
309 <        checkEmpty(q);
233 >        awaitTermination(t);
234      }
235  
236      /**
# Line 322 | Line 246 | public class LinkedTransferQueueTest ext
246      }
247  
248      /**
249 <     * timed pool with zero timeout succeeds when non-empty, else times out
249 >     * timed poll with zero timeout succeeds when non-empty, else times out
250       */
251      public void testTimedPoll0() throws InterruptedException {
252          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 334 | Line 258 | public class LinkedTransferQueueTest ext
258      }
259  
260      /**
261 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
261 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
262       */
263      public void testTimedPoll() throws InterruptedException {
264          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
265 <        for (int i = 0; i < SIZE; ++i) {
266 <            long t0 = System.nanoTime();
265 >        long startTime = System.nanoTime();
266 >        for (int i = 0; i < SIZE; ++i)
267              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
268 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
269 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
270 <        }
271 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
268 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
269 >
270 >        startTime = System.nanoTime();
271 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
272 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
273          checkEmpty(q);
274      }
275  
# Line 353 | Line 278 | public class LinkedTransferQueueTest ext
278       * returning timeout status
279       */
280      public void testInterruptedTimedPoll() throws InterruptedException {
281 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
281 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
282 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
283          Thread t = newStartedThread(new CheckedRunnable() {
284 <            void realRun() throws InterruptedException {
285 <                for (int i = 0; i < SIZE; ++i) {
286 <                    long t0 = System.nanoTime();
287 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
288 <                                                       MILLISECONDS));
363 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
364 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
365 <                }
284 >            public void realRun() throws InterruptedException {
285 >                long startTime = System.nanoTime();
286 >                for (int i = 0; i < SIZE; ++i)
287 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
288 >                aboutToWait.countDown();
289                  try {
290                      q.poll(LONG_DELAY_MS, MILLISECONDS);
291 +                    shouldThrow();
292                  } catch (InterruptedException success) {}
293 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
294              }});
295 <        Thread.sleep(SMALL_DELAY_MS);
295 >
296 >        aboutToWait.await();
297 >        waitForThreadToEnterWaitState(t);
298          t.interrupt();
299 <        t.join();
299 >        awaitTermination(t);
300          checkEmpty(q);
301      }
302  
303      /**
304 <     * timed poll before a delayed offer fails; after offer succeeds;
305 <     * on interruption throws
304 >     * timed poll after thread interrupted throws InterruptedException
305 >     * instead of returning timeout status
306       */
307 <    public void testTimedPollWithOffer() throws InterruptedException {
308 <        final LinkedTransferQueue q = new LinkedTransferQueue();
309 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
310 <            void realRun() throws InterruptedException {
311 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
312 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
313 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
307 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
308 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
309 >        Thread t = newStartedThread(new CheckedRunnable() {
310 >            public void realRun() throws InterruptedException {
311 >                long startTime = System.nanoTime();
312 >                Thread.currentThread().interrupt();
313 >                for (int i = 0; i < SIZE; ++i)
314 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
315 >                try {
316 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
317 >                    shouldThrow();
318 >                } catch (InterruptedException success) {}
319 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
320              }});
321 <        Thread.sleep(SMALL_DELAY_MS);
322 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
323 <        t.interrupt();
391 <        t.join();
321 >
322 >        awaitTermination(t);
323 >        checkEmpty(q);
324      }
325  
326      /**
# Line 418 | Line 350 | public class LinkedTransferQueueTest ext
350          try {
351              q.element();
352              shouldThrow();
353 <        } catch (NoSuchElementException success) {
422 <        }
353 >        } catch (NoSuchElementException success) {}
354          checkEmpty(q);
355      }
356  
# Line 434 | Line 365 | public class LinkedTransferQueueTest ext
365          try {
366              q.remove();
367              shouldThrow();
368 <        } catch (NoSuchElementException success) {
438 <        }
439 <        checkEmpty(q);
440 <    }
441 <
442 <    /**
443 <     * remove(x) removes x and returns true if present
444 <     */
445 <    public void testRemoveElement() throws InterruptedException {
446 <        LinkedTransferQueue q = populatedQueue(SIZE);
447 <        for (int i = 1; i < SIZE; i += 2) {
448 <            assertTrue(q.remove(i));
449 <        }
450 <        for (int i = 0; i < SIZE; i += 2) {
451 <            assertTrue(q.remove(i));
452 <            assertFalse(q.remove(i + 1));
453 <        }
368 >        } catch (NoSuchElementException success) {}
369          checkEmpty(q);
370      }
371  
# Line 464 | Line 379 | public class LinkedTransferQueueTest ext
379          assertTrue(q.remove(one));
380          assertTrue(q.remove(two));
381          assertTrue(q.add(three));
382 <        assertTrue(q.take() == three);
382 >        assertSame(q.take(), three);
383      }
384  
385      /**
# Line 500 | Line 415 | public class LinkedTransferQueueTest ext
415       */
416      public void testContainsAll() {
417          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
418 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
418 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
419          for (int i = 0; i < SIZE; ++i) {
420              assertTrue(q.containsAll(p));
421              assertFalse(p.containsAll(q));
# Line 546 | Line 461 | public class LinkedTransferQueueTest ext
461      }
462  
463      /**
464 <     * toArray() contains all elements
464 >     * toArray() contains all elements in FIFO order
465       */
466 <    public void testToArray() throws InterruptedException {
466 >    public void testToArray() {
467          LinkedTransferQueue q = populatedQueue(SIZE);
468          Object[] o = q.toArray();
469          for (int i = 0; i < o.length; i++) {
470 <            assertEquals(o[i], q.take());
470 >            assertSame(o[i], q.poll());
471          }
472      }
473  
474      /**
475 <     * toArray(a) contains all elements
475 >     * toArray(a) contains all elements in FIFO order
476       */
477 <    public void testToArray2() throws InterruptedException {
477 >    public void testToArray2() {
478          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
479          Integer[] ints = new Integer[SIZE];
480 <        ints = q.toArray(ints);
480 >        Integer[] array = q.toArray(ints);
481 >        assertSame(ints, array);
482          for (int i = 0; i < ints.length; i++) {
483 <            assertEquals(ints[i], q.take());
568 <        }
569 <    }
570 <
571 <    /**
572 <     * toArray(null) throws NullPointerException
573 <     */
574 <    public void testToArray_BadArg() {
575 <        try {
576 <            LinkedTransferQueue q = populatedQueue(SIZE);
577 <            Object o[] = q.toArray(null);
578 <            shouldThrow();
579 <        } catch (NullPointerException success) {
483 >            assertSame(ints[i], q.poll());
484          }
485      }
486  
487      /**
488 <     * toArray(incompatible array type) throws CCE
488 >     * toArray(incompatible array type) throws ArrayStoreException
489       */
490      public void testToArray1_BadArg() {
491 +        LinkedTransferQueue q = populatedQueue(SIZE);
492          try {
493 <            LinkedTransferQueue q = populatedQueue(SIZE);
589 <            Object o[] = q.toArray(new String[10]);
493 >            q.toArray(new String[10]);
494              shouldThrow();
495 <        } catch (ArrayStoreException success) {
592 <        }
495 >        } catch (ArrayStoreException success) {}
496      }
497  
498      /**
# Line 598 | Line 501 | public class LinkedTransferQueueTest ext
501      public void testIterator() throws InterruptedException {
502          LinkedTransferQueue q = populatedQueue(SIZE);
503          Iterator it = q.iterator();
504 <        int i = 0;
505 <        while (it.hasNext()) {
506 <            assertEquals(it.next(), i++);
604 <        }
504 >        int i;
505 >        for (i = 0; it.hasNext(); i++)
506 >            assertTrue(q.contains(it.next()));
507          assertEquals(i, SIZE);
508 +        assertIteratorExhausted(it);
509 +
510 +        it = q.iterator();
511 +        for (i = 0; it.hasNext(); i++)
512 +            assertEquals(it.next(), q.take());
513 +        assertEquals(i, SIZE);
514 +        assertIteratorExhausted(it);
515 +    }
516 +
517 +    /**
518 +     * iterator of empty collection has no elements
519 +     */
520 +    public void testEmptyIterator() {
521 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
522      }
523  
524      /**
# Line 619 | Line 535 | public class LinkedTransferQueueTest ext
535          it.remove();
536  
537          it = q.iterator();
538 <        assertEquals(it.next(), one);
539 <        assertEquals(it.next(), three);
538 >        assertSame(it.next(), one);
539 >        assertSame(it.next(), three);
540          assertFalse(it.hasNext());
541      }
542  
# Line 628 | Line 544 | public class LinkedTransferQueueTest ext
544       * iterator ordering is FIFO
545       */
546      public void testIteratorOrdering() {
547 <        final LinkedTransferQueue<Integer> q
632 <            = new LinkedTransferQueue<Integer>();
547 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
548          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
549          q.add(one);
550          q.add(two);
# Line 664 | Line 579 | public class LinkedTransferQueueTest ext
579          LinkedTransferQueue q = populatedQueue(SIZE);
580          String s = q.toString();
581          for (int i = 0; i < SIZE; ++i) {
582 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
582 >            assertTrue(s.contains(String.valueOf(i)));
583          }
584      }
585  
# Line 673 | Line 588 | public class LinkedTransferQueueTest ext
588       */
589      public void testOfferInExecutor() {
590          final LinkedTransferQueue q = new LinkedTransferQueue();
591 <        q.add(one);
592 <        q.add(two);
593 <        ExecutorService executor = Executors.newFixedThreadPool(2);
594 <
595 <        executor.execute(new CheckedRunnable() {
596 <            void realRun() {
597 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
598 <                                         MILLISECONDS));
599 <            }});
600 <
601 <        executor.execute(new CheckedRunnable() {
687 <            void realRun() throws InterruptedException {
688 <                Thread.sleep(SMALL_DELAY_MS);
689 <                threadAssertEquals(one, q.take());
690 <            }});
591 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
592 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
593 >        try (PoolCleaner cleaner = cleaner(executor)) {
594 >
595 >            executor.execute(new CheckedRunnable() {
596 >                public void realRun() throws InterruptedException {
597 >                    threadsStarted.await();
598 >                    long startTime = System.nanoTime();
599 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
600 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
601 >                }});
602  
603 <        joinPool(executor);
603 >            executor.execute(new CheckedRunnable() {
604 >                public void realRun() throws InterruptedException {
605 >                    threadsStarted.await();
606 >                    assertSame(one, q.take());
607 >                    checkEmpty(q);
608 >                }});
609 >        }
610      }
611  
612      /**
# Line 697 | Line 614 | public class LinkedTransferQueueTest ext
614       */
615      public void testPollInExecutor() {
616          final LinkedTransferQueue q = new LinkedTransferQueue();
617 <        ExecutorService executor = Executors.newFixedThreadPool(2);
618 <
619 <        executor.execute(new CheckedRunnable() {
620 <            void realRun() throws InterruptedException {
621 <                threadAssertNull(q.poll());
622 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
623 <                                                MILLISECONDS));
624 <                threadAssertTrue(q.isEmpty());
625 <            }});
626 <
627 <        executor.execute(new CheckedRunnable() {
628 <            void realRun() throws InterruptedException {
629 <                Thread.sleep(SMALL_DELAY_MS);
713 <                q.put(one);
714 <            }});
617 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
618 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
619 >        try (PoolCleaner cleaner = cleaner(executor)) {
620 >
621 >            executor.execute(new CheckedRunnable() {
622 >                public void realRun() throws InterruptedException {
623 >                    assertNull(q.poll());
624 >                    threadsStarted.await();
625 >                    long startTime = System.nanoTime();
626 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
627 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
628 >                    checkEmpty(q);
629 >                }});
630  
631 <        joinPool(executor);
631 >            executor.execute(new CheckedRunnable() {
632 >                public void realRun() throws InterruptedException {
633 >                    threadsStarted.await();
634 >                    q.put(one);
635 >                }});
636 >        }
637      }
638  
639      /**
640       * A deserialized serialized queue has same elements in same order
641       */
642      public void testSerialization() throws Exception {
643 <        LinkedTransferQueue q = populatedQueue(SIZE);
644 <
725 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
726 <        ObjectOutputStream out
727 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
728 <        out.writeObject(q);
729 <        out.close();
730 <
731 <        ByteArrayInputStream bin
732 <            = new ByteArrayInputStream(bout.toByteArray());
733 <        ObjectInputStream in
734 <            = new ObjectInputStream(new BufferedInputStream(bin));
735 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
643 >        Queue x = populatedQueue(SIZE);
644 >        Queue y = serialClone(x);
645  
646 <        assertEquals(q.size(), r.size());
647 <        while (!q.isEmpty()) {
648 <            assertEquals(q.remove(), r.remove());
649 <        }
650 <    }
651 <
652 <    /**
744 <     * drainTo(null) throws NullPointerException
745 <     */
746 <    public void testDrainToNull() {
747 <        LinkedTransferQueue q = populatedQueue(SIZE);
748 <        try {
749 <            q.drainTo(null);
750 <            shouldThrow();
751 <        } catch (NullPointerException success) {
752 <        }
753 <    }
754 <
755 <    /**
756 <     * drainTo(this) throws IllegalArgumentException
757 <     */
758 <    public void testDrainToSelf() {
759 <        LinkedTransferQueue q = populatedQueue(SIZE);
760 <        try {
761 <            q.drainTo(q);
762 <            shouldThrow();
763 <        } catch (IllegalArgumentException success) {
646 >        assertNotSame(y, x);
647 >        assertEquals(x.size(), y.size());
648 >        assertEquals(x.toString(), y.toString());
649 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
650 >        while (!x.isEmpty()) {
651 >            assertFalse(y.isEmpty());
652 >            assertEquals(x.remove(), y.remove());
653          }
654 +        assertTrue(y.isEmpty());
655      }
656  
657      /**
# Line 771 | Line 661 | public class LinkedTransferQueueTest ext
661          LinkedTransferQueue q = populatedQueue(SIZE);
662          ArrayList l = new ArrayList();
663          q.drainTo(l);
664 <        assertEquals(q.size(), 0);
665 <        assertEquals(l.size(), SIZE);
664 >        assertEquals(0, q.size());
665 >        assertEquals(SIZE, l.size());
666          for (int i = 0; i < SIZE; ++i) {
667 <            assertEquals(l.get(i), i);
667 >            assertEquals(i, l.get(i));
668          }
669          q.add(zero);
670          q.add(one);
# Line 783 | Line 673 | public class LinkedTransferQueueTest ext
673          assertTrue(q.contains(one));
674          l.clear();
675          q.drainTo(l);
676 <        assertEquals(q.size(), 0);
677 <        assertEquals(l.size(), 2);
676 >        assertEquals(0, q.size());
677 >        assertEquals(2, l.size());
678          for (int i = 0; i < 2; ++i) {
679 <            assertEquals(l.get(i), i);
679 >            assertEquals(i, l.get(i));
680          }
681      }
682  
# Line 796 | Line 686 | public class LinkedTransferQueueTest ext
686      public void testDrainToWithActivePut() throws InterruptedException {
687          final LinkedTransferQueue q = populatedQueue(SIZE);
688          Thread t = newStartedThread(new CheckedRunnable() {
689 <            void realRun() {
689 >            public void realRun() {
690                  q.put(SIZE + 1);
691              }});
692          ArrayList l = new ArrayList();
693          q.drainTo(l);
694          assertTrue(l.size() >= SIZE);
695 <        for (int i = 0; i < SIZE; ++i) {
696 <            assertEquals(l.get(i), i);
697 <        }
808 <        t.join();
695 >        for (int i = 0; i < SIZE; ++i)
696 >            assertEquals(i, l.get(i));
697 >        awaitTermination(t);
698          assertTrue(q.size() + l.size() >= SIZE);
699      }
700  
701      /**
702 <     * drainTo(null, n) throws NullPointerException
814 <     */
815 <    public void testDrainToNullN() {
816 <        LinkedTransferQueue q = populatedQueue(SIZE);
817 <        try {
818 <            q.drainTo(null, SIZE);
819 <            shouldThrow();
820 <        } catch (NullPointerException success) {
821 <        }
822 <    }
823 <
824 <    /**
825 <     * drainTo(this, n) throws IllegalArgumentException
826 <     */
827 <    public void testDrainToSelfN() {
828 <        LinkedTransferQueue q = populatedQueue(SIZE);
829 <        try {
830 <            q.drainTo(q, SIZE);
831 <            shouldThrow();
832 <        } catch (IllegalArgumentException success) {
833 <        }
834 <    }
835 <
836 <    /**
837 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
702 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
703       */
704      public void testDrainToN() {
705          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 845 | Line 710 | public class LinkedTransferQueueTest ext
710              ArrayList l = new ArrayList();
711              q.drainTo(l, i);
712              int k = (i < SIZE) ? i : SIZE;
713 <            assertEquals(l.size(), k);
714 <            assertEquals(q.size(), SIZE - k);
715 <            for (int j = 0; j < k; ++j) {
716 <                assertEquals(l.get(j), j);
717 <            }
853 <            while (q.poll() != null)
854 <                ;
713 >            assertEquals(k, l.size());
714 >            assertEquals(SIZE - k, q.size());
715 >            for (int j = 0; j < k; ++j)
716 >                assertEquals(j, l.get(j));
717 >            do {} while (q.poll() != null);
718          }
719      }
720  
# Line 861 | Line 724 | public class LinkedTransferQueueTest ext
724       */
725      public void testWaitingConsumer() throws InterruptedException {
726          final LinkedTransferQueue q = new LinkedTransferQueue();
727 <        assertEquals(q.getWaitingConsumerCount(), 0);
727 >        assertEquals(0, q.getWaitingConsumerCount());
728          assertFalse(q.hasWaitingConsumer());
729 +        final CountDownLatch threadStarted = new CountDownLatch(1);
730  
731          Thread t = newStartedThread(new CheckedRunnable() {
732 <            void realRun() throws InterruptedException {
733 <                Thread.sleep(SMALL_DELAY_MS);
734 <                threadAssertTrue(q.hasWaitingConsumer());
735 <                threadAssertEquals(q.getWaitingConsumerCount(), 1);
736 <                threadAssertTrue(q.offer(new Object()));
737 <                threadAssertFalse(q.hasWaitingConsumer());
738 <                threadAssertEquals(q.getWaitingConsumerCount(), 0);
732 >            public void realRun() throws InterruptedException {
733 >                threadStarted.countDown();
734 >                long startTime = System.nanoTime();
735 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
736 >                assertEquals(0, q.getWaitingConsumerCount());
737 >                assertFalse(q.hasWaitingConsumer());
738 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
739              }});
740  
741 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
742 <        assertEquals(q.getWaitingConsumerCount(), 0);
741 >        threadStarted.await();
742 >        waitForThreadToEnterWaitState(t);
743 >        assertEquals(1, q.getWaitingConsumerCount());
744 >        assertTrue(q.hasWaitingConsumer());
745 >
746 >        assertTrue(q.offer(one));
747 >        assertEquals(0, q.getWaitingConsumerCount());
748          assertFalse(q.hasWaitingConsumer());
749 <        t.join();
749 >
750 >        awaitTermination(t);
751      }
752  
753      /**
# Line 893 | Line 763 | public class LinkedTransferQueueTest ext
763  
764      /**
765       * transfer waits until a poll occurs. The transfered element
766 <     * is returned by this associated poll.
766 >     * is returned by the associated poll.
767       */
768      public void testTransfer2() throws InterruptedException {
769 <        final LinkedTransferQueue<Integer> q
770 <            = new LinkedTransferQueue<Integer>();
769 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
770 >        final CountDownLatch threadStarted = new CountDownLatch(1);
771  
772          Thread t = newStartedThread(new CheckedRunnable() {
773 <            void realRun() throws InterruptedException {
774 <                q.transfer(SIZE);
775 <                threadAssertTrue(q.isEmpty());
773 >            public void realRun() throws InterruptedException {
774 >                threadStarted.countDown();
775 >                q.transfer(five);
776 >                checkEmpty(q);
777              }});
778  
779 <        Thread.sleep(SHORT_DELAY_MS);
779 >        threadStarted.await();
780 >        waitForThreadToEnterWaitState(t);
781          assertEquals(1, q.size());
782 <        assertEquals(SIZE, (int) q.poll());
783 <        assertTrue(q.isEmpty());
784 <        t.join();
782 >        assertSame(five, q.poll());
783 >        checkEmpty(q);
784 >        awaitTermination(t);
785      }
786  
787      /**
788       * transfer waits until a poll occurs, and then transfers in fifo order
789       */
790      public void testTransfer3() throws InterruptedException {
791 <        final LinkedTransferQueue<Integer> q
920 <            = new LinkedTransferQueue<Integer>();
791 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
792  
793          Thread first = newStartedThread(new CheckedRunnable() {
794 <            void realRun() throws InterruptedException {
795 <                Integer i = SIZE + 1;
796 <                q.transfer(i);
797 <                threadAssertTrue(!q.contains(i));
927 <                threadAssertEquals(1, q.size());
794 >            public void realRun() throws InterruptedException {
795 >                q.transfer(four);
796 >                assertTrue(!q.contains(four));
797 >                assertEquals(1, q.size());
798              }});
799  
800          Thread interruptedThread = newStartedThread(
801              new CheckedInterruptedRunnable() {
802 <                void realRun() throws InterruptedException {
803 <                    while (q.size() == 0)
802 >                public void realRun() throws InterruptedException {
803 >                    while (q.isEmpty())
804                          Thread.yield();
805 <                    q.transfer(SIZE);
805 >                    q.transfer(five);
806                  }});
807  
808          while (q.size() < 2)
809              Thread.yield();
810          assertEquals(2, q.size());
811 <        assertEquals(SIZE + 1, (int) q.poll());
811 >        assertSame(four, q.poll());
812          first.join();
813          assertEquals(1, q.size());
814          interruptedThread.interrupt();
815          interruptedThread.join();
816 <        assertEquals(0, q.size());
947 <        assertTrue(q.isEmpty());
816 >        checkEmpty(q);
817      }
818  
819      /**
# Line 955 | Line 824 | public class LinkedTransferQueueTest ext
824          final LinkedTransferQueue q = new LinkedTransferQueue();
825  
826          Thread t = newStartedThread(new CheckedRunnable() {
827 <            void realRun() throws InterruptedException {
827 >            public void realRun() throws InterruptedException {
828                  q.transfer(four);
829 <                threadAssertFalse(q.contains(four));
830 <                threadAssertEquals(three, q.poll());
829 >                assertFalse(q.contains(four));
830 >                assertSame(three, q.poll());
831              }});
832  
833 <        Thread.sleep(SHORT_DELAY_MS);
833 >        while (q.isEmpty())
834 >            Thread.yield();
835 >        assertFalse(q.isEmpty());
836 >        assertEquals(1, q.size());
837          assertTrue(q.offer(three));
838 <        assertEquals(four, q.poll());
839 <        t.join();
838 >        assertSame(four, q.poll());
839 >        awaitTermination(t);
840      }
841  
842      /**
843       * transfer waits until a take occurs. The transfered element
844 <     * is returned by this associated take.
844 >     * is returned by the associated take.
845       */
846      public void testTransfer5() throws InterruptedException {
847 <        final LinkedTransferQueue<Integer> q
976 <            = new LinkedTransferQueue<Integer>();
847 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
848  
849          Thread t = newStartedThread(new CheckedRunnable() {
850 <            void realRun() throws InterruptedException {
851 <                q.transfer(SIZE);
850 >            public void realRun() throws InterruptedException {
851 >                q.transfer(four);
852                  checkEmpty(q);
853              }});
854  
855 <        Thread.sleep(SHORT_DELAY_MS);
856 <        assertEquals(SIZE, (int) q.take());
855 >        while (q.isEmpty())
856 >            Thread.yield();
857 >        assertFalse(q.isEmpty());
858 >        assertEquals(1, q.size());
859 >        assertSame(four, q.take());
860          checkEmpty(q);
861 <        t.join();
861 >        awaitTermination(t);
862      }
863  
864      /**
865       * tryTransfer(null) throws NullPointerException
866       */
867      public void testTryTransfer1() {
868 +        final LinkedTransferQueue q = new LinkedTransferQueue();
869          try {
995            final LinkedTransferQueue q = new LinkedTransferQueue();
870              q.tryTransfer(null);
871              shouldThrow();
872          } catch (NullPointerException success) {}
# Line 1018 | Line 892 | public class LinkedTransferQueueTest ext
892          final LinkedTransferQueue q = new LinkedTransferQueue();
893  
894          Thread t = newStartedThread(new CheckedRunnable() {
895 <            void realRun() {
895 >            public void realRun() {
896                  while (! q.hasWaitingConsumer())
897                      Thread.yield();
898 <                threadAssertTrue(q.hasWaitingConsumer());
899 <                threadAssertTrue(q.isEmpty());
900 <                threadAssertTrue(q.size() == 0);
1027 <                threadAssertTrue(q.tryTransfer(hotPotato));
898 >                assertTrue(q.hasWaitingConsumer());
899 >                checkEmpty(q);
900 >                assertTrue(q.tryTransfer(hotPotato));
901              }});
902  
903 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
903 >        long startTime = System.nanoTime();
904 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
905 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
906          checkEmpty(q);
907 <        t.join();
907 >        awaitTermination(t);
908      }
909  
910      /**
# Line 1041 | Line 916 | public class LinkedTransferQueueTest ext
916          final LinkedTransferQueue q = new LinkedTransferQueue();
917  
918          Thread t = newStartedThread(new CheckedRunnable() {
919 <            void realRun() {
919 >            public void realRun() {
920                  while (! q.hasWaitingConsumer())
921                      Thread.yield();
922 <                threadAssertTrue(q.hasWaitingConsumer());
923 <                threadAssertTrue(q.isEmpty());
924 <                threadAssertTrue(q.size() == 0);
1050 <                threadAssertTrue(q.tryTransfer(hotPotato));
922 >                assertTrue(q.hasWaitingConsumer());
923 >                checkEmpty(q);
924 >                assertTrue(q.tryTransfer(hotPotato));
925              }});
926  
927 <        assertTrue(q.take() == hotPotato);
927 >        assertSame(q.take(), hotPotato);
928          checkEmpty(q);
929 <        t.join();
929 >        awaitTermination(t);
930      }
931  
932      /**
933 <     * tryTransfer waits the amount given if interrupted, and
1060 <     * throws interrupted exception
933 >     * tryTransfer blocks interruptibly if no takers
934       */
935      public void testTryTransfer5() throws InterruptedException {
936          final LinkedTransferQueue q = new LinkedTransferQueue();
937 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
938 +        assertTrue(q.isEmpty());
939 +
940 +        Thread t = newStartedThread(new CheckedRunnable() {
941 +            public void realRun() throws InterruptedException {
942 +                long startTime = System.nanoTime();
943 +                Thread.currentThread().interrupt();
944 +                try {
945 +                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
946 +                    shouldThrow();
947 +                } catch (InterruptedException success) {}
948 +                assertFalse(Thread.interrupted());
949  
950 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
951 <            void realRun() throws InterruptedException {
952 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
950 >                pleaseInterrupt.countDown();
951 >                try {
952 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
953 >                    shouldThrow();
954 >                } catch (InterruptedException success) {}
955 >                assertFalse(Thread.interrupted());
956 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
957              }});
958  
959 <        Thread.sleep(SMALL_DELAY_MS);
960 <        toInterrupt.interrupt();
961 <        toInterrupt.join();
959 >        await(pleaseInterrupt);
960 >        assertThreadStaysAlive(t);
961 >        t.interrupt();
962 >        awaitTermination(t);
963 >        checkEmpty(q);
964      }
965  
966      /**
967 <     * tryTransfer gives up after the timeout and return false
967 >     * tryTransfer gives up after the timeout and returns false
968       */
969      public void testTryTransfer6() throws InterruptedException {
970          final LinkedTransferQueue q = new LinkedTransferQueue();
971  
972          Thread t = newStartedThread(new CheckedRunnable() {
973 <            void realRun() throws InterruptedException {
974 <                threadAssertFalse
975 <                    (q.tryTransfer(new Object(),
976 <                                   SHORT_DELAY_MS, MILLISECONDS));
973 >            public void realRun() throws InterruptedException {
974 >                long 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);
981 >        awaitTermination(t);
982          checkEmpty(q);
1090        t.join();
983      }
984  
985      /**
# Line 1099 | Line 991 | public class LinkedTransferQueueTest ext
991          assertTrue(q.offer(four));
992  
993          Thread t = newStartedThread(new CheckedRunnable() {
994 <            void realRun() throws InterruptedException {
995 <                threadAssertTrue(q.tryTransfer(five,
996 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
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);
1001 >        while (q.size() != 2)
1002 >            Thread.yield();
1003          assertEquals(2, q.size());
1004 <        assertEquals(four, q.poll());
1005 <        assertEquals(five, q.poll());
1004 >        assertSame(four, q.poll());
1005 >        assertSame(five, q.poll());
1006          checkEmpty(q);
1007 <        t.join();
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();
1016          assertTrue(q.offer(four));
1017          assertEquals(1, q.size());
1018 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1018 >        long startTime = System.nanoTime();
1019 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1020 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1021          assertEquals(1, q.size());
1022 <        assertEquals(four, q.poll());
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());
1028 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1029 >        checkEmpty(q);
1030          for (int i = 0; i < n; i++) {
1031              assertEquals(i, q.size());
1032              assertTrue(q.offer(i));
# Line 1139 | Line 1035 | public class LinkedTransferQueueTest ext
1035          assertFalse(q.isEmpty());
1036          return q;
1037      }
1038 +
1039 +    /**
1040 +     * remove(null), contains(null) always return false
1041 +     */
1042 +    public void testNeverContainsNull() {
1043 +        Collection<?>[] qs = {
1044 +            new LinkedTransferQueue<Object>(),
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