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.26 by jsr166, Tue Oct 19 00:41:14 2010 UTC vs.
Revision 1.52 by jsr166, Thu May 30 03:28:55 2013 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 {
# Line 39 | Line 39 | public class LinkedTransferQueueTest ext
39                              new Generic().testSuite());
40      }
41  
42    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
43        assertTrue(q.isEmpty());
44        assertEquals(0, q.size());
45        assertNull(q.peek());
46        assertNull(q.poll());
47        assertNull(q.poll(0, MILLISECONDS));
48        assertEquals(q.toString(), "[]");
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) {}
63    }
64
42      /**
43       * Constructor builds new queue with size being zero and empty
44       * being true
# Line 87 | 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];
92 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71          } catch (NullPointerException success) {}
72      }
# Line 99 | 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];
104 <            for (int i = 0; i < SIZE - 1; ++i) {
105 <                ints[i] = i;
106 <            }
107 <            new LinkedTransferQueue(Arrays.asList(ints));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86          } catch (NullPointerException success) {}
87      }
# Line 151 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
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    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 195 | Line 139 | public class LinkedTransferQueueTest ext
139      }
140  
141      /**
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    /**
142       * addAll of a collection with any null elements throws
143       * NullPointerException after possibly adding some elements
144       */
# Line 240 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
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    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
178          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
179          for (int i = 0; i < SIZE; ++i) {
180 <            assertEquals(q.size(), i);
180 >            assertEquals(i, q.size());
181              q.put(i);
182              assertTrue(q.contains(i));
183          }
# Line 273 | Line 194 | public class LinkedTransferQueueTest ext
194      }
195  
196      /**
197 <     * 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
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();
309 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 322 | 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 334 | 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);
345 <            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 353 | 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              public void realRun() throws InterruptedException {
278                  for (int i = 0; i < SIZE; ++i) {
279                      long t0 = System.nanoTime();
280                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
281 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
363 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
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 after thread interrupted throws InterruptedException
302 >     * instead of returning timeout status
303 >     */
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(MEDIUM_DELAY_MS, MILLISECONDS);
316 >                    shouldThrow();
317 >                } catch (InterruptedException success) {}
318 >            }});
319 >
320 >        awaitTermination(t, MEDIUM_DELAY_MS);
321          checkEmpty(q);
322      }
323  
# Line 421 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
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    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 527 | 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
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
486 >     * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
489          LinkedTransferQueue q = populatedQueue(SIZE);
490          try {
491 <            Object o[] = q.toArray(new String[10]);
491 >            q.toArray(new String[10]);
492              shouldThrow();
493          } catch (ArrayStoreException success) {}
494      }
# Line 643 | 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 652 | Line 574 | public class LinkedTransferQueueTest ext
574       */
575      public void testOfferInExecutor() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
577 <        q.add(one);
656 <        q.add(two);
577 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
578          ExecutorService executor = Executors.newFixedThreadPool(2);
579  
580          executor.execute(new CheckedRunnable() {
581 <            public void realRun() {
582 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, 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              public void realRun() throws InterruptedException {
588 <                Thread.sleep(SMALL_DELAY_MS);
588 >                threadsStarted.await();
589                  assertSame(one, q.take());
590 +                checkEmpty(q);
591              }});
592  
593          joinPool(executor);
# Line 675 | 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              public void realRun() throws InterruptedException {
606                  assertNull(q.poll());
607 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
608 <                assertTrue(q.isEmpty());
607 >                threadsStarted.await();
608 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609 >                checkEmpty(q);
610              }});
611  
612          executor.execute(new CheckedRunnable() {
613              public void realRun() throws InterruptedException {
614 <                Thread.sleep(SMALL_DELAY_MS);
614 >                threadsStarted.await();
615                  q.put(one);
616              }});
617  
# Line 697 | 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 <
702 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
703 <        ObjectOutputStream out
704 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
705 <        out.writeObject(q);
706 <        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());
715 <        while (!q.isEmpty()) {
716 <            assertEquals(q.remove(), r.remove());
628 >        assertNotSame(y, x);
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 <    }
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) {}
636 >        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 746 | Line 643 | public class LinkedTransferQueueTest ext
643          LinkedTransferQueue q = populatedQueue(SIZE);
644          ArrayList l = new ArrayList();
645          q.drainTo(l);
646 <        assertEquals(q.size(), 0);
647 <        assertEquals(l.size(), SIZE);
646 >        assertEquals(0, q.size());
647 >        assertEquals(SIZE, l.size());
648          for (int i = 0; i < SIZE; ++i) {
649 <            assertEquals(l.get(i), i);
649 >            assertEquals(i, l.get(i));
650          }
651          q.add(zero);
652          q.add(one);
# Line 758 | Line 655 | public class LinkedTransferQueueTest ext
655          assertTrue(q.contains(one));
656          l.clear();
657          q.drainTo(l);
658 <        assertEquals(q.size(), 0);
659 <        assertEquals(l.size(), 2);
658 >        assertEquals(0, q.size());
659 >        assertEquals(2, l.size());
660          for (int i = 0; i < 2; ++i) {
661 <            assertEquals(l.get(i), i);
661 >            assertEquals(i, l.get(i));
662          }
663      }
664  
# Line 777 | Line 674 | public class LinkedTransferQueueTest ext
674          ArrayList l = new ArrayList();
675          q.drainTo(l);
676          assertTrue(l.size() >= SIZE);
677 <        for (int i = 0; i < SIZE; ++i) {
678 <            assertEquals(l.get(i), i);
679 <        }
783 <        t.join();
677 >        for (int i = 0; i < SIZE; ++i)
678 >            assertEquals(i, l.get(i));
679 >        awaitTermination(t, MEDIUM_DELAY_MS);
680          assertTrue(q.size() + l.size() >= SIZE);
681      }
682  
683      /**
788     * 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    /**
684       * drainTo(c, n) empties first min(n, size) elements of queue into c
685       */
686      public void testDrainToN() {
# Line 818 | Line 692 | public class LinkedTransferQueueTest ext
692              ArrayList l = new ArrayList();
693              q.drainTo(l, i);
694              int k = (i < SIZE) ? i : SIZE;
695 <            assertEquals(l.size(), k);
696 <            assertEquals(q.size(), SIZE - k);
697 <            for (int j = 0; j < k; ++j) {
698 <                assertEquals(l.get(j), j);
825 <            }
695 >            assertEquals(k, l.size());
696 >            assertEquals(SIZE - k, q.size());
697 >            for (int j = 0; j < k; ++j)
698 >                assertEquals(j, l.get(j));
699              while (q.poll() != null)
700                  ;
701          }
# Line 834 | 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              public void realRun() throws InterruptedException {
716 <                Thread.sleep(SMALL_DELAY_MS);
717 <                assertTrue(q.hasWaitingConsumer());
718 <                assertEquals(q.getWaitingConsumerCount(), 1);
845 <                assertTrue(q.offer(one));
716 >                threadStarted.countDown();
717 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
718 >                assertEquals(0, q.getWaitingConsumerCount());
719                  assertFalse(q.hasWaitingConsumer());
847                assertEquals(q.getWaitingConsumerCount(), 0);
720              }});
721  
722 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
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 871 | 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              public void realRun() throws InterruptedException {
756 <                q.transfer(SIZE);
757 <                assertTrue(q.isEmpty());
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 894 | Line 775 | public class LinkedTransferQueueTest ext
775  
776          Thread first = newStartedThread(new CheckedRunnable() {
777              public void realRun() throws InterruptedException {
778 <                Integer i = SIZE + 1;
779 <                q.transfer(i);
899 <                assertTrue(!q.contains(i));
778 >                q.transfer(four);
779 >                assertTrue(!q.contains(four));
780                  assertEquals(1, q.size());
781              }});
782  
783          Thread interruptedThread = newStartedThread(
784              new CheckedInterruptedRunnable() {
785                  public void realRun() throws InterruptedException {
786 <                    while (q.size() == 0)
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());
920 <        assertTrue(q.isEmpty());
799 >        checkEmpty(q);
800      }
801  
802      /**
# Line 934 | Line 813 | public class LinkedTransferQueueTest ext
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          assertSame(four, q.poll());
822 <        t.join();
822 >        awaitTermination(t, MEDIUM_DELAY_MS);
823      }
824  
825      /**
# Line 950 | Line 832 | public class LinkedTransferQueueTest ext
832  
833          Thread t = newStartedThread(new CheckedRunnable() {
834              public void realRun() throws InterruptedException {
835 <                q.transfer(SIZE);
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 995 | Line 880 | public class LinkedTransferQueueTest ext
880                  while (! q.hasWaitingConsumer())
881                      Thread.yield();
882                  assertTrue(q.hasWaitingConsumer());
883 <                assertTrue(q.isEmpty());
999 <                assertEquals(q.size(), 0);
883 >                checkEmpty(q);
884                  assertTrue(q.tryTransfer(hotPotato));
885              }});
886  
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 1018 | Line 902 | public class LinkedTransferQueueTest ext
902                  while (! q.hasWaitingConsumer())
903                      Thread.yield();
904                  assertTrue(q.hasWaitingConsumer());
905 <                assertTrue(q.isEmpty());
1022 <                assertEquals(q.size(), 0);
905 >                checkEmpty(q);
906                  assertTrue(q.tryTransfer(hotPotato));
907              }});
908  
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
1033 <     * 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() {
922 >        Thread t = newStartedThread(new CheckedRunnable() {
923              public void realRun() throws InterruptedException {
924 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
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              public void realRun() throws InterruptedException {
954 +                long t0 = System.nanoTime();
955                  assertFalse(q.tryTransfer(new Object(),
956 <                                          SHORT_DELAY_MS, MILLISECONDS));
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);
1062        t.join();
963      }
964  
965      /**
# Line 1073 | Line 973 | public class LinkedTransferQueueTest ext
973          Thread t = newStartedThread(new CheckedRunnable() {
974              public void realRun() throws InterruptedException {
975                  assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
976 <                assertTrue(q.isEmpty());
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          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          assertSame(four, q.poll());
1001          assertNull(q.poll());
# Line 1101 | Line 1004 | public class LinkedTransferQueueTest ext
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));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines