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.25 by jsr166, Wed Oct 6 07:49:22 2010 UTC vs.
Revision 1.66 by jsr166, Sun Oct 18 04:48:32 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11   import java.util.Arrays;
12 + import java.util.Collection;
13   import java.util.Iterator;
14   import java.util.List;
15   import java.util.NoSuchElementException;
16 < import java.util.concurrent.*;
17 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
16 > import java.util.Queue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedTransferQueue;
22 >
23   import junit.framework.Test;
22 import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
27 +    static class Implementation implements CollectionImplementation {
28 +        public Class<?> klazz() { return LinkedTransferQueue.class; }
29 +        public Collection emptyCollection() { return new LinkedTransferQueue(); }
30 +        public Object makeElement(int i) { return i; }
31 +        public boolean isConcurrent() { return true; }
32 +        public boolean permitsNulls() { return false; }
33 +    }
34  
35      public static class Generic extends BlockingQueueTest {
36          protected BlockingQueue emptyCollection() {
# Line 31 | Line 39 | public class LinkedTransferQueueTest ext
39      }
40  
41      public static void main(String[] args) {
42 <        junit.textui.TestRunner.run(suite());
42 >        main(suite(), args);
43      }
44  
45      public static Test suite() {
46          return newTestSuite(LinkedTransferQueueTest.class,
47 <                            new Generic().testSuite());
48 <    }
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(), "[]");
49 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
50 <        assertFalse(q.iterator().hasNext());
51 <        try {
52 <            q.element();
53 <            shouldThrow();
54 <        } catch (NoSuchElementException success) {}
55 <        try {
56 <            q.iterator().next();
57 <            shouldThrow();
58 <        } catch (NoSuchElementException success) {}
59 <        try {
60 <            q.remove();
61 <            shouldThrow();
62 <        } catch (NoSuchElementException success) {}
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
# Line 87 | 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];
92 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80          } catch (NullPointerException success) {}
81      }
# Line 99 | 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];
104 <            for (int i = 0; i < SIZE - 1; ++i) {
105 <                ints[i] = i;
106 <            }
107 <            new LinkedTransferQueue(Arrays.asList(ints));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95          } catch (NullPointerException success) {}
96      }
# Line 137 | 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      /**
154     * offer(null) throws NullPointerException
155     */
156    public void testOfferNull() {
157        try {
158            LinkedTransferQueue q = new LinkedTransferQueue();
159            q.offer(null);
160            shouldThrow();
161        } catch (NullPointerException success) {}
162    }
163
164    /**
165     * add(null) throws NullPointerException
166     */
167    public void testAddNull() {
168        try {
169            LinkedTransferQueue q = new LinkedTransferQueue();
170            q.add(null);
171            shouldThrow();
172        } catch (NullPointerException success) {}
173    }
174
175    /**
176     * addAll(null) throws NullPointerException
177     */
178    public void testAddAll1() {
179        try {
180            LinkedTransferQueue q = new LinkedTransferQueue();
181            q.addAll(null);
182            shouldThrow();
183        } catch (NullPointerException success) {}
184    }
185
186    /**
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
191            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147          } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
198     * addAll of a collection with null elements throws NullPointerException
199     */
200    public void testAddAll2() {
201        try {
202            LinkedTransferQueue q = new LinkedTransferQueue();
203            Integer[] ints = new Integer[SIZE];
204            q.addAll(Arrays.asList(ints));
205            shouldThrow();
206        } catch (NullPointerException success) {}
207    }
208
209    /**
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 {
215            LinkedTransferQueue q = new LinkedTransferQueue();
216            Integer[] ints = new Integer[SIZE];
217            for (int i = 0; i < SIZE - 1; ++i) {
218                ints[i] = i;
219            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
# Line 240 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
243     * put(null) throws NullPointerException
244     */
245    public void testPutNull() throws InterruptedException {
246        try {
247            LinkedTransferQueue q = new LinkedTransferQueue();
248            q.put(null);
249            shouldThrow();
250        } catch (NullPointerException success) {}
251    }
252
253    /**
183       * all elements successfully put are contained
184       */
185      public void testPut() {
186          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
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 273 | Line 202 | public class LinkedTransferQueueTest ext
202      }
203  
204      /**
205 <     * take blocks interruptibly when empty
277 <     */
278 <    public void testTakeFromEmpty() throws InterruptedException {
279 <        final LinkedTransferQueue q = new LinkedTransferQueue();
280 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
281 <            public void realRun() throws InterruptedException {
282 <                q.take();
283 <            }});
284 <        Thread.sleep(SHORT_DELAY_MS);
285 <        t.interrupt();
286 <        t.join();
287 <    }
288 <
289 <    /**
290 <     * 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());
213 >                    assertEquals(i, q.take());
214                  }
215 +
216 +                Thread.currentThread().interrupt();
217 +                try {
218 +                    q.take();
219 +                    shouldThrow();
220 +                } catch (InterruptedException success) {}
221 +                assertFalse(Thread.interrupted());
222 +
223 +                pleaseInterrupt.countDown();
224                  try {
225                      q.take();
226                      shouldThrow();
227                  } catch (InterruptedException success) {}
228 +                assertFalse(Thread.interrupted());
229              }});
230  
231 <        t.start();
232 <        Thread.sleep(SHORT_DELAY_MS);
231 >        await(pleaseInterrupt);
232 >        assertThreadStaysAlive(t);
233          t.interrupt();
234 <        t.join();
309 <        checkEmpty(q);
234 >        awaitTermination(t);
235      }
236  
237      /**
# Line 322 | Line 247 | public class LinkedTransferQueueTest ext
247      }
248  
249      /**
250 <     * timed pool with zero timeout succeeds when non-empty, else times out
250 >     * timed poll with zero timeout succeeds when non-empty, else times out
251       */
252      public void testTimedPoll0() throws InterruptedException {
253          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 334 | Line 259 | public class LinkedTransferQueueTest ext
259      }
260  
261      /**
262 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
262 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
263       */
264      public void testTimedPoll() throws InterruptedException {
265          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
266 <        for (int i = 0; i < SIZE; ++i) {
267 <            long t0 = System.nanoTime();
266 >        long startTime = System.nanoTime();
267 >        for (int i = 0; i < SIZE; ++i)
268              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
269 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
270 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
271 <        }
272 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
269 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
270 >
271 >        startTime = System.nanoTime();
272 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
273 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
274          checkEmpty(q);
275      }
276  
# Line 353 | Line 279 | public class LinkedTransferQueueTest ext
279       * returning timeout status
280       */
281      public void testInterruptedTimedPoll() throws InterruptedException {
282 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
282 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
283 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
284          Thread t = newStartedThread(new CheckedRunnable() {
285              public void realRun() throws InterruptedException {
286 <                for (int i = 0; i < SIZE; ++i) {
287 <                    long t0 = System.nanoTime();
286 >                long startTime = System.nanoTime();
287 >                for (int i = 0; i < SIZE; ++i)
288                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
289 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
363 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
364 <                }
289 >                aboutToWait.countDown();
290                  try {
291                      q.poll(LONG_DELAY_MS, MILLISECONDS);
292                      shouldThrow();
293                  } catch (InterruptedException success) {}
294 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
295              }});
296  
297 <        Thread.sleep(SMALL_DELAY_MS);
297 >        aboutToWait.await();
298 >        waitForThreadToEnterWaitState(t);
299          t.interrupt();
300 <        t.join();
300 >        awaitTermination(t);
301 >        checkEmpty(q);
302 >    }
303 >
304 >    /**
305 >     * timed poll after thread interrupted throws InterruptedException
306 >     * instead of returning timeout status
307 >     */
308 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
309 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
310 >        Thread t = newStartedThread(new CheckedRunnable() {
311 >            public void realRun() throws InterruptedException {
312 >                long startTime = System.nanoTime();
313 >                Thread.currentThread().interrupt();
314 >                for (int i = 0; i < SIZE; ++i)
315 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
316 >                try {
317 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
318 >                    shouldThrow();
319 >                } catch (InterruptedException success) {}
320 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
321 >            }});
322 >
323 >        awaitTermination(t);
324          checkEmpty(q);
325      }
326  
# Line 421 | Line 371 | public class LinkedTransferQueueTest ext
371      }
372  
373      /**
424     * remove(x) removes x and returns true if present
425     */
426    public void testRemoveElement() throws InterruptedException {
427        LinkedTransferQueue q = populatedQueue(SIZE);
428        for (int i = 1; i < SIZE; i += 2) {
429            assertTrue(q.remove(i));
430        }
431        for (int i = 0; i < SIZE; i += 2) {
432            assertTrue(q.remove(i));
433            assertFalse(q.remove(i + 1));
434        }
435        checkEmpty(q);
436    }
437
438    /**
374       * An add following remove(x) succeeds
375       */
376      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 527 | Line 462 | public class LinkedTransferQueueTest ext
462      }
463  
464      /**
465 <     * toArray() contains all elements
465 >     * toArray() contains all elements in FIFO order
466       */
467 <    public void testToArray() throws InterruptedException {
467 >    public void testToArray() {
468          LinkedTransferQueue q = populatedQueue(SIZE);
469          Object[] o = q.toArray();
470          for (int i = 0; i < o.length; i++) {
471 <            assertEquals(o[i], q.take());
471 >            assertSame(o[i], q.poll());
472          }
473      }
474  
475      /**
476 <     * toArray(a) contains all elements
476 >     * toArray(a) contains all elements in FIFO order
477       */
478 <    public void testToArray2() throws InterruptedException {
478 >    public void testToArray2() {
479          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
480          Integer[] ints = new Integer[SIZE];
481 <        ints = q.toArray(ints);
481 >        Integer[] array = q.toArray(ints);
482 >        assertSame(ints, array);
483          for (int i = 0; i < ints.length; i++) {
484 <            assertEquals(ints[i], q.take());
484 >            assertSame(ints[i], q.poll());
485          }
486      }
487  
488      /**
489 <     * toArray(null) throws NullPointerException
554 <     */
555 <    public void testToArray_BadArg() {
556 <        LinkedTransferQueue q = populatedQueue(SIZE);
557 <        try {
558 <            Object o[] = q.toArray(null);
559 <            shouldThrow();
560 <        } catch (NullPointerException success) {}
561 <    }
562 <
563 <    /**
564 <     * toArray(incompatible array type) throws CCE
489 >     * toArray(incompatible array type) throws ArrayStoreException
490       */
491      public void testToArray1_BadArg() {
492          LinkedTransferQueue q = populatedQueue(SIZE);
493          try {
494 <            Object o[] = q.toArray(new String[10]);
494 >            q.toArray(new String[10]);
495              shouldThrow();
496          } catch (ArrayStoreException success) {}
497      }
# Line 577 | Line 502 | public class LinkedTransferQueueTest ext
502      public void testIterator() throws InterruptedException {
503          LinkedTransferQueue q = populatedQueue(SIZE);
504          Iterator it = q.iterator();
505 <        int i = 0;
506 <        while (it.hasNext()) {
507 <            assertEquals(it.next(), i++);
583 <        }
505 >        int i;
506 >        for (i = 0; it.hasNext(); i++)
507 >            assertTrue(q.contains(it.next()));
508          assertEquals(i, SIZE);
509 +        assertIteratorExhausted(it);
510 +
511 +        it = q.iterator();
512 +        for (i = 0; it.hasNext(); i++)
513 +            assertEquals(it.next(), q.take());
514 +        assertEquals(i, SIZE);
515 +        assertIteratorExhausted(it);
516 +    }
517 +
518 +    /**
519 +     * iterator of empty collection has no elements
520 +     */
521 +    public void testEmptyIterator() {
522 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
523      }
524  
525      /**
# Line 643 | Line 581 | public class LinkedTransferQueueTest ext
581          LinkedTransferQueue q = populatedQueue(SIZE);
582          String s = q.toString();
583          for (int i = 0; i < SIZE; ++i) {
584 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
584 >            assertTrue(s.contains(String.valueOf(i)));
585          }
586      }
587  
# Line 652 | Line 590 | public class LinkedTransferQueueTest ext
590       */
591      public void testOfferInExecutor() {
592          final LinkedTransferQueue q = new LinkedTransferQueue();
593 <        q.add(one);
594 <        q.add(two);
595 <        ExecutorService executor = Executors.newFixedThreadPool(2);
658 <
659 <        executor.execute(new CheckedRunnable() {
660 <            public void realRun() {
661 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
662 <            }});
593 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
594 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
595 >        try (PoolCleaner cleaner = cleaner(executor)) {
596  
597 <        executor.execute(new CheckedRunnable() {
598 <            public void realRun() throws InterruptedException {
599 <                Thread.sleep(SMALL_DELAY_MS);
600 <                assertSame(one, q.take());
601 <            }});
597 >            executor.execute(new CheckedRunnable() {
598 >                public void realRun() throws InterruptedException {
599 >                    threadsStarted.await();
600 >                    long startTime = System.nanoTime();
601 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
602 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
603 >                }});
604  
605 <        joinPool(executor);
605 >            executor.execute(new CheckedRunnable() {
606 >                public void realRun() throws InterruptedException {
607 >                    threadsStarted.await();
608 >                    assertSame(one, q.take());
609 >                    checkEmpty(q);
610 >                }});
611 >        }
612      }
613  
614      /**
# Line 675 | Line 616 | public class LinkedTransferQueueTest ext
616       */
617      public void testPollInExecutor() {
618          final LinkedTransferQueue q = new LinkedTransferQueue();
619 <        ExecutorService executor = Executors.newFixedThreadPool(2);
620 <
621 <        executor.execute(new CheckedRunnable() {
681 <            public void realRun() throws InterruptedException {
682 <                assertNull(q.poll());
683 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
684 <                assertTrue(q.isEmpty());
685 <            }});
619 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
620 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
621 >        try (PoolCleaner cleaner = cleaner(executor)) {
622  
623 <        executor.execute(new CheckedRunnable() {
624 <            public void realRun() throws InterruptedException {
625 <                Thread.sleep(SMALL_DELAY_MS);
626 <                q.put(one);
627 <            }});
623 >            executor.execute(new CheckedRunnable() {
624 >                public void realRun() throws InterruptedException {
625 >                    assertNull(q.poll());
626 >                    threadsStarted.await();
627 >                    long startTime = System.nanoTime();
628 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
629 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
630 >                    checkEmpty(q);
631 >                }});
632  
633 <        joinPool(executor);
633 >            executor.execute(new CheckedRunnable() {
634 >                public void realRun() throws InterruptedException {
635 >                    threadsStarted.await();
636 >                    q.put(one);
637 >                }});
638 >        }
639      }
640  
641      /**
642       * A deserialized serialized queue has same elements in same order
643       */
644      public void testSerialization() throws Exception {
645 <        LinkedTransferQueue q = populatedQueue(SIZE);
645 >        Queue x = populatedQueue(SIZE);
646 >        Queue y = serialClone(x);
647  
648 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
649 <        ObjectOutputStream out
650 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
651 <        out.writeObject(q);
652 <        out.close();
653 <
654 <        ByteArrayInputStream bin
709 <            = new ByteArrayInputStream(bout.toByteArray());
710 <        ObjectInputStream in
711 <            = new ObjectInputStream(new BufferedInputStream(bin));
712 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
713 <
714 <        assertEquals(q.size(), r.size());
715 <        while (!q.isEmpty()) {
716 <            assertEquals(q.remove(), r.remove());
648 >        assertNotSame(y, x);
649 >        assertEquals(x.size(), y.size());
650 >        assertEquals(x.toString(), y.toString());
651 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
652 >        while (!x.isEmpty()) {
653 >            assertFalse(y.isEmpty());
654 >            assertEquals(x.remove(), y.remove());
655          }
656 <    }
719 <
720 <    /**
721 <     * drainTo(null) throws NullPointerException
722 <     */
723 <    public void testDrainToNull() {
724 <        LinkedTransferQueue q = populatedQueue(SIZE);
725 <        try {
726 <            q.drainTo(null);
727 <            shouldThrow();
728 <        } catch (NullPointerException success) {}
729 <    }
730 <
731 <    /**
732 <     * drainTo(this) throws IllegalArgumentException
733 <     */
734 <    public void testDrainToSelf() {
735 <        LinkedTransferQueue q = populatedQueue(SIZE);
736 <        try {
737 <            q.drainTo(q);
738 <            shouldThrow();
739 <        } catch (IllegalArgumentException success) {}
656 >        assertTrue(y.isEmpty());
657      }
658  
659      /**
# Line 746 | Line 663 | public class LinkedTransferQueueTest ext
663          LinkedTransferQueue q = populatedQueue(SIZE);
664          ArrayList l = new ArrayList();
665          q.drainTo(l);
666 <        assertEquals(q.size(), 0);
667 <        assertEquals(l.size(), SIZE);
666 >        assertEquals(0, q.size());
667 >        assertEquals(SIZE, l.size());
668          for (int i = 0; i < SIZE; ++i) {
669 <            assertEquals(l.get(i), i);
669 >            assertEquals(i, l.get(i));
670          }
671          q.add(zero);
672          q.add(one);
# Line 758 | Line 675 | public class LinkedTransferQueueTest ext
675          assertTrue(q.contains(one));
676          l.clear();
677          q.drainTo(l);
678 <        assertEquals(q.size(), 0);
679 <        assertEquals(l.size(), 2);
678 >        assertEquals(0, q.size());
679 >        assertEquals(2, l.size());
680          for (int i = 0; i < 2; ++i) {
681 <            assertEquals(l.get(i), i);
681 >            assertEquals(i, l.get(i));
682          }
683      }
684  
# Line 777 | Line 694 | public class LinkedTransferQueueTest ext
694          ArrayList l = new ArrayList();
695          q.drainTo(l);
696          assertTrue(l.size() >= SIZE);
697 <        for (int i = 0; i < SIZE; ++i) {
698 <            assertEquals(l.get(i), i);
699 <        }
783 <        t.join();
697 >        for (int i = 0; i < SIZE; ++i)
698 >            assertEquals(i, l.get(i));
699 >        awaitTermination(t);
700          assertTrue(q.size() + l.size() >= SIZE);
701      }
702  
703      /**
704 <     * drainTo(null, n) throws NullPointerException
789 <     */
790 <    public void testDrainToNullN() {
791 <        LinkedTransferQueue q = populatedQueue(SIZE);
792 <        try {
793 <            q.drainTo(null, SIZE);
794 <            shouldThrow();
795 <        } catch (NullPointerException success) {}
796 <    }
797 <
798 <    /**
799 <     * drainTo(this, n) throws IllegalArgumentException
800 <     */
801 <    public void testDrainToSelfN() {
802 <        LinkedTransferQueue q = populatedQueue(SIZE);
803 <        try {
804 <            q.drainTo(q, SIZE);
805 <            shouldThrow();
806 <        } catch (IllegalArgumentException success) {}
807 <    }
808 <
809 <    /**
810 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
704 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
705       */
706      public void testDrainToN() {
707          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 818 | Line 712 | public class LinkedTransferQueueTest ext
712              ArrayList l = new ArrayList();
713              q.drainTo(l, i);
714              int k = (i < SIZE) ? i : SIZE;
715 <            assertEquals(l.size(), k);
716 <            assertEquals(q.size(), SIZE - k);
717 <            for (int j = 0; j < k; ++j) {
718 <                assertEquals(l.get(j), j);
719 <            }
826 <            while (q.poll() != null)
827 <                ;
715 >            assertEquals(k, l.size());
716 >            assertEquals(SIZE - k, q.size());
717 >            for (int j = 0; j < k; ++j)
718 >                assertEquals(j, l.get(j));
719 >            do {} while (q.poll() != null);
720          }
721      }
722  
# Line 834 | Line 726 | public class LinkedTransferQueueTest ext
726       */
727      public void testWaitingConsumer() throws InterruptedException {
728          final LinkedTransferQueue q = new LinkedTransferQueue();
729 <        assertEquals(q.getWaitingConsumerCount(), 0);
729 >        assertEquals(0, q.getWaitingConsumerCount());
730          assertFalse(q.hasWaitingConsumer());
731 +        final CountDownLatch threadStarted = new CountDownLatch(1);
732  
733          Thread t = newStartedThread(new CheckedRunnable() {
734              public void realRun() throws InterruptedException {
735 <                Thread.sleep(SMALL_DELAY_MS);
736 <                assertTrue(q.hasWaitingConsumer());
737 <                assertEquals(q.getWaitingConsumerCount(), 1);
738 <                assertTrue(q.offer(one));
735 >                threadStarted.countDown();
736 >                long startTime = System.nanoTime();
737 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
738 >                assertEquals(0, q.getWaitingConsumerCount());
739                  assertFalse(q.hasWaitingConsumer());
740 <                assertEquals(q.getWaitingConsumerCount(), 0);
740 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
741              }});
742  
743 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
744 <        assertEquals(q.getWaitingConsumerCount(), 0);
743 >        threadStarted.await();
744 >        waitForThreadToEnterWaitState(t);
745 >        assertEquals(1, q.getWaitingConsumerCount());
746 >        assertTrue(q.hasWaitingConsumer());
747 >
748 >        assertTrue(q.offer(one));
749 >        assertEquals(0, q.getWaitingConsumerCount());
750          assertFalse(q.hasWaitingConsumer());
751 <        t.join();
751 >
752 >        awaitTermination(t);
753      }
754  
755      /**
# Line 871 | Line 770 | public class LinkedTransferQueueTest ext
770      public void testTransfer2() throws InterruptedException {
771          final LinkedTransferQueue<Integer> q
772              = new LinkedTransferQueue<Integer>();
773 +        final CountDownLatch threadStarted = new CountDownLatch(1);
774  
775          Thread t = newStartedThread(new CheckedRunnable() {
776              public void realRun() throws InterruptedException {
777 <                q.transfer(SIZE);
778 <                assertTrue(q.isEmpty());
777 >                threadStarted.countDown();
778 >                q.transfer(five);
779 >                checkEmpty(q);
780              }});
781  
782 <        Thread.sleep(SHORT_DELAY_MS);
782 >        threadStarted.await();
783 >        waitForThreadToEnterWaitState(t);
784          assertEquals(1, q.size());
785 <        assertEquals(SIZE, (int) q.poll());
786 <        assertTrue(q.isEmpty());
787 <        t.join();
785 >        assertSame(five, q.poll());
786 >        checkEmpty(q);
787 >        awaitTermination(t);
788      }
789  
790      /**
# Line 894 | Line 796 | public class LinkedTransferQueueTest ext
796  
797          Thread first = newStartedThread(new CheckedRunnable() {
798              public void realRun() throws InterruptedException {
799 <                Integer i = SIZE + 1;
800 <                q.transfer(i);
899 <                assertTrue(!q.contains(i));
799 >                q.transfer(four);
800 >                assertTrue(!q.contains(four));
801                  assertEquals(1, q.size());
802              }});
803  
804          Thread interruptedThread = newStartedThread(
805              new CheckedInterruptedRunnable() {
806                  public void realRun() throws InterruptedException {
807 <                    while (q.size() == 0)
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());
920 <        assertTrue(q.isEmpty());
820 >        checkEmpty(q);
821      }
822  
823      /**
# Line 934 | Line 834 | public class LinkedTransferQueueTest ext
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          assertSame(four, q.poll());
843 <        t.join();
843 >        awaitTermination(t);
844      }
845  
846      /**
# Line 950 | Line 853 | public class LinkedTransferQueueTest ext
853  
854          Thread t = newStartedThread(new CheckedRunnable() {
855              public void realRun() throws InterruptedException {
856 <                q.transfer(SIZE);
856 >                q.transfer(four);
857                  checkEmpty(q);
858              }});
859  
860 <        Thread.sleep(SHORT_DELAY_MS);
861 <        assertEquals(SIZE, (int) q.take());
860 >        while (q.isEmpty())
861 >            Thread.yield();
862 >        assertFalse(q.isEmpty());
863 >        assertEquals(1, q.size());
864 >        assertSame(four, q.take());
865          checkEmpty(q);
866 <        t.join();
866 >        awaitTermination(t);
867      }
868  
869      /**
870       * tryTransfer(null) throws NullPointerException
871       */
872      public void testTryTransfer1() {
873 +        final LinkedTransferQueue q = new LinkedTransferQueue();
874          try {
968            final LinkedTransferQueue q = new LinkedTransferQueue();
875              q.tryTransfer(null);
876              shouldThrow();
877          } catch (NullPointerException success) {}
# Line 995 | Line 901 | public class LinkedTransferQueueTest ext
901                  while (! q.hasWaitingConsumer())
902                      Thread.yield();
903                  assertTrue(q.hasWaitingConsumer());
904 <                assertTrue(q.isEmpty());
999 <                assertEquals(q.size(), 0);
904 >                checkEmpty(q);
905                  assertTrue(q.tryTransfer(hotPotato));
906              }});
907  
908 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
908 >        long startTime = System.nanoTime();
909 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
910 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
911          checkEmpty(q);
912 <        t.join();
912 >        awaitTermination(t);
913      }
914  
915      /**
# Line 1018 | Line 925 | public class LinkedTransferQueueTest ext
925                  while (! q.hasWaitingConsumer())
926                      Thread.yield();
927                  assertTrue(q.hasWaitingConsumer());
928 <                assertTrue(q.isEmpty());
1022 <                assertEquals(q.size(), 0);
928 >                checkEmpty(q);
929                  assertTrue(q.tryTransfer(hotPotato));
930              }});
931  
932          assertSame(q.take(), hotPotato);
933          checkEmpty(q);
934 <        t.join();
934 >        awaitTermination(t);
935      }
936  
937      /**
938 <     * tryTransfer waits the amount given if interrupted, and
1033 <     * throws interrupted exception
938 >     * tryTransfer blocks interruptibly if no takers
939       */
940      public void testTryTransfer5() throws InterruptedException {
941          final LinkedTransferQueue q = new LinkedTransferQueue();
942 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
943 +        assertTrue(q.isEmpty());
944  
945 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
945 >        Thread t = newStartedThread(new CheckedRunnable() {
946              public void realRun() throws InterruptedException {
947 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
947 >                long startTime = System.nanoTime();
948 >                Thread.currentThread().interrupt();
949 >                try {
950 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
951 >                    shouldThrow();
952 >                } catch (InterruptedException success) {}
953 >                assertFalse(Thread.interrupted());
954 >
955 >                pleaseInterrupt.countDown();
956 >                try {
957 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
958 >                    shouldThrow();
959 >                } catch (InterruptedException success) {}
960 >                assertFalse(Thread.interrupted());
961 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
962              }});
963  
964 <        Thread.sleep(SMALL_DELAY_MS);
965 <        toInterrupt.interrupt();
966 <        toInterrupt.join();
964 >        await(pleaseInterrupt);
965 >        assertThreadStaysAlive(t);
966 >        t.interrupt();
967 >        awaitTermination(t);
968 >        checkEmpty(q);
969      }
970  
971      /**
972 <     * tryTransfer gives up after the timeout and return false
972 >     * tryTransfer gives up after the timeout and returns false
973       */
974      public void testTryTransfer6() throws InterruptedException {
975          final LinkedTransferQueue q = new LinkedTransferQueue();
976  
977          Thread t = newStartedThread(new CheckedRunnable() {
978              public void realRun() throws InterruptedException {
979 +                long startTime = System.nanoTime();
980                  assertFalse(q.tryTransfer(new Object(),
981 <                                          SHORT_DELAY_MS, MILLISECONDS));
981 >                                          timeoutMillis(), MILLISECONDS));
982 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
983 >                checkEmpty(q);
984              }});
985  
986 <        Thread.sleep(SMALL_DELAY_MS);
986 >        awaitTermination(t);
987          checkEmpty(q);
1062        t.join();
988      }
989  
990      /**
# Line 1072 | Line 997 | public class LinkedTransferQueueTest ext
997  
998          Thread t = newStartedThread(new CheckedRunnable() {
999              public void realRun() throws InterruptedException {
1000 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1001 <                assertTrue(q.isEmpty());
1000 >                long startTime = System.nanoTime();
1001 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1002 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1003 >                checkEmpty(q);
1004              }});
1005  
1006 <        Thread.sleep(SHORT_DELAY_MS);
1006 >        while (q.size() != 2)
1007 >            Thread.yield();
1008          assertEquals(2, q.size());
1009          assertSame(four, q.poll());
1010          assertSame(five, q.poll());
1011          checkEmpty(q);
1012 <        t.join();
1012 >        awaitTermination(t);
1013      }
1014  
1015      /**
1016 <     * tryTransfer attempts to enqueue into the q and fails returning
1017 <     * false not enqueueing and the successive poll is null
1016 >     * tryTransfer attempts to enqueue into the queue and fails
1017 >     * returning false not enqueueing and the successive poll is null
1018       */
1019      public void testTryTransfer8() throws InterruptedException {
1020          final LinkedTransferQueue q = new LinkedTransferQueue();
1021          assertTrue(q.offer(four));
1022          assertEquals(1, q.size());
1023 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1023 >        long startTime = System.nanoTime();
1024 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1025 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1026          assertEquals(1, q.size());
1027          assertSame(four, q.poll());
1028          assertNull(q.poll());
# Line 1101 | Line 1031 | public class LinkedTransferQueueTest ext
1031  
1032      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1033          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1034 <        assertTrue(q.isEmpty());
1034 >        checkEmpty(q);
1035          for (int i = 0; i < n; i++) {
1036              assertEquals(i, q.size());
1037              assertTrue(q.offer(i));
# Line 1110 | Line 1040 | public class LinkedTransferQueueTest ext
1040          assertFalse(q.isEmpty());
1041          return q;
1042      }
1043 +
1044 +    /**
1045 +     * remove(null), contains(null) always return false
1046 +     */
1047 +    public void testNeverContainsNull() {
1048 +        Collection<?>[] qs = {
1049 +            new LinkedTransferQueue<Object>(),
1050 +            populatedQueue(2),
1051 +        };
1052 +
1053 +        for (Collection<?> q : qs) {
1054 +            assertFalse(q.contains(null));
1055 +            assertFalse(q.remove(null));
1056 +        }
1057 +    }
1058   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines