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.20 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.79 by jsr166, Fri Aug 4 03:30:21 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 pleaseInterrupt = 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));
288 <                    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 >
288 >                Thread.currentThread().interrupt();
289                  try {
290                      q.poll(LONG_DELAY_MS, MILLISECONDS);
291                      shouldThrow();
292                  } catch (InterruptedException success) {}
293 +                assertFalse(Thread.interrupted());
294 +
295 +                pleaseInterrupt.countDown();
296 +                try {
297 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
298 +                    shouldThrow();
299 +                } catch (InterruptedException success) {}
300 +                assertFalse(Thread.interrupted());
301 +
302 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
303              }});
304  
305 <        Thread.sleep(SMALL_DELAY_MS);
305 >        await(pleaseInterrupt);
306 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
307          t.interrupt();
308 <        t.join();
308 >        awaitTermination(t);
309          checkEmpty(q);
310      }
311  
312      /**
313 <     * timed poll before a delayed offer fails; after offer succeeds;
314 <     * on interruption throws
313 >     * timed poll after thread interrupted throws InterruptedException
314 >     * instead of returning timeout status
315       */
316 <    public void testTimedPollWithOffer() throws InterruptedException {
317 <        final LinkedTransferQueue q = new LinkedTransferQueue();
318 <        Thread t = new Thread(new CheckedRunnable() {
319 <            void realRun() throws InterruptedException {
320 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
321 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
316 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
317 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
318 >        Thread t = newStartedThread(new CheckedRunnable() {
319 >            public void realRun() throws InterruptedException {
320 >                long startTime = System.nanoTime();
321 >                Thread.currentThread().interrupt();
322 >                for (int i = 0; i < SIZE; ++i)
323 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
324                  try {
325                      q.poll(LONG_DELAY_MS, MILLISECONDS);
326                      shouldThrow();
327                  } catch (InterruptedException success) {}
328 +                assertFalse(Thread.interrupted());
329 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
330              }});
331  
332 <        t.start();
333 <        Thread.sleep(SMALL_DELAY_MS);
389 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
390 <        t.interrupt();
391 <        t.join();
332 >        awaitTermination(t);
333 >        checkEmpty(q);
334      }
335  
336      /**
# Line 438 | Line 380 | public class LinkedTransferQueueTest ext
380      }
381  
382      /**
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    /**
383       * An add following remove(x) succeeds
384       */
385      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 462 | Line 389 | public class LinkedTransferQueueTest ext
389          assertTrue(q.remove(one));
390          assertTrue(q.remove(two));
391          assertTrue(q.add(three));
392 <        assertTrue(q.take() == three);
392 >        assertSame(q.take(), three);
393      }
394  
395      /**
# Line 498 | Line 425 | public class LinkedTransferQueueTest ext
425       */
426      public void testContainsAll() {
427          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
428 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<Integer>();
428 >        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
429          for (int i = 0; i < SIZE; ++i) {
430              assertTrue(q.containsAll(p));
431              assertFalse(p.containsAll(q));
# Line 544 | Line 471 | public class LinkedTransferQueueTest ext
471      }
472  
473      /**
474 <     * toArray() contains all elements
474 >     * toArray() contains all elements in FIFO order
475       */
476 <    public void testToArray() throws InterruptedException {
476 >    public void testToArray() {
477          LinkedTransferQueue q = populatedQueue(SIZE);
478          Object[] o = q.toArray();
479          for (int i = 0; i < o.length; i++) {
480 <            assertEquals(o[i], q.take());
480 >            assertSame(o[i], q.poll());
481          }
482      }
483  
484      /**
485 <     * toArray(a) contains all elements
485 >     * toArray(a) contains all elements in FIFO order
486       */
487 <    public void testToArray2() throws InterruptedException {
487 >    public void testToArray2() {
488          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
489          Integer[] ints = new Integer[SIZE];
490 <        ints = q.toArray(ints);
490 >        Integer[] array = q.toArray(ints);
491 >        assertSame(ints, array);
492          for (int i = 0; i < ints.length; i++) {
493 <            assertEquals(ints[i], q.take());
493 >            assertSame(ints[i], q.poll());
494          }
495      }
496  
497      /**
498 <     * toArray(null) throws NullPointerException
571 <     */
572 <    public void testToArray_BadArg() {
573 <        LinkedTransferQueue q = populatedQueue(SIZE);
574 <        try {
575 <            Object o[] = q.toArray(null);
576 <            shouldThrow();
577 <        } catch (NullPointerException success) {}
578 <    }
579 <
580 <    /**
581 <     * toArray(incompatible array type) throws CCE
498 >     * toArray(incompatible array type) throws ArrayStoreException
499       */
500      public void testToArray1_BadArg() {
501          LinkedTransferQueue q = populatedQueue(SIZE);
502          try {
503 <            Object o[] = q.toArray(new String[10]);
503 >            q.toArray(new String[10]);
504              shouldThrow();
505          } catch (ArrayStoreException success) {}
506      }
# Line 594 | Line 511 | public class LinkedTransferQueueTest ext
511      public void testIterator() throws InterruptedException {
512          LinkedTransferQueue q = populatedQueue(SIZE);
513          Iterator it = q.iterator();
514 <        int i = 0;
515 <        while (it.hasNext()) {
516 <            assertEquals(it.next(), i++);
600 <        }
514 >        int i;
515 >        for (i = 0; it.hasNext(); i++)
516 >            assertTrue(q.contains(it.next()));
517          assertEquals(i, SIZE);
518 +        assertIteratorExhausted(it);
519 +
520 +        it = q.iterator();
521 +        for (i = 0; it.hasNext(); i++)
522 +            assertEquals(it.next(), q.take());
523 +        assertEquals(i, SIZE);
524 +        assertIteratorExhausted(it);
525 +    }
526 +
527 +    /**
528 +     * iterator of empty collection has no elements
529 +     */
530 +    public void testEmptyIterator() {
531 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
532      }
533  
534      /**
# Line 615 | Line 545 | public class LinkedTransferQueueTest ext
545          it.remove();
546  
547          it = q.iterator();
548 <        assertEquals(it.next(), one);
549 <        assertEquals(it.next(), three);
548 >        assertSame(it.next(), one);
549 >        assertSame(it.next(), three);
550          assertFalse(it.hasNext());
551      }
552  
# Line 624 | Line 554 | public class LinkedTransferQueueTest ext
554       * iterator ordering is FIFO
555       */
556      public void testIteratorOrdering() {
557 <        final LinkedTransferQueue<Integer> q
628 <            = new LinkedTransferQueue<Integer>();
557 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
558          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
559          q.add(one);
560          q.add(two);
# Line 660 | Line 589 | public class LinkedTransferQueueTest ext
589          LinkedTransferQueue q = populatedQueue(SIZE);
590          String s = q.toString();
591          for (int i = 0; i < SIZE; ++i) {
592 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
592 >            assertTrue(s.contains(String.valueOf(i)));
593          }
594      }
595  
# Line 669 | Line 598 | public class LinkedTransferQueueTest ext
598       */
599      public void testOfferInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601 <        q.add(one);
602 <        q.add(two);
603 <        ExecutorService executor = Executors.newFixedThreadPool(2);
604 <
605 <        executor.execute(new CheckedRunnable() {
606 <            void realRun() {
607 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
608 <                                         MILLISECONDS));
609 <            }});
610 <
611 <        executor.execute(new CheckedRunnable() {
683 <            void realRun() throws InterruptedException {
684 <                Thread.sleep(SMALL_DELAY_MS);
685 <                threadAssertEquals(one, q.take());
686 <            }});
601 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
603 >        try (PoolCleaner cleaner = cleaner(executor)) {
604 >
605 >            executor.execute(new CheckedRunnable() {
606 >                public void realRun() throws InterruptedException {
607 >                    threadsStarted.await();
608 >                    long startTime = System.nanoTime();
609 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
610 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
611 >                }});
612  
613 <        joinPool(executor);
613 >            executor.execute(new CheckedRunnable() {
614 >                public void realRun() throws InterruptedException {
615 >                    threadsStarted.await();
616 >                    assertSame(one, q.take());
617 >                    checkEmpty(q);
618 >                }});
619 >        }
620      }
621  
622      /**
# Line 693 | Line 624 | public class LinkedTransferQueueTest ext
624       */
625      public void testPollInExecutor() {
626          final LinkedTransferQueue q = new LinkedTransferQueue();
627 <        ExecutorService executor = Executors.newFixedThreadPool(2);
628 <
629 <        executor.execute(new CheckedRunnable() {
630 <            void realRun() throws InterruptedException {
631 <                threadAssertNull(q.poll());
632 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
633 <                                                MILLISECONDS));
634 <                threadAssertTrue(q.isEmpty());
635 <            }});
636 <
637 <        executor.execute(new CheckedRunnable() {
638 <            void realRun() throws InterruptedException {
639 <                Thread.sleep(SMALL_DELAY_MS);
709 <                q.put(one);
710 <            }});
627 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
628 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
629 >        try (PoolCleaner cleaner = cleaner(executor)) {
630 >
631 >            executor.execute(new CheckedRunnable() {
632 >                public void realRun() throws InterruptedException {
633 >                    assertNull(q.poll());
634 >                    threadsStarted.await();
635 >                    long startTime = System.nanoTime();
636 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
637 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
638 >                    checkEmpty(q);
639 >                }});
640  
641 <        joinPool(executor);
641 >            executor.execute(new CheckedRunnable() {
642 >                public void realRun() throws InterruptedException {
643 >                    threadsStarted.await();
644 >                    q.put(one);
645 >                }});
646 >        }
647      }
648  
649      /**
650 <     * A deserialized serialized queue has same elements in same order
650 >     * A deserialized/reserialized queue has same elements in same order
651       */
652      public void testSerialization() throws Exception {
653 <        LinkedTransferQueue q = populatedQueue(SIZE);
653 >        Queue x = populatedQueue(SIZE);
654 >        Queue y = serialClone(x);
655  
656 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
657 <        ObjectOutputStream out
658 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
659 <        out.writeObject(q);
660 <        out.close();
661 <
662 <        ByteArrayInputStream bin
728 <            = new ByteArrayInputStream(bout.toByteArray());
729 <        ObjectInputStream in
730 <            = new ObjectInputStream(new BufferedInputStream(bin));
731 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
732 <
733 <        assertEquals(q.size(), r.size());
734 <        while (!q.isEmpty()) {
735 <            assertEquals(q.remove(), r.remove());
656 >        assertNotSame(y, x);
657 >        assertEquals(x.size(), y.size());
658 >        assertEquals(x.toString(), y.toString());
659 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
660 >        while (!x.isEmpty()) {
661 >            assertFalse(y.isEmpty());
662 >            assertEquals(x.remove(), y.remove());
663          }
664 <    }
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) {}
664 >        assertTrue(y.isEmpty());
665      }
666  
667      /**
# Line 765 | Line 671 | public class LinkedTransferQueueTest ext
671          LinkedTransferQueue q = populatedQueue(SIZE);
672          ArrayList l = new ArrayList();
673          q.drainTo(l);
674 <        assertEquals(q.size(), 0);
675 <        assertEquals(l.size(), SIZE);
674 >        assertEquals(0, q.size());
675 >        assertEquals(SIZE, l.size());
676          for (int i = 0; i < SIZE; ++i) {
677 <            assertEquals(l.get(i), i);
677 >            assertEquals(i, l.get(i));
678          }
679          q.add(zero);
680          q.add(one);
# Line 777 | Line 683 | public class LinkedTransferQueueTest ext
683          assertTrue(q.contains(one));
684          l.clear();
685          q.drainTo(l);
686 <        assertEquals(q.size(), 0);
687 <        assertEquals(l.size(), 2);
686 >        assertEquals(0, q.size());
687 >        assertEquals(2, l.size());
688          for (int i = 0; i < 2; ++i) {
689 <            assertEquals(l.get(i), i);
689 >            assertEquals(i, l.get(i));
690          }
691      }
692  
# Line 790 | Line 696 | public class LinkedTransferQueueTest ext
696      public void testDrainToWithActivePut() throws InterruptedException {
697          final LinkedTransferQueue q = populatedQueue(SIZE);
698          Thread t = newStartedThread(new CheckedRunnable() {
699 <            void realRun() {
699 >            public void realRun() {
700                  q.put(SIZE + 1);
701              }});
702          ArrayList l = new ArrayList();
703          q.drainTo(l);
704          assertTrue(l.size() >= SIZE);
705 <        for (int i = 0; i < SIZE; ++i) {
706 <            assertEquals(l.get(i), i);
707 <        }
802 <        t.join();
705 >        for (int i = 0; i < SIZE; ++i)
706 >            assertEquals(i, l.get(i));
707 >        awaitTermination(t);
708          assertTrue(q.size() + l.size() >= SIZE);
709      }
710  
711      /**
712 <     * 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
712 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
713       */
714      public void testDrainToN() {
715          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 837 | Line 720 | public class LinkedTransferQueueTest ext
720              ArrayList l = new ArrayList();
721              q.drainTo(l, i);
722              int k = (i < SIZE) ? i : SIZE;
723 <            assertEquals(l.size(), k);
724 <            assertEquals(q.size(), SIZE - k);
725 <            for (int j = 0; j < k; ++j) {
726 <                assertEquals(l.get(j), j);
727 <            }
845 <            while (q.poll() != null)
846 <                ;
723 >            assertEquals(k, l.size());
724 >            assertEquals(SIZE - k, q.size());
725 >            for (int j = 0; j < k; ++j)
726 >                assertEquals(j, l.get(j));
727 >            do {} while (q.poll() != null);
728          }
729      }
730  
# Line 853 | Line 734 | public class LinkedTransferQueueTest ext
734       */
735      public void testWaitingConsumer() throws InterruptedException {
736          final LinkedTransferQueue q = new LinkedTransferQueue();
737 <        assertEquals(q.getWaitingConsumerCount(), 0);
737 >        assertEquals(0, q.getWaitingConsumerCount());
738          assertFalse(q.hasWaitingConsumer());
739 +        final CountDownLatch threadStarted = new CountDownLatch(1);
740  
741          Thread t = newStartedThread(new CheckedRunnable() {
742 <            void realRun() throws InterruptedException {
743 <                Thread.sleep(SMALL_DELAY_MS);
744 <                threadAssertTrue(q.hasWaitingConsumer());
745 <                threadAssertEquals(q.getWaitingConsumerCount(), 1);
746 <                threadAssertTrue(q.offer(new Object()));
747 <                threadAssertFalse(q.hasWaitingConsumer());
748 <                threadAssertEquals(q.getWaitingConsumerCount(), 0);
742 >            public void realRun() throws InterruptedException {
743 >                threadStarted.countDown();
744 >                long startTime = System.nanoTime();
745 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
746 >                assertEquals(0, q.getWaitingConsumerCount());
747 >                assertFalse(q.hasWaitingConsumer());
748 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
749              }});
750  
751 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
752 <        assertEquals(q.getWaitingConsumerCount(), 0);
751 >        threadStarted.await();
752 >        Callable<Boolean> oneConsumer
753 >            = new Callable<Boolean>() { public Boolean call() {
754 >                return q.hasWaitingConsumer()
755 >                && q.getWaitingConsumerCount() == 1; }};
756 >        waitForThreadToEnterWaitState(t, oneConsumer);
757 >
758 >        assertTrue(q.offer(one));
759 >        assertEquals(0, q.getWaitingConsumerCount());
760          assertFalse(q.hasWaitingConsumer());
761 <        t.join();
761 >
762 >        awaitTermination(t);
763      }
764  
765      /**
# Line 885 | Line 775 | public class LinkedTransferQueueTest ext
775  
776      /**
777       * transfer waits until a poll occurs. The transfered element
778 <     * is returned by this associated poll.
778 >     * is returned by the associated poll.
779       */
780      public void testTransfer2() throws InterruptedException {
781 <        final LinkedTransferQueue<Integer> q
782 <            = new LinkedTransferQueue<Integer>();
781 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
782 >        final CountDownLatch threadStarted = new CountDownLatch(1);
783  
784          Thread t = newStartedThread(new CheckedRunnable() {
785 <            void realRun() throws InterruptedException {
786 <                q.transfer(SIZE);
787 <                threadAssertTrue(q.isEmpty());
785 >            public void realRun() throws InterruptedException {
786 >                threadStarted.countDown();
787 >                q.transfer(five);
788 >                checkEmpty(q);
789              }});
790  
791 <        Thread.sleep(SHORT_DELAY_MS);
792 <        assertEquals(1, q.size());
793 <        assertEquals(SIZE, (int) q.poll());
794 <        assertTrue(q.isEmpty());
795 <        t.join();
791 >        threadStarted.await();
792 >        Callable<Boolean> oneElement
793 >            = new Callable<Boolean>() { public Boolean call() {
794 >                return !q.isEmpty() && q.size() == 1; }};
795 >        waitForThreadToEnterWaitState(t, oneElement);
796 >
797 >        assertSame(five, q.poll());
798 >        checkEmpty(q);
799 >        awaitTermination(t);
800      }
801  
802      /**
803       * transfer waits until a poll occurs, and then transfers in fifo order
804       */
805      public void testTransfer3() throws InterruptedException {
806 <        final LinkedTransferQueue<Integer> q
912 <            = new LinkedTransferQueue<Integer>();
806 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
807  
808          Thread first = newStartedThread(new CheckedRunnable() {
809 <            void realRun() throws InterruptedException {
810 <                Integer i = SIZE + 1;
811 <                q.transfer(i);
812 <                threadAssertTrue(!q.contains(i));
919 <                threadAssertEquals(1, q.size());
809 >            public void realRun() throws InterruptedException {
810 >                q.transfer(four);
811 >                assertFalse(q.contains(four));
812 >                assertEquals(1, q.size());
813              }});
814  
815          Thread interruptedThread = newStartedThread(
816              new CheckedInterruptedRunnable() {
817 <                void realRun() throws InterruptedException {
818 <                    while (q.size() == 0)
817 >                public void realRun() throws InterruptedException {
818 >                    while (q.isEmpty())
819                          Thread.yield();
820 <                    q.transfer(SIZE);
820 >                    q.transfer(five);
821                  }});
822  
823          while (q.size() < 2)
824              Thread.yield();
825          assertEquals(2, q.size());
826 <        assertEquals(SIZE + 1, (int) q.poll());
826 >        assertSame(four, q.poll());
827          first.join();
828          assertEquals(1, q.size());
829          interruptedThread.interrupt();
830          interruptedThread.join();
831 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
831 >        checkEmpty(q);
832      }
833  
834      /**
# Line 947 | Line 839 | public class LinkedTransferQueueTest ext
839          final LinkedTransferQueue q = new LinkedTransferQueue();
840  
841          Thread t = newStartedThread(new CheckedRunnable() {
842 <            void realRun() throws InterruptedException {
842 >            public void realRun() throws InterruptedException {
843                  q.transfer(four);
844 <                threadAssertFalse(q.contains(four));
845 <                threadAssertEquals(three, q.poll());
844 >                assertFalse(q.contains(four));
845 >                assertSame(three, q.poll());
846              }});
847  
848 <        Thread.sleep(SHORT_DELAY_MS);
848 >        while (q.isEmpty())
849 >            Thread.yield();
850 >        assertFalse(q.isEmpty());
851 >        assertEquals(1, q.size());
852          assertTrue(q.offer(three));
853 <        assertEquals(four, q.poll());
854 <        t.join();
853 >        assertSame(four, q.poll());
854 >        awaitTermination(t);
855      }
856  
857      /**
858       * transfer waits until a take occurs. The transfered element
859 <     * is returned by this associated take.
859 >     * is returned by the associated take.
860       */
861      public void testTransfer5() throws InterruptedException {
862 <        final LinkedTransferQueue<Integer> q
968 <            = new LinkedTransferQueue<Integer>();
862 >        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
863  
864          Thread t = newStartedThread(new CheckedRunnable() {
865 <            void realRun() throws InterruptedException {
866 <                q.transfer(SIZE);
865 >            public void realRun() throws InterruptedException {
866 >                q.transfer(four);
867                  checkEmpty(q);
868              }});
869  
870 <        Thread.sleep(SHORT_DELAY_MS);
871 <        assertEquals(SIZE, (int) q.take());
870 >        while (q.isEmpty())
871 >            Thread.yield();
872 >        assertFalse(q.isEmpty());
873 >        assertEquals(1, q.size());
874 >        assertSame(four, q.take());
875          checkEmpty(q);
876 <        t.join();
876 >        awaitTermination(t);
877      }
878  
879      /**
880       * tryTransfer(null) throws NullPointerException
881       */
882      public void testTryTransfer1() {
883 +        final LinkedTransferQueue q = new LinkedTransferQueue();
884          try {
987            final LinkedTransferQueue q = new LinkedTransferQueue();
885              q.tryTransfer(null);
886              shouldThrow();
887          } catch (NullPointerException success) {}
# Line 1010 | Line 907 | public class LinkedTransferQueueTest ext
907          final LinkedTransferQueue q = new LinkedTransferQueue();
908  
909          Thread t = newStartedThread(new CheckedRunnable() {
910 <            void realRun() {
910 >            public void realRun() {
911                  while (! q.hasWaitingConsumer())
912                      Thread.yield();
913 <                threadAssertTrue(q.hasWaitingConsumer());
914 <                threadAssertTrue(q.isEmpty());
915 <                threadAssertTrue(q.size() == 0);
1019 <                threadAssertTrue(q.tryTransfer(hotPotato));
913 >                assertTrue(q.hasWaitingConsumer());
914 >                checkEmpty(q);
915 >                assertTrue(q.tryTransfer(hotPotato));
916              }});
917  
918 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
918 >        long startTime = System.nanoTime();
919 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
920 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
921          checkEmpty(q);
922 <        t.join();
922 >        awaitTermination(t);
923      }
924  
925      /**
# Line 1033 | Line 931 | public class LinkedTransferQueueTest ext
931          final LinkedTransferQueue q = new LinkedTransferQueue();
932  
933          Thread t = newStartedThread(new CheckedRunnable() {
934 <            void realRun() {
934 >            public void realRun() {
935                  while (! q.hasWaitingConsumer())
936                      Thread.yield();
937 <                threadAssertTrue(q.hasWaitingConsumer());
938 <                threadAssertTrue(q.isEmpty());
939 <                threadAssertTrue(q.size() == 0);
1042 <                threadAssertTrue(q.tryTransfer(hotPotato));
937 >                assertTrue(q.hasWaitingConsumer());
938 >                checkEmpty(q);
939 >                assertTrue(q.tryTransfer(hotPotato));
940              }});
941  
942 <        assertTrue(q.take() == hotPotato);
942 >        assertSame(q.take(), hotPotato);
943          checkEmpty(q);
944 <        t.join();
944 >        awaitTermination(t);
945      }
946  
947      /**
948 <     * tryTransfer waits the amount given if interrupted, and
1052 <     * throws interrupted exception
948 >     * tryTransfer blocks interruptibly if no takers
949       */
950      public void testTryTransfer5() throws InterruptedException {
951          final LinkedTransferQueue q = new LinkedTransferQueue();
952 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
953 +        assertTrue(q.isEmpty());
954  
955 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
956 <            void realRun() throws InterruptedException {
957 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
955 >        Thread t = newStartedThread(new CheckedRunnable() {
956 >            public void realRun() throws InterruptedException {
957 >                long startTime = System.nanoTime();
958 >                Thread.currentThread().interrupt();
959 >                try {
960 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
961 >                    shouldThrow();
962 >                } catch (InterruptedException success) {}
963 >                assertFalse(Thread.interrupted());
964 >
965 >                pleaseInterrupt.countDown();
966 >                try {
967 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
968 >                    shouldThrow();
969 >                } catch (InterruptedException success) {}
970 >                assertFalse(Thread.interrupted());
971 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
972              }});
973  
974 <        Thread.sleep(SMALL_DELAY_MS);
975 <        toInterrupt.interrupt();
976 <        toInterrupt.join();
974 >        await(pleaseInterrupt);
975 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
976 >        t.interrupt();
977 >        awaitTermination(t);
978 >        checkEmpty(q);
979      }
980  
981      /**
982 <     * tryTransfer gives up after the timeout and return false
982 >     * tryTransfer gives up after the timeout and returns false
983       */
984      public void testTryTransfer6() throws InterruptedException {
985          final LinkedTransferQueue q = new LinkedTransferQueue();
986  
987          Thread t = newStartedThread(new CheckedRunnable() {
988 <            void realRun() throws InterruptedException {
989 <                threadAssertFalse
990 <                    (q.tryTransfer(new Object(),
991 <                                   SHORT_DELAY_MS, MILLISECONDS));
988 >            public void realRun() throws InterruptedException {
989 >                long startTime = System.nanoTime();
990 >                assertFalse(q.tryTransfer(new Object(),
991 >                                          timeoutMillis(), MILLISECONDS));
992 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
993 >                checkEmpty(q);
994              }});
995  
996 <        Thread.sleep(SMALL_DELAY_MS);
996 >        awaitTermination(t);
997          checkEmpty(q);
1082        t.join();
998      }
999  
1000      /**
# Line 1091 | Line 1006 | public class LinkedTransferQueueTest ext
1006          assertTrue(q.offer(four));
1007  
1008          Thread t = newStartedThread(new CheckedRunnable() {
1009 <            void realRun() throws InterruptedException {
1010 <                threadAssertTrue(q.tryTransfer(five,
1011 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1012 <                threadAssertTrue(q.isEmpty());
1009 >            public void realRun() throws InterruptedException {
1010 >                long startTime = System.nanoTime();
1011 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1012 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1013 >                checkEmpty(q);
1014              }});
1015  
1016 <        Thread.sleep(SHORT_DELAY_MS);
1016 >        while (q.size() != 2)
1017 >            Thread.yield();
1018          assertEquals(2, q.size());
1019 <        assertEquals(four, q.poll());
1020 <        assertEquals(five, q.poll());
1019 >        assertSame(four, q.poll());
1020 >        assertSame(five, q.poll());
1021          checkEmpty(q);
1022 <        t.join();
1022 >        awaitTermination(t);
1023      }
1024  
1025      /**
1026 <     * tryTransfer attempts to enqueue into the q and fails returning
1027 <     * false not enqueueing and the successive poll is null
1026 >     * tryTransfer attempts to enqueue into the queue and fails
1027 >     * returning false not enqueueing and the successive poll is null
1028       */
1029      public void testTryTransfer8() throws InterruptedException {
1030          final LinkedTransferQueue q = new LinkedTransferQueue();
1031          assertTrue(q.offer(four));
1032          assertEquals(1, q.size());
1033 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1033 >        long startTime = System.nanoTime();
1034 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1035 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1036          assertEquals(1, q.size());
1037 <        assertEquals(four, q.poll());
1037 >        assertSame(four, q.poll());
1038          assertNull(q.poll());
1039          checkEmpty(q);
1040      }
1041  
1042      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1043 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1044 <        assertTrue(q.isEmpty());
1043 >        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1044 >        checkEmpty(q);
1045          for (int i = 0; i < n; i++) {
1046              assertEquals(i, q.size());
1047              assertTrue(q.offer(i));
# Line 1131 | Line 1050 | public class LinkedTransferQueueTest ext
1050          assertFalse(q.isEmpty());
1051          return q;
1052      }
1053 +
1054 +    /**
1055 +     * remove(null), contains(null) always return false
1056 +     */
1057 +    public void testNeverContainsNull() {
1058 +        Collection<?>[] qs = {
1059 +            new LinkedTransferQueue<Object>(),
1060 +            populatedQueue(2),
1061 +        };
1062 +
1063 +        for (Collection<?> q : qs) {
1064 +            assertFalse(q.contains(null));
1065 +            assertFalse(q.remove(null));
1066 +        }
1067 +    }
1068   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines