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.56 by jsr166, Wed Dec 31 19:21:20 2014 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  
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());
36      }
37  
38      public static Test suite() {
39 <        return new TestSuite(LinkedTransferQueueTest.class);
40 <    }
34 <
35 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
36 <        assertTrue(q.isEmpty());
37 <        assertEquals(0, q.size());
38 <        assertNull(q.peek());
39 <        assertNull(q.poll());
40 <        assertNull(q.poll(0, MILLISECONDS));
41 <        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 >        return newTestSuite(LinkedTransferQueueTest.class,
40 >                            new Generic().testSuite());
41      }
42  
43      /**
# Line 80 | Line 65 | public class LinkedTransferQueueTest ext
65       * NullPointerException
66       */
67      public void testConstructor3() {
68 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
69          try {
70 <            Integer[] ints = new Integer[SIZE];
85 <            new LinkedTransferQueue(Arrays.asList(ints));
70 >            new LinkedTransferQueue(elements);
71              shouldThrow();
72          } catch (NullPointerException success) {}
73      }
# Line 92 | Line 77 | public class LinkedTransferQueueTest ext
77       * throws NullPointerException
78       */
79      public void testConstructor4() {
80 +        Integer[] ints = new Integer[SIZE];
81 +        for (int i = 0; i < SIZE-1; ++i)
82 +            ints[i] = i;
83 +        Collection<Integer> elements = Arrays.asList(ints);
84          try {
85 <            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));
85 >            new LinkedTransferQueue(elements);
86              shouldThrow();
87          } catch (NullPointerException success) {}
88      }
# Line 144 | Line 129 | public class LinkedTransferQueueTest ext
129      }
130  
131      /**
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    /**
132       * addAll(this) throws IllegalArgumentException
133       */
134      public void testAddAllSelf() {
# Line 188 | Line 140 | public class LinkedTransferQueueTest ext
140      }
141  
142      /**
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    /**
143       * addAll of a collection with any null elements throws
144       * NullPointerException after possibly adding some elements
145       */
# Line 233 | Line 173 | public class LinkedTransferQueueTest ext
173      }
174  
175      /**
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    /**
176       * all elements successfully put are contained
177       */
178      public void testPut() {
179          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
180          for (int i = 0; i < SIZE; ++i) {
181 <            assertEquals(q.size(), i);
181 >            assertEquals(i, q.size());
182              q.put(i);
183              assertTrue(q.contains(i));
184          }
# Line 266 | Line 195 | public class LinkedTransferQueueTest ext
195      }
196  
197      /**
198 <     * 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
198 >     * take removes existing elements until empty, then blocks interruptibly
199       */
200      public void testBlockingTake() throws InterruptedException {
201 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
202 <        Thread t = new Thread(new CheckedRunnable() {
201 >        final BlockingQueue q = populatedQueue(SIZE);
202 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
203 >        Thread t = newStartedThread(new CheckedRunnable() {
204              public void realRun() throws InterruptedException {
205                  for (int i = 0; i < SIZE; ++i) {
206 <                    assertEquals(i, (int) q.take());
206 >                    assertEquals(i, q.take());
207                  }
208 +
209 +                Thread.currentThread().interrupt();
210                  try {
211                      q.take();
212                      shouldThrow();
213                  } catch (InterruptedException success) {}
214 +                assertFalse(Thread.interrupted());
215 +
216 +                pleaseInterrupt.countDown();
217 +                try {
218 +                    q.take();
219 +                    shouldThrow();
220 +                } catch (InterruptedException success) {}
221 +                assertFalse(Thread.interrupted());
222              }});
223  
224 <        t.start();
225 <        Thread.sleep(SHORT_DELAY_MS);
224 >        await(pleaseInterrupt);
225 >        assertThreadStaysAlive(t);
226          t.interrupt();
227 <        t.join();
302 <        checkEmpty(q);
227 >        awaitTermination(t);
228      }
229  
230      /**
# Line 315 | Line 240 | public class LinkedTransferQueueTest ext
240      }
241  
242      /**
243 <     * timed pool with zero timeout succeeds when non-empty, else times out
243 >     * timed poll with zero timeout succeeds when non-empty, else times out
244       */
245      public void testTimedPoll0() throws InterruptedException {
246          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 327 | Line 252 | public class LinkedTransferQueueTest ext
252      }
253  
254      /**
255 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
255 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
256       */
257      public void testTimedPoll() throws InterruptedException {
258          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            long t0 = System.nanoTime();
260 >            long startTime = System.nanoTime();
261              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
262 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
338 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
262 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
263          }
264 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
264 >        long startTime = System.nanoTime();
265 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
266 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
267          checkEmpty(q);
268      }
269  
# Line 346 | Line 272 | public class LinkedTransferQueueTest ext
272       * returning timeout status
273       */
274      public void testInterruptedTimedPoll() throws InterruptedException {
275 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
275 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
276 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
277          Thread t = newStartedThread(new CheckedRunnable() {
278 <            void realRun() throws InterruptedException {
278 >            public void realRun() throws InterruptedException {
279                  for (int i = 0; i < SIZE; ++i) {
280                      long t0 = System.nanoTime();
281 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
282 <                                                       MILLISECONDS));
356 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
357 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
281 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
282 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
283                  }
284 +                long t0 = System.nanoTime();
285 +                aboutToWait.countDown();
286                  try {
287 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
287 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
288                      shouldThrow();
289 <                } catch (InterruptedException success) {}
289 >                } catch (InterruptedException success) {
290 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
291 >                }
292              }});
293  
294 <        Thread.sleep(SMALL_DELAY_MS);
294 >        aboutToWait.await();
295 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
296          t.interrupt();
297 <        t.join();
297 >        awaitTermination(t, MEDIUM_DELAY_MS);
298          checkEmpty(q);
299      }
300  
301      /**
302 <     * timed poll before a delayed offer fails; after offer succeeds;
303 <     * on interruption throws
302 >     * timed poll after thread interrupted throws InterruptedException
303 >     * instead of returning timeout status
304       */
305 <    public void testTimedPollWithOffer() throws InterruptedException {
306 <        final LinkedTransferQueue q = new LinkedTransferQueue();
307 <        Thread t = new Thread(new CheckedRunnable() {
308 <            void realRun() throws InterruptedException {
309 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
310 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
305 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
306 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
307 >        Thread t = newStartedThread(new CheckedRunnable() {
308 >            public void realRun() throws InterruptedException {
309 >                Thread.currentThread().interrupt();
310 >                for (int i = 0; i < SIZE; ++i) {
311 >                    long t0 = System.nanoTime();
312 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
313 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
314 >                }
315                  try {
316 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
316 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
317                      shouldThrow();
318                  } catch (InterruptedException success) {}
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, MEDIUM_DELAY_MS);
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 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 <        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
487 >     * toArray(incompatible array type) throws ArrayStoreException
488       */
489      public void testToArray1_BadArg() {
490          LinkedTransferQueue q = populatedQueue(SIZE);
491          try {
492 <            Object o[] = q.toArray(new String[10]);
492 >            q.toArray(new String[10]);
493              shouldThrow();
494          } catch (ArrayStoreException success) {}
495      }
# Line 615 | Line 521 | public class LinkedTransferQueueTest ext
521          it.remove();
522  
523          it = q.iterator();
524 <        assertEquals(it.next(), one);
525 <        assertEquals(it.next(), three);
524 >        assertSame(it.next(), one);
525 >        assertSame(it.next(), three);
526          assertFalse(it.hasNext());
527      }
528  
# Line 660 | Line 566 | public class LinkedTransferQueueTest ext
566          LinkedTransferQueue q = populatedQueue(SIZE);
567          String s = q.toString();
568          for (int i = 0; i < SIZE; ++i) {
569 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
569 >            assertTrue(s.contains(String.valueOf(i)));
570          }
571      }
572  
# Line 669 | Line 575 | public class LinkedTransferQueueTest ext
575       */
576      public void testOfferInExecutor() {
577          final LinkedTransferQueue q = new LinkedTransferQueue();
578 <        q.add(one);
673 <        q.add(two);
578 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
579          ExecutorService executor = Executors.newFixedThreadPool(2);
580  
581          executor.execute(new CheckedRunnable() {
582 <            void realRun() {
583 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
584 <                                         MILLISECONDS));
582 >            public void realRun() throws InterruptedException {
583 >                threadsStarted.await();
584 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
585              }});
586  
587          executor.execute(new CheckedRunnable() {
588 <            void realRun() throws InterruptedException {
589 <                Thread.sleep(SMALL_DELAY_MS);
590 <                threadAssertEquals(one, q.take());
588 >            public void realRun() throws InterruptedException {
589 >                threadsStarted.await();
590 >                assertSame(one, q.take());
591 >                checkEmpty(q);
592              }});
593  
594          joinPool(executor);
# Line 693 | Line 599 | public class LinkedTransferQueueTest ext
599       */
600      public void testPollInExecutor() {
601          final LinkedTransferQueue q = new LinkedTransferQueue();
602 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603          ExecutorService executor = Executors.newFixedThreadPool(2);
604  
605          executor.execute(new CheckedRunnable() {
606 <            void realRun() throws InterruptedException {
607 <                threadAssertNull(q.poll());
608 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
609 <                                                MILLISECONDS));
610 <                threadAssertTrue(q.isEmpty());
606 >            public void realRun() throws InterruptedException {
607 >                assertNull(q.poll());
608 >                threadsStarted.await();
609 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
610 >                checkEmpty(q);
611              }});
612  
613          executor.execute(new CheckedRunnable() {
614 <            void realRun() throws InterruptedException {
615 <                Thread.sleep(SMALL_DELAY_MS);
614 >            public void realRun() throws InterruptedException {
615 >                threadsStarted.await();
616                  q.put(one);
617              }});
618  
# Line 716 | Line 623 | public class LinkedTransferQueueTest ext
623       * A deserialized serialized queue has same elements in same order
624       */
625      public void testSerialization() throws Exception {
626 <        LinkedTransferQueue q = populatedQueue(SIZE);
627 <
721 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
722 <        ObjectOutputStream out
723 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
724 <        out.writeObject(q);
725 <        out.close();
626 >        Queue x = populatedQueue(SIZE);
627 >        Queue y = serialClone(x);
628  
629 <        ByteArrayInputStream bin
630 <            = new ByteArrayInputStream(bout.toByteArray());
631 <        ObjectInputStream in
632 <            = new ObjectInputStream(new BufferedInputStream(bin));
633 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
634 <
635 <        assertEquals(q.size(), r.size());
734 <        while (!q.isEmpty()) {
735 <            assertEquals(q.remove(), r.remove());
629 >        assertNotSame(y, x);
630 >        assertEquals(x.size(), y.size());
631 >        assertEquals(x.toString(), y.toString());
632 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
633 >        while (!x.isEmpty()) {
634 >            assertFalse(y.isEmpty());
635 >            assertEquals(x.remove(), y.remove());
636          }
637 <    }
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) {}
637 >        assertTrue(y.isEmpty());
638      }
639  
640      /**
# Line 765 | Line 644 | public class LinkedTransferQueueTest ext
644          LinkedTransferQueue q = populatedQueue(SIZE);
645          ArrayList l = new ArrayList();
646          q.drainTo(l);
647 <        assertEquals(q.size(), 0);
648 <        assertEquals(l.size(), SIZE);
647 >        assertEquals(0, q.size());
648 >        assertEquals(SIZE, l.size());
649          for (int i = 0; i < SIZE; ++i) {
650 <            assertEquals(l.get(i), i);
650 >            assertEquals(i, l.get(i));
651          }
652          q.add(zero);
653          q.add(one);
# Line 777 | Line 656 | public class LinkedTransferQueueTest ext
656          assertTrue(q.contains(one));
657          l.clear();
658          q.drainTo(l);
659 <        assertEquals(q.size(), 0);
660 <        assertEquals(l.size(), 2);
659 >        assertEquals(0, q.size());
660 >        assertEquals(2, l.size());
661          for (int i = 0; i < 2; ++i) {
662 <            assertEquals(l.get(i), i);
662 >            assertEquals(i, l.get(i));
663          }
664      }
665  
# Line 790 | Line 669 | public class LinkedTransferQueueTest ext
669      public void testDrainToWithActivePut() throws InterruptedException {
670          final LinkedTransferQueue q = populatedQueue(SIZE);
671          Thread t = newStartedThread(new CheckedRunnable() {
672 <            void realRun() {
672 >            public void realRun() {
673                  q.put(SIZE + 1);
674              }});
675          ArrayList l = new ArrayList();
676          q.drainTo(l);
677          assertTrue(l.size() >= SIZE);
678 <        for (int i = 0; i < SIZE; ++i) {
679 <            assertEquals(l.get(i), i);
680 <        }
802 <        t.join();
678 >        for (int i = 0; i < SIZE; ++i)
679 >            assertEquals(i, l.get(i));
680 >        awaitTermination(t, MEDIUM_DELAY_MS);
681          assertTrue(q.size() + l.size() >= SIZE);
682      }
683  
684      /**
685 <     * 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
685 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
688          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 837 | Line 693 | public class LinkedTransferQueueTest ext
693              ArrayList l = new ArrayList();
694              q.drainTo(l, i);
695              int k = (i < SIZE) ? i : SIZE;
696 <            assertEquals(l.size(), k);
697 <            assertEquals(q.size(), SIZE - k);
698 <            for (int j = 0; j < k; ++j) {
699 <                assertEquals(l.get(j), j);
700 <            }
845 <            while (q.poll() != null)
846 <                ;
696 >            assertEquals(k, l.size());
697 >            assertEquals(SIZE - k, q.size());
698 >            for (int j = 0; j < k; ++j)
699 >                assertEquals(j, l.get(j));
700 >            do {} while (q.poll() != null);
701          }
702      }
703  
# Line 853 | Line 707 | public class LinkedTransferQueueTest ext
707       */
708      public void testWaitingConsumer() throws InterruptedException {
709          final LinkedTransferQueue q = new LinkedTransferQueue();
710 <        assertEquals(q.getWaitingConsumerCount(), 0);
710 >        assertEquals(0, q.getWaitingConsumerCount());
711          assertFalse(q.hasWaitingConsumer());
712 +        final CountDownLatch threadStarted = new CountDownLatch(1);
713  
714          Thread t = newStartedThread(new CheckedRunnable() {
715 <            void realRun() throws InterruptedException {
716 <                Thread.sleep(SMALL_DELAY_MS);
717 <                threadAssertTrue(q.hasWaitingConsumer());
718 <                threadAssertEquals(q.getWaitingConsumerCount(), 1);
719 <                threadAssertTrue(q.offer(new Object()));
865 <                threadAssertFalse(q.hasWaitingConsumer());
866 <                threadAssertEquals(q.getWaitingConsumerCount(), 0);
715 >            public void realRun() throws InterruptedException {
716 >                threadStarted.countDown();
717 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
718 >                assertEquals(0, q.getWaitingConsumerCount());
719 >                assertFalse(q.hasWaitingConsumer());
720              }});
721  
722 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
723 <        assertEquals(q.getWaitingConsumerCount(), 0);
722 >        threadStarted.await();
723 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
724 >        assertEquals(1, q.getWaitingConsumerCount());
725 >        assertTrue(q.hasWaitingConsumer());
726 >
727 >        assertTrue(q.offer(one));
728 >        assertEquals(0, q.getWaitingConsumerCount());
729          assertFalse(q.hasWaitingConsumer());
730 <        t.join();
730 >
731 >        awaitTermination(t, MEDIUM_DELAY_MS);
732      }
733  
734      /**
# Line 890 | Line 749 | public class LinkedTransferQueueTest ext
749      public void testTransfer2() throws InterruptedException {
750          final LinkedTransferQueue<Integer> q
751              = new LinkedTransferQueue<Integer>();
752 +        final CountDownLatch threadStarted = new CountDownLatch(1);
753  
754          Thread t = newStartedThread(new CheckedRunnable() {
755 <            void realRun() throws InterruptedException {
756 <                q.transfer(SIZE);
757 <                threadAssertTrue(q.isEmpty());
755 >            public void realRun() throws InterruptedException {
756 >                threadStarted.countDown();
757 >                q.transfer(five);
758 >                checkEmpty(q);
759              }});
760  
761 <        Thread.sleep(SHORT_DELAY_MS);
761 >        threadStarted.await();
762 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
763          assertEquals(1, q.size());
764 <        assertEquals(SIZE, (int) q.poll());
765 <        assertTrue(q.isEmpty());
766 <        t.join();
764 >        assertSame(five, q.poll());
765 >        checkEmpty(q);
766 >        awaitTermination(t, MEDIUM_DELAY_MS);
767      }
768  
769      /**
# Line 912 | Line 774 | public class LinkedTransferQueueTest ext
774              = new LinkedTransferQueue<Integer>();
775  
776          Thread first = newStartedThread(new CheckedRunnable() {
777 <            void realRun() throws InterruptedException {
778 <                Integer i = SIZE + 1;
779 <                q.transfer(i);
780 <                threadAssertTrue(!q.contains(i));
919 <                threadAssertEquals(1, q.size());
777 >            public void realRun() throws InterruptedException {
778 >                q.transfer(four);
779 >                assertTrue(!q.contains(four));
780 >                assertEquals(1, q.size());
781              }});
782  
783          Thread interruptedThread = newStartedThread(
784              new CheckedInterruptedRunnable() {
785 <                void realRun() throws InterruptedException {
786 <                    while (q.size() == 0)
785 >                public void realRun() throws InterruptedException {
786 >                    while (q.isEmpty())
787                          Thread.yield();
788 <                    q.transfer(SIZE);
788 >                    q.transfer(five);
789                  }});
790  
791          while (q.size() < 2)
792              Thread.yield();
793          assertEquals(2, q.size());
794 <        assertEquals(SIZE + 1, (int) q.poll());
794 >        assertSame(four, q.poll());
795          first.join();
796          assertEquals(1, q.size());
797          interruptedThread.interrupt();
798          interruptedThread.join();
799 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
799 >        checkEmpty(q);
800      }
801  
802      /**
# Line 947 | Line 807 | public class LinkedTransferQueueTest ext
807          final LinkedTransferQueue q = new LinkedTransferQueue();
808  
809          Thread t = newStartedThread(new CheckedRunnable() {
810 <            void realRun() throws InterruptedException {
810 >            public void realRun() throws InterruptedException {
811                  q.transfer(four);
812 <                threadAssertFalse(q.contains(four));
813 <                threadAssertEquals(three, q.poll());
812 >                assertFalse(q.contains(four));
813 >                assertSame(three, q.poll());
814              }});
815  
816 <        Thread.sleep(SHORT_DELAY_MS);
816 >        while (q.isEmpty())
817 >            Thread.yield();
818 >        assertFalse(q.isEmpty());
819 >        assertEquals(1, q.size());
820          assertTrue(q.offer(three));
821 <        assertEquals(four, q.poll());
822 <        t.join();
821 >        assertSame(four, q.poll());
822 >        awaitTermination(t, MEDIUM_DELAY_MS);
823      }
824  
825      /**
# Line 968 | Line 831 | public class LinkedTransferQueueTest ext
831              = new LinkedTransferQueue<Integer>();
832  
833          Thread t = newStartedThread(new CheckedRunnable() {
834 <            void realRun() throws InterruptedException {
835 <                q.transfer(SIZE);
834 >            public void realRun() throws InterruptedException {
835 >                q.transfer(four);
836                  checkEmpty(q);
837              }});
838  
839 <        Thread.sleep(SHORT_DELAY_MS);
840 <        assertEquals(SIZE, (int) q.take());
839 >        while (q.isEmpty())
840 >            Thread.yield();
841 >        assertFalse(q.isEmpty());
842 >        assertEquals(1, q.size());
843 >        assertSame(four, q.take());
844          checkEmpty(q);
845 <        t.join();
845 >        awaitTermination(t, MEDIUM_DELAY_MS);
846      }
847  
848      /**
# Line 1010 | Line 876 | public class LinkedTransferQueueTest ext
876          final LinkedTransferQueue q = new LinkedTransferQueue();
877  
878          Thread t = newStartedThread(new CheckedRunnable() {
879 <            void realRun() {
879 >            public void realRun() {
880                  while (! q.hasWaitingConsumer())
881                      Thread.yield();
882 <                threadAssertTrue(q.hasWaitingConsumer());
883 <                threadAssertTrue(q.isEmpty());
884 <                threadAssertTrue(q.size() == 0);
1019 <                threadAssertTrue(q.tryTransfer(hotPotato));
882 >                assertTrue(q.hasWaitingConsumer());
883 >                checkEmpty(q);
884 >                assertTrue(q.tryTransfer(hotPotato));
885              }});
886  
887 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
887 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
888          checkEmpty(q);
889 <        t.join();
889 >        awaitTermination(t, MEDIUM_DELAY_MS);
890      }
891  
892      /**
# Line 1033 | Line 898 | public class LinkedTransferQueueTest ext
898          final LinkedTransferQueue q = new LinkedTransferQueue();
899  
900          Thread t = newStartedThread(new CheckedRunnable() {
901 <            void realRun() {
901 >            public void realRun() {
902                  while (! q.hasWaitingConsumer())
903                      Thread.yield();
904 <                threadAssertTrue(q.hasWaitingConsumer());
905 <                threadAssertTrue(q.isEmpty());
906 <                threadAssertTrue(q.size() == 0);
1042 <                threadAssertTrue(q.tryTransfer(hotPotato));
904 >                assertTrue(q.hasWaitingConsumer());
905 >                checkEmpty(q);
906 >                assertTrue(q.tryTransfer(hotPotato));
907              }});
908  
909 <        assertTrue(q.take() == hotPotato);
909 >        assertSame(q.take(), hotPotato);
910          checkEmpty(q);
911 <        t.join();
911 >        awaitTermination(t, MEDIUM_DELAY_MS);
912      }
913  
914      /**
915 <     * tryTransfer waits the amount given if interrupted, and
1052 <     * throws interrupted exception
915 >     * tryTransfer blocks interruptibly if no takers
916       */
917      public void testTryTransfer5() throws InterruptedException {
918          final LinkedTransferQueue q = new LinkedTransferQueue();
919 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
920 +        assertTrue(q.isEmpty());
921  
922 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
923 <            void realRun() throws InterruptedException {
924 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
922 >        Thread t = newStartedThread(new CheckedRunnable() {
923 >            public void realRun() throws InterruptedException {
924 >                Thread.currentThread().interrupt();
925 >                try {
926 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
927 >                    shouldThrow();
928 >                } catch (InterruptedException success) {}
929 >                assertFalse(Thread.interrupted());
930 >
931 >                pleaseInterrupt.countDown();
932 >                try {
933 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
934 >                    shouldThrow();
935 >                } catch (InterruptedException success) {}
936 >                assertFalse(Thread.interrupted());
937              }});
938  
939 <        Thread.sleep(SMALL_DELAY_MS);
940 <        toInterrupt.interrupt();
941 <        toInterrupt.join();
939 >        await(pleaseInterrupt);
940 >        assertThreadStaysAlive(t);
941 >        t.interrupt();
942 >        awaitTermination(t);
943 >        checkEmpty(q);
944      }
945  
946      /**
947 <     * tryTransfer gives up after the timeout and return false
947 >     * tryTransfer gives up after the timeout and returns false
948       */
949      public void testTryTransfer6() throws InterruptedException {
950          final LinkedTransferQueue q = new LinkedTransferQueue();
951  
952          Thread t = newStartedThread(new CheckedRunnable() {
953 <            void realRun() throws InterruptedException {
954 <                threadAssertFalse
955 <                    (q.tryTransfer(new Object(),
956 <                                   SHORT_DELAY_MS, MILLISECONDS));
953 >            public void realRun() throws InterruptedException {
954 >                long t0 = System.nanoTime();
955 >                assertFalse(q.tryTransfer(new Object(),
956 >                                          timeoutMillis(), MILLISECONDS));
957 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
958 >                checkEmpty(q);
959              }});
960  
961 <        Thread.sleep(SMALL_DELAY_MS);
961 >        awaitTermination(t);
962          checkEmpty(q);
1082        t.join();
963      }
964  
965      /**
# Line 1091 | Line 971 | public class LinkedTransferQueueTest ext
971          assertTrue(q.offer(four));
972  
973          Thread t = newStartedThread(new CheckedRunnable() {
974 <            void realRun() throws InterruptedException {
975 <                threadAssertTrue(q.tryTransfer(five,
976 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1097 <                threadAssertTrue(q.isEmpty());
974 >            public void realRun() throws InterruptedException {
975 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
976 >                checkEmpty(q);
977              }});
978  
979 <        Thread.sleep(SHORT_DELAY_MS);
979 >        while (q.size() != 2)
980 >            Thread.yield();
981          assertEquals(2, q.size());
982 <        assertEquals(four, q.poll());
983 <        assertEquals(five, q.poll());
982 >        assertSame(four, q.poll());
983 >        assertSame(five, q.poll());
984          checkEmpty(q);
985 <        t.join();
985 >        awaitTermination(t, MEDIUM_DELAY_MS);
986      }
987  
988      /**
989 <     * tryTransfer attempts to enqueue into the q and fails returning
990 <     * false not enqueueing and the successive poll is null
989 >     * tryTransfer attempts to enqueue into the queue and fails
990 >     * returning false not enqueueing and the successive poll is null
991       */
992      public void testTryTransfer8() throws InterruptedException {
993          final LinkedTransferQueue q = new LinkedTransferQueue();
994          assertTrue(q.offer(four));
995          assertEquals(1, q.size());
996 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
996 >        long t0 = System.nanoTime();
997 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
998 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
999          assertEquals(1, q.size());
1000 <        assertEquals(four, q.poll());
1000 >        assertSame(four, q.poll());
1001          assertNull(q.poll());
1002          checkEmpty(q);
1003      }
1004  
1005      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1006          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1007 <        assertTrue(q.isEmpty());
1007 >        checkEmpty(q);
1008          for (int i = 0; i < n; i++) {
1009              assertEquals(i, q.size());
1010              assertTrue(q.offer(i));
# Line 1131 | Line 1013 | public class LinkedTransferQueueTest ext
1013          assertFalse(q.isEmpty());
1014          return q;
1015      }
1016 +
1017 +    /**
1018 +     * remove(null), contains(null) always return false
1019 +     */
1020 +    public void testNeverContainsNull() {
1021 +        Collection<?>[] qs = {
1022 +            new LinkedTransferQueue<Object>(),
1023 +            populatedQueue(2),
1024 +        };
1025 +
1026 +        for (Collection<?> q : qs) {
1027 +            assertFalse(q.contains(null));
1028 +            assertFalse(q.remove(null));
1029 +        }
1030 +    }
1031   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines