ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedTransferQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.19 by jsr166, Sun Nov 22 00:17:37 2009 UTC vs.
Revision 1.49 by jsr166, Fri Jul 15 18:49:31 2011 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;
14 < import java.util.ArrayList;
8 > import junit.framework.*;
9   import java.util.Arrays;
10 + import java.util.ArrayList;
11 + import java.util.Collection;
12   import java.util.Iterator;
13   import java.util.List;
14   import java.util.NoSuchElementException;
15 < import java.util.concurrent.*;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.LinkedTransferQueue;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 < import junit.framework.Test;
22 < import junit.framework.TestSuite;
22 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
23  
24   @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
26  
27 +    public static class Generic extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedTransferQueue();
30 +        }
31 +    }
32 +
33      public static void main(String[] args) {
34          junit.textui.TestRunner.run(suite());
35      }
36  
37      public static Test suite() {
38 <        return new TestSuite(LinkedTransferQueueTest.class);
39 <    }
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) {}
38 >        return newTestSuite(LinkedTransferQueueTest.class,
39 >                            new Generic().testSuite());
40      }
41  
42      /**
# Line 80 | Line 64 | public class LinkedTransferQueueTest ext
64       * NullPointerException
65       */
66      public void testConstructor3() {
67 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
68          try {
69 <            Integer[] ints = new Integer[SIZE];
85 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71          } catch (NullPointerException success) {}
72      }
# Line 92 | Line 76 | public class LinkedTransferQueueTest ext
76       * throws NullPointerException
77       */
78      public void testConstructor4() {
79 +        Integer[] ints = new Integer[SIZE];
80 +        for (int i = 0; i < SIZE-1; ++i)
81 +            ints[i] = i;
82 +        Collection<Integer> elements = Arrays.asList(ints);
83          try {
84 <            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));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86          } catch (NullPointerException success) {}
87      }
# Line 144 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
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    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 188 | Line 139 | public class LinkedTransferQueueTest ext
139      }
140  
141      /**
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    /**
142       * addAll of a collection with any null elements throws
143       * NullPointerException after possibly adding some elements
144       */
# Line 233 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
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    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
# Line 266 | Line 194 | public class LinkedTransferQueueTest ext
194      }
195  
196      /**
197 <     * 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
197 >     * take removes existing elements until empty, then blocks interruptibly
198       */
199      public void testBlockingTake() throws InterruptedException {
200 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
201 <        Thread t = new Thread(new CheckedRunnable() {
200 >        final BlockingQueue q = populatedQueue(SIZE);
201 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
202 >        Thread t = newStartedThread(new CheckedRunnable() {
203              public void realRun() throws InterruptedException {
204                  for (int i = 0; i < SIZE; ++i) {
205 <                    assertEquals(i, (int) q.take());
205 >                    assertEquals(i, q.take());
206                  }
207 +
208 +                Thread.currentThread().interrupt();
209                  try {
210                      q.take();
211                      shouldThrow();
212                  } catch (InterruptedException success) {}
213 +                assertFalse(Thread.interrupted());
214 +
215 +                pleaseInterrupt.countDown();
216 +                try {
217 +                    q.take();
218 +                    shouldThrow();
219 +                } catch (InterruptedException success) {}
220 +                assertFalse(Thread.interrupted());
221              }});
222  
223 <        t.start();
224 <        Thread.sleep(SHORT_DELAY_MS);
223 >        await(pleaseInterrupt);
224 >        assertThreadStaysAlive(t);
225          t.interrupt();
226 <        t.join();
302 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 315 | Line 239 | public class LinkedTransferQueueTest ext
239      }
240  
241      /**
242 <     * timed pool with zero timeout succeeds when non-empty, else times out
242 >     * timed poll with zero timeout succeeds when non-empty, else times out
243       */
244      public void testTimedPoll0() throws InterruptedException {
245          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 327 | Line 251 | public class LinkedTransferQueueTest ext
251      }
252  
253      /**
254 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
254 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
255       */
256      public void testTimedPoll() throws InterruptedException {
257          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            long t0 = System.nanoTime();
259 >            long startTime = System.nanoTime();
260              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
338 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
261 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262          }
263 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
263 >        long startTime = System.nanoTime();
264 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
265 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266          checkEmpty(q);
267      }
268  
# Line 346 | Line 271 | public class LinkedTransferQueueTest ext
271       * returning timeout status
272       */
273      public void testInterruptedTimedPoll() throws InterruptedException {
274 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
274 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
275 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
276          Thread t = newStartedThread(new CheckedRunnable() {
277 <            void realRun() throws InterruptedException {
277 >            public void realRun() throws InterruptedException {
278                  for (int i = 0; i < SIZE; ++i) {
279                      long t0 = System.nanoTime();
280 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
281 <                                                       MILLISECONDS));
356 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
357 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
280 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
281 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
282                  }
283 +                long t0 = System.nanoTime();
284 +                aboutToWait.countDown();
285                  try {
286 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
286 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
287                      shouldThrow();
288 <                } catch (InterruptedException success) {}
288 >                } catch (InterruptedException success) {
289 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
290 >                }
291              }});
292  
293 <        Thread.sleep(SMALL_DELAY_MS);
293 >        aboutToWait.await();
294 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
295          t.interrupt();
296 <        t.join();
296 >        awaitTermination(t, MEDIUM_DELAY_MS);
297          checkEmpty(q);
298      }
299  
300      /**
301 <     * timed poll before a delayed offer fails; after offer succeeds;
302 <     * on interruption throws
301 >     * timed poll after thread interrupted throws InterruptedException
302 >     * instead of returning timeout status
303       */
304 <    public void testTimedPollWithOffer() throws InterruptedException {
305 <        final LinkedTransferQueue q = new LinkedTransferQueue();
306 <        Thread t = new Thread(new CheckedRunnable() {
307 <            void realRun() throws InterruptedException {
308 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
309 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
304 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
305 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
306 >        Thread t = newStartedThread(new CheckedRunnable() {
307 >            public void realRun() throws InterruptedException {
308 >                Thread.currentThread().interrupt();
309 >                for (int i = 0; i < SIZE; ++i) {
310 >                    long t0 = System.nanoTime();
311 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313 >                }
314                  try {
315 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
315 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
316                      shouldThrow();
317                  } catch (InterruptedException success) {}
318              }});
319  
320 <        t.start();
321 <        Thread.sleep(SMALL_DELAY_MS);
389 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
390 <        t.interrupt();
391 <        t.join();
320 >        awaitTermination(t, MEDIUM_DELAY_MS);
321 >        checkEmpty(q);
322      }
323  
324      /**
# Line 438 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
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    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 462 | Line 377 | public class LinkedTransferQueueTest ext
377          assertTrue(q.remove(one));
378          assertTrue(q.remove(two));
379          assertTrue(q.add(three));
380 <        assertTrue(q.take() == three);
380 >        assertSame(q.take(), three);
381      }
382  
383      /**
# Line 544 | Line 459 | public class LinkedTransferQueueTest ext
459      }
460  
461      /**
462 <     * toArray() contains all elements
462 >     * toArray() contains all elements in FIFO order
463       */
464 <    public void testToArray() throws InterruptedException {
464 >    public void testToArray() {
465          LinkedTransferQueue q = populatedQueue(SIZE);
466          Object[] o = q.toArray();
467          for (int i = 0; i < o.length; i++) {
468 <            assertEquals(o[i], q.take());
468 >            assertSame(o[i], q.poll());
469          }
470      }
471  
472      /**
473 <     * toArray(a) contains all elements
473 >     * toArray(a) contains all elements in FIFO order
474       */
475 <    public void testToArray2() throws InterruptedException {
475 >    public void testToArray2() {
476          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
477          Integer[] ints = new Integer[SIZE];
478 <        ints = q.toArray(ints);
478 >        Integer[] array = q.toArray(ints);
479 >        assertSame(ints, array);
480          for (int i = 0; i < ints.length; i++) {
481 <            assertEquals(ints[i], q.take());
481 >            assertSame(ints[i], q.poll());
482          }
483      }
484  
485      /**
486 <     * toArray(null) throws NullPointerException
571 <     */
572 <    public void testToArray_BadArg() {
573 <        try {
574 <            LinkedTransferQueue q = populatedQueue(SIZE);
575 <            Object o[] = q.toArray(null);
576 <            shouldThrow();
577 <        } catch (NullPointerException success) {}
578 <    }
579 <
580 <    /**
581 <     * toArray(incompatible array type) throws CCE
486 >     * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
489 +        LinkedTransferQueue q = populatedQueue(SIZE);
490          try {
491 <            LinkedTransferQueue q = populatedQueue(SIZE);
586 <            Object o[] = q.toArray(new String[10]);
491 >            q.toArray(new String[10]);
492              shouldThrow();
493          } catch (ArrayStoreException success) {}
494      }
# Line 615 | Line 520 | public class LinkedTransferQueueTest ext
520          it.remove();
521  
522          it = q.iterator();
523 <        assertEquals(it.next(), one);
524 <        assertEquals(it.next(), three);
523 >        assertSame(it.next(), one);
524 >        assertSame(it.next(), three);
525          assertFalse(it.hasNext());
526      }
527  
# Line 660 | Line 565 | public class LinkedTransferQueueTest ext
565          LinkedTransferQueue q = populatedQueue(SIZE);
566          String s = q.toString();
567          for (int i = 0; i < SIZE; ++i) {
568 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
568 >            assertTrue(s.contains(String.valueOf(i)));
569          }
570      }
571  
# Line 669 | Line 574 | public class LinkedTransferQueueTest ext
574       */
575      public void testOfferInExecutor() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
577 <        q.add(one);
673 <        q.add(two);
577 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
578          ExecutorService executor = Executors.newFixedThreadPool(2);
579  
580          executor.execute(new CheckedRunnable() {
581 <            void realRun() {
582 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
583 <                                         MILLISECONDS));
581 >            public void realRun() throws InterruptedException {
582 >                threadsStarted.await();
583 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584              }});
585  
586          executor.execute(new CheckedRunnable() {
587 <            void realRun() throws InterruptedException {
588 <                Thread.sleep(SMALL_DELAY_MS);
589 <                threadAssertEquals(one, q.take());
587 >            public void realRun() throws InterruptedException {
588 >                threadsStarted.await();
589 >                assertSame(one, q.take());
590 >                checkEmpty(q);
591              }});
592  
593          joinPool(executor);
# Line 693 | Line 598 | public class LinkedTransferQueueTest ext
598       */
599      public void testPollInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602          ExecutorService executor = Executors.newFixedThreadPool(2);
603  
604          executor.execute(new CheckedRunnable() {
605 <            void realRun() throws InterruptedException {
606 <                threadAssertNull(q.poll());
607 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
608 <                                                MILLISECONDS));
609 <                threadAssertTrue(q.isEmpty());
605 >            public void realRun() throws InterruptedException {
606 >                assertNull(q.poll());
607 >                threadsStarted.await();
608 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609 >                checkEmpty(q);
610              }});
611  
612          executor.execute(new CheckedRunnable() {
613 <            void realRun() throws InterruptedException {
614 <                Thread.sleep(SMALL_DELAY_MS);
613 >            public void realRun() throws InterruptedException {
614 >                threadsStarted.await();
615                  q.put(one);
616              }});
617  
# Line 716 | Line 622 | public class LinkedTransferQueueTest ext
622       * A deserialized serialized queue has same elements in same order
623       */
624      public void testSerialization() throws Exception {
625 <        LinkedTransferQueue q = populatedQueue(SIZE);
626 <
721 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
722 <        ObjectOutputStream out
723 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
724 <        out.writeObject(q);
725 <        out.close();
625 >        Queue x = populatedQueue(SIZE);
626 >        Queue y = serialClone(x);
627  
628 <        ByteArrayInputStream bin
629 <            = new ByteArrayInputStream(bout.toByteArray());
630 <        ObjectInputStream in
631 <            = new ObjectInputStream(new BufferedInputStream(bin));
632 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
633 <
634 <        assertEquals(q.size(), r.size());
734 <        while (!q.isEmpty()) {
735 <            assertEquals(q.remove(), r.remove());
628 >        assertTrue(x != y);
629 >        assertEquals(x.size(), y.size());
630 >        assertEquals(x.toString(), y.toString());
631 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
632 >        while (!x.isEmpty()) {
633 >            assertFalse(y.isEmpty());
634 >            assertEquals(x.remove(), y.remove());
635          }
636 <    }
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) {}
636 >        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 790 | Line 668 | public class LinkedTransferQueueTest ext
668      public void testDrainToWithActivePut() throws InterruptedException {
669          final LinkedTransferQueue q = populatedQueue(SIZE);
670          Thread t = newStartedThread(new CheckedRunnable() {
671 <            void realRun() {
671 >            public void realRun() {
672                  q.put(SIZE + 1);
673              }});
674          ArrayList l = new ArrayList();
# Line 799 | Line 677 | public class LinkedTransferQueueTest ext
677          for (int i = 0; i < SIZE; ++i) {
678              assertEquals(l.get(i), i);
679          }
680 <        t.join();
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 855 | Line 711 | public class LinkedTransferQueueTest ext
711          final LinkedTransferQueue q = new LinkedTransferQueue();
712          assertEquals(q.getWaitingConsumerCount(), 0);
713          assertFalse(q.hasWaitingConsumer());
714 +        final CountDownLatch threadStarted = new CountDownLatch(1);
715  
716          Thread t = newStartedThread(new CheckedRunnable() {
717 <            void realRun() throws InterruptedException {
718 <                Thread.sleep(SMALL_DELAY_MS);
719 <                threadAssertTrue(q.hasWaitingConsumer());
720 <                threadAssertEquals(q.getWaitingConsumerCount(), 1);
721 <                threadAssertTrue(q.offer(new Object()));
865 <                threadAssertFalse(q.hasWaitingConsumer());
866 <                threadAssertEquals(q.getWaitingConsumerCount(), 0);
717 >            public void realRun() throws InterruptedException {
718 >                threadStarted.countDown();
719 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
720 >                assertEquals(q.getWaitingConsumerCount(), 0);
721 >                assertFalse(q.hasWaitingConsumer());
722              }});
723  
724 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
724 >        threadStarted.await();
725 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
726 >        assertEquals(q.getWaitingConsumerCount(), 1);
727 >        assertTrue(q.hasWaitingConsumer());
728 >
729 >        assertTrue(q.offer(one));
730          assertEquals(q.getWaitingConsumerCount(), 0);
731          assertFalse(q.hasWaitingConsumer());
732 <        t.join();
732 >
733 >        awaitTermination(t, MEDIUM_DELAY_MS);
734      }
735  
736      /**
# Line 890 | Line 751 | public class LinkedTransferQueueTest ext
751      public void testTransfer2() throws InterruptedException {
752          final LinkedTransferQueue<Integer> q
753              = new LinkedTransferQueue<Integer>();
754 +        final CountDownLatch threadStarted = new CountDownLatch(1);
755  
756          Thread t = newStartedThread(new CheckedRunnable() {
757 <            void realRun() throws InterruptedException {
758 <                q.transfer(SIZE);
759 <                threadAssertTrue(q.isEmpty());
757 >            public void realRun() throws InterruptedException {
758 >                threadStarted.countDown();
759 >                q.transfer(five);
760 >                checkEmpty(q);
761              }});
762  
763 <        Thread.sleep(SHORT_DELAY_MS);
763 >        threadStarted.await();
764 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
765          assertEquals(1, q.size());
766 <        assertEquals(SIZE, (int) q.poll());
767 <        assertTrue(q.isEmpty());
768 <        t.join();
766 >        assertSame(five, q.poll());
767 >        checkEmpty(q);
768 >        awaitTermination(t, MEDIUM_DELAY_MS);
769      }
770  
771      /**
# Line 912 | Line 776 | public class LinkedTransferQueueTest ext
776              = new LinkedTransferQueue<Integer>();
777  
778          Thread first = newStartedThread(new CheckedRunnable() {
779 <            void realRun() throws InterruptedException {
780 <                Integer i = SIZE + 1;
781 <                q.transfer(i);
782 <                threadAssertTrue(!q.contains(i));
919 <                threadAssertEquals(1, q.size());
779 >            public void realRun() throws InterruptedException {
780 >                q.transfer(four);
781 >                assertTrue(!q.contains(four));
782 >                assertEquals(1, q.size());
783              }});
784  
785          Thread interruptedThread = newStartedThread(
786              new CheckedInterruptedRunnable() {
787 <                void realRun() throws InterruptedException {
788 <                    while (q.size() == 0)
787 >                public void realRun() throws InterruptedException {
788 >                    while (q.isEmpty())
789                          Thread.yield();
790 <                    q.transfer(SIZE);
790 >                    q.transfer(five);
791                  }});
792  
793          while (q.size() < 2)
794              Thread.yield();
795          assertEquals(2, q.size());
796 <        assertEquals(SIZE + 1, (int) q.poll());
796 >        assertSame(four, q.poll());
797          first.join();
798          assertEquals(1, q.size());
799          interruptedThread.interrupt();
800          interruptedThread.join();
801 <        assertEquals(0, q.size());
939 <        assertTrue(q.isEmpty());
801 >        checkEmpty(q);
802      }
803  
804      /**
# Line 947 | Line 809 | public class LinkedTransferQueueTest ext
809          final LinkedTransferQueue q = new LinkedTransferQueue();
810  
811          Thread t = newStartedThread(new CheckedRunnable() {
812 <            void realRun() throws InterruptedException {
812 >            public void realRun() throws InterruptedException {
813                  q.transfer(four);
814 <                threadAssertFalse(q.contains(four));
815 <                threadAssertEquals(three, q.poll());
814 >                assertFalse(q.contains(four));
815 >                assertSame(three, q.poll());
816              }});
817  
818 <        Thread.sleep(SHORT_DELAY_MS);
818 >        while (q.isEmpty())
819 >            Thread.yield();
820 >        assertFalse(q.isEmpty());
821 >        assertEquals(1, q.size());
822          assertTrue(q.offer(three));
823 <        assertEquals(four, q.poll());
824 <        t.join();
823 >        assertSame(four, q.poll());
824 >        awaitTermination(t, MEDIUM_DELAY_MS);
825      }
826  
827      /**
# Line 968 | Line 833 | public class LinkedTransferQueueTest ext
833              = new LinkedTransferQueue<Integer>();
834  
835          Thread t = newStartedThread(new CheckedRunnable() {
836 <            void realRun() throws InterruptedException {
837 <                q.transfer(SIZE);
836 >            public void realRun() throws InterruptedException {
837 >                q.transfer(four);
838                  checkEmpty(q);
839              }});
840  
841 <        Thread.sleep(SHORT_DELAY_MS);
842 <        assertEquals(SIZE, (int) q.take());
841 >        while (q.isEmpty())
842 >            Thread.yield();
843 >        assertFalse(q.isEmpty());
844 >        assertEquals(1, q.size());
845 >        assertSame(four, q.take());
846          checkEmpty(q);
847 <        t.join();
847 >        awaitTermination(t, MEDIUM_DELAY_MS);
848      }
849  
850      /**
# Line 1010 | Line 878 | public class LinkedTransferQueueTest ext
878          final LinkedTransferQueue q = new LinkedTransferQueue();
879  
880          Thread t = newStartedThread(new CheckedRunnable() {
881 <            void realRun() {
881 >            public void realRun() {
882                  while (! q.hasWaitingConsumer())
883                      Thread.yield();
884 <                threadAssertTrue(q.hasWaitingConsumer());
885 <                threadAssertTrue(q.isEmpty());
886 <                threadAssertTrue(q.size() == 0);
1019 <                threadAssertTrue(q.tryTransfer(hotPotato));
884 >                assertTrue(q.hasWaitingConsumer());
885 >                checkEmpty(q);
886 >                assertTrue(q.tryTransfer(hotPotato));
887              }});
888  
889 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
889 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
890          checkEmpty(q);
891 <        t.join();
891 >        awaitTermination(t, MEDIUM_DELAY_MS);
892      }
893  
894      /**
# Line 1033 | Line 900 | public class LinkedTransferQueueTest ext
900          final LinkedTransferQueue q = new LinkedTransferQueue();
901  
902          Thread t = newStartedThread(new CheckedRunnable() {
903 <            void realRun() {
903 >            public void realRun() {
904                  while (! q.hasWaitingConsumer())
905                      Thread.yield();
906 <                threadAssertTrue(q.hasWaitingConsumer());
907 <                threadAssertTrue(q.isEmpty());
908 <                threadAssertTrue(q.size() == 0);
1042 <                threadAssertTrue(q.tryTransfer(hotPotato));
906 >                assertTrue(q.hasWaitingConsumer());
907 >                checkEmpty(q);
908 >                assertTrue(q.tryTransfer(hotPotato));
909              }});
910  
911 <        assertTrue(q.take() == hotPotato);
911 >        assertSame(q.take(), hotPotato);
912          checkEmpty(q);
913 <        t.join();
913 >        awaitTermination(t, MEDIUM_DELAY_MS);
914      }
915  
916      /**
917 <     * tryTransfer waits the amount given if interrupted, and
1052 <     * throws interrupted exception
917 >     * tryTransfer blocks interruptibly if no takers
918       */
919      public void testTryTransfer5() throws InterruptedException {
920          final LinkedTransferQueue q = new LinkedTransferQueue();
921 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
922 +        assertTrue(q.isEmpty());
923 +
924 +        Thread t = newStartedThread(new CheckedRunnable() {
925 +            public void realRun() throws InterruptedException {
926 +                Thread.currentThread().interrupt();
927 +                try {
928 +                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
929 +                    shouldThrow();
930 +                } catch (InterruptedException success) {}
931 +                assertFalse(Thread.interrupted());
932  
933 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
934 <            void realRun() throws InterruptedException {
935 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
933 >                pleaseInterrupt.countDown();
934 >                try {
935 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
936 >                    shouldThrow();
937 >                } catch (InterruptedException success) {}
938 >                assertFalse(Thread.interrupted());
939              }});
940  
941 <        Thread.sleep(SMALL_DELAY_MS);
942 <        toInterrupt.interrupt();
943 <        toInterrupt.join();
941 >        await(pleaseInterrupt);
942 >        assertThreadStaysAlive(t);
943 >        t.interrupt();
944 >        awaitTermination(t);
945 >        checkEmpty(q);
946      }
947  
948      /**
949 <     * tryTransfer gives up after the timeout and return false
949 >     * tryTransfer gives up after the timeout and returns false
950       */
951      public void testTryTransfer6() throws InterruptedException {
952          final LinkedTransferQueue q = new LinkedTransferQueue();
953  
954          Thread t = newStartedThread(new CheckedRunnable() {
955 <            void realRun() throws InterruptedException {
956 <                threadAssertFalse
957 <                    (q.tryTransfer(new Object(),
958 <                                   SHORT_DELAY_MS, MILLISECONDS));
955 >            public void realRun() throws InterruptedException {
956 >                long t0 = System.nanoTime();
957 >                assertFalse(q.tryTransfer(new Object(),
958 >                                          timeoutMillis(), MILLISECONDS));
959 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
960 >                checkEmpty(q);
961              }});
962  
963 <        Thread.sleep(SMALL_DELAY_MS);
963 >        awaitTermination(t);
964          checkEmpty(q);
1082        t.join();
965      }
966  
967      /**
# Line 1091 | Line 973 | public class LinkedTransferQueueTest ext
973          assertTrue(q.offer(four));
974  
975          Thread t = newStartedThread(new CheckedRunnable() {
976 <            void realRun() throws InterruptedException {
977 <                threadAssertTrue(q.tryTransfer(five,
978 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1097 <                threadAssertTrue(q.isEmpty());
976 >            public void realRun() throws InterruptedException {
977 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
978 >                checkEmpty(q);
979              }});
980  
981 <        Thread.sleep(SHORT_DELAY_MS);
981 >        while (q.size() != 2)
982 >            Thread.yield();
983          assertEquals(2, q.size());
984 <        assertEquals(four, q.poll());
985 <        assertEquals(five, q.poll());
984 >        assertSame(four, q.poll());
985 >        assertSame(five, q.poll());
986          checkEmpty(q);
987 <        t.join();
987 >        awaitTermination(t, MEDIUM_DELAY_MS);
988      }
989  
990      /**
991 <     * tryTransfer attempts to enqueue into the q and fails returning
992 <     * false not enqueueing and the successive poll is null
991 >     * tryTransfer attempts to enqueue into the queue and fails
992 >     * returning false not enqueueing and the successive poll is null
993       */
994      public void testTryTransfer8() throws InterruptedException {
995          final LinkedTransferQueue q = new LinkedTransferQueue();
996          assertTrue(q.offer(four));
997          assertEquals(1, q.size());
998 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
998 >        long t0 = System.nanoTime();
999 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1000 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1001          assertEquals(1, q.size());
1002 <        assertEquals(four, q.poll());
1002 >        assertSame(four, q.poll());
1003          assertNull(q.poll());
1004          checkEmpty(q);
1005      }
1006  
1007      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1008          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1009 <        assertTrue(q.isEmpty());
1009 >        checkEmpty(q);
1010          for (int i = 0; i < n; i++) {
1011              assertEquals(i, q.size());
1012              assertTrue(q.offer(i));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines