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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines