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.28 by jsr166, Thu Oct 28 17:57:26 2010 UTC vs.
Revision 1.48 by jsr166, Tue May 31 16:16:24 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 static java.util.concurrent.TimeUnit.NANOSECONDS;
22 import junit.framework.Test;
23 import junit.framework.TestSuite;
23  
24   @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 40 | Line 39 | public class LinkedTransferQueueTest ext
39                              new Generic().testSuite());
40      }
41  
43    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
44        assertTrue(q.isEmpty());
45        assertEquals(0, q.size());
46        assertNull(q.peek());
47        assertNull(q.poll());
48        assertNull(q.poll(0, MILLISECONDS));
49        assertEquals(q.toString(), "[]");
50        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
51        assertFalse(q.iterator().hasNext());
52        try {
53            q.element();
54            shouldThrow();
55        } catch (NoSuchElementException success) {}
56        try {
57            q.iterator().next();
58            shouldThrow();
59        } catch (NoSuchElementException success) {}
60        try {
61            q.remove();
62            shouldThrow();
63        } catch (NoSuchElementException success) {}
64    }
65
42      /**
43       * Constructor builds new queue with size being zero and empty
44       * being true
# Line 88 | 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];
93 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71          } catch (NullPointerException success) {}
72      }
# Line 100 | 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];
105 <            for (int i = 0; i < SIZE - 1; ++i) {
106 <                ints[i] = i;
107 <            }
108 <            new LinkedTransferQueue(Arrays.asList(ints));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86          } catch (NullPointerException success) {}
87      }
# Line 152 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
155     * offer(null) throws NullPointerException
156     */
157    public void testOfferNull() {
158        try {
159            LinkedTransferQueue q = new LinkedTransferQueue();
160            q.offer(null);
161            shouldThrow();
162        } catch (NullPointerException success) {}
163    }
164
165    /**
166     * add(null) throws NullPointerException
167     */
168    public void testAddNull() {
169        try {
170            LinkedTransferQueue q = new LinkedTransferQueue();
171            q.add(null);
172            shouldThrow();
173        } catch (NullPointerException success) {}
174    }
175
176    /**
177     * addAll(null) throws NullPointerException
178     */
179    public void testAddAll1() {
180        try {
181            LinkedTransferQueue q = new LinkedTransferQueue();
182            q.addAll(null);
183            shouldThrow();
184        } catch (NullPointerException success) {}
185    }
186
187    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 196 | Line 139 | public class LinkedTransferQueueTest ext
139      }
140  
141      /**
199     * addAll of a collection with null elements throws NullPointerException
200     */
201    public void testAddAll2() {
202        try {
203            LinkedTransferQueue q = new LinkedTransferQueue();
204            Integer[] ints = new Integer[SIZE];
205            q.addAll(Arrays.asList(ints));
206            shouldThrow();
207        } catch (NullPointerException success) {}
208    }
209
210    /**
142       * addAll of a collection with any null elements throws
143       * NullPointerException after possibly adding some elements
144       */
# Line 241 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
244     * put(null) throws NullPointerException
245     */
246    public void testPutNull() throws InterruptedException {
247        try {
248            LinkedTransferQueue q = new LinkedTransferQueue();
249            q.put(null);
250            shouldThrow();
251        } catch (NullPointerException success) {}
252    }
253
254    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
# Line 277 | Line 197 | public class LinkedTransferQueueTest ext
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();
296 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 309 | 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 321 | 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 <            assertTrue(millisElapsedSince(t0) < 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 339 | 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) {
# Line 347 | Line 280 | public class LinkedTransferQueueTest ext
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 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 410 | Line 372 | public class LinkedTransferQueueTest ext
372       */
373      public void testRemoveElement() throws InterruptedException {
374          LinkedTransferQueue q = populatedQueue(SIZE);
375 <        for (int i = 1; i < SIZE; i += 2) {
375 >        for (int i = 1; i < SIZE; i+=2) {
376 >            assertTrue(q.contains(i));
377              assertTrue(q.remove(i));
378 +            assertFalse(q.contains(i));
379 +            assertTrue(q.contains(i-1));
380          }
381 <        for (int i = 0; i < SIZE; i += 2) {
381 >        for (int i = 0; i < SIZE; i+=2) {
382 >            assertTrue(q.contains(i));
383              assertTrue(q.remove(i));
384 <            assertFalse(q.remove(i + 1));
384 >            assertFalse(q.contains(i));
385 >            assertFalse(q.remove(i+1));
386 >            assertFalse(q.contains(i+1));
387          }
388          checkEmpty(q);
389      }
# Line 512 | Line 480 | public class LinkedTransferQueueTest ext
480      }
481  
482      /**
483 <     * toArray() contains all elements
483 >     * toArray() contains all elements in FIFO order
484       */
485 <    public void testToArray() throws InterruptedException {
485 >    public void testToArray() {
486          LinkedTransferQueue q = populatedQueue(SIZE);
487          Object[] o = q.toArray();
488          for (int i = 0; i < o.length; i++) {
489 <            assertEquals(o[i], q.take());
489 >            assertSame(o[i], q.poll());
490          }
491      }
492  
493      /**
494 <     * toArray(a) contains all elements
494 >     * toArray(a) contains all elements in FIFO order
495       */
496 <    public void testToArray2() throws InterruptedException {
496 >    public void testToArray2() {
497          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
498          Integer[] ints = new Integer[SIZE];
499 <        ints = q.toArray(ints);
499 >        Integer[] array = q.toArray(ints);
500 >        assertSame(ints, array);
501          for (int i = 0; i < ints.length; i++) {
502 <            assertEquals(ints[i], q.take());
502 >            assertSame(ints[i], q.poll());
503          }
504      }
505  
506      /**
507 <     * toArray(null) throws NullPointerException
539 <     */
540 <    public void testToArray_BadArg() {
541 <        LinkedTransferQueue q = populatedQueue(SIZE);
542 <        try {
543 <            Object o[] = q.toArray(null);
544 <            shouldThrow();
545 <        } catch (NullPointerException success) {}
546 <    }
547 <
548 <    /**
549 <     * toArray(incompatible array type) throws CCE
507 >     * toArray(incompatible array type) throws ArrayStoreException
508       */
509      public void testToArray1_BadArg() {
510          LinkedTransferQueue q = populatedQueue(SIZE);
511          try {
512 <            Object o[] = q.toArray(new String[10]);
512 >            q.toArray(new String[10]);
513              shouldThrow();
514          } catch (ArrayStoreException success) {}
515      }
# Line 628 | Line 586 | public class LinkedTransferQueueTest ext
586          LinkedTransferQueue q = populatedQueue(SIZE);
587          String s = q.toString();
588          for (int i = 0; i < SIZE; ++i) {
589 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
589 >            assertTrue(s.contains(String.valueOf(i)));
590          }
591      }
592  
# Line 637 | Line 595 | public class LinkedTransferQueueTest ext
595       */
596      public void testOfferInExecutor() {
597          final LinkedTransferQueue q = new LinkedTransferQueue();
598 <        q.add(one);
641 <        q.add(two);
598 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
599          ExecutorService executor = Executors.newFixedThreadPool(2);
600  
601          executor.execute(new CheckedRunnable() {
602 <            public void realRun() {
603 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
602 >            public void realRun() throws InterruptedException {
603 >                threadsStarted.await();
604 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
605              }});
606  
607          executor.execute(new CheckedRunnable() {
608              public void realRun() throws InterruptedException {
609 <                Thread.sleep(SMALL_DELAY_MS);
609 >                threadsStarted.await();
610                  assertSame(one, q.take());
611 +                checkEmpty(q);
612              }});
613  
614          joinPool(executor);
# Line 660 | Line 619 | public class LinkedTransferQueueTest ext
619       */
620      public void testPollInExecutor() {
621          final LinkedTransferQueue q = new LinkedTransferQueue();
622 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
623          ExecutorService executor = Executors.newFixedThreadPool(2);
624  
625          executor.execute(new CheckedRunnable() {
626              public void realRun() throws InterruptedException {
627                  assertNull(q.poll());
628 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
629 <                assertTrue(q.isEmpty());
628 >                threadsStarted.await();
629 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630 >                checkEmpty(q);
631              }});
632  
633          executor.execute(new CheckedRunnable() {
634              public void realRun() throws InterruptedException {
635 <                Thread.sleep(SMALL_DELAY_MS);
635 >                threadsStarted.await();
636                  q.put(one);
637              }});
638  
# Line 682 | Line 643 | public class LinkedTransferQueueTest ext
643       * A deserialized serialized queue has same elements in same order
644       */
645      public void testSerialization() throws Exception {
646 <        LinkedTransferQueue q = populatedQueue(SIZE);
647 <
687 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
688 <        ObjectOutputStream out
689 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
690 <        out.writeObject(q);
691 <        out.close();
692 <
693 <        ByteArrayInputStream bin
694 <            = new ByteArrayInputStream(bout.toByteArray());
695 <        ObjectInputStream in
696 <            = new ObjectInputStream(new BufferedInputStream(bin));
697 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
646 >        Queue x = populatedQueue(SIZE);
647 >        Queue y = serialClone(x);
648  
649 <        assertEquals(q.size(), r.size());
650 <        while (!q.isEmpty()) {
651 <            assertEquals(q.remove(), r.remove());
649 >        assertTrue(x != y);
650 >        assertEquals(x.size(), y.size());
651 >        assertEquals(x.toString(), y.toString());
652 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
653 >        while (!x.isEmpty()) {
654 >            assertFalse(y.isEmpty());
655 >            assertEquals(x.remove(), y.remove());
656          }
657 <    }
704 <
705 <    /**
706 <     * drainTo(null) throws NullPointerException
707 <     */
708 <    public void testDrainToNull() {
709 <        LinkedTransferQueue q = populatedQueue(SIZE);
710 <        try {
711 <            q.drainTo(null);
712 <            shouldThrow();
713 <        } catch (NullPointerException success) {}
714 <    }
715 <
716 <    /**
717 <     * drainTo(this) throws IllegalArgumentException
718 <     */
719 <    public void testDrainToSelf() {
720 <        LinkedTransferQueue q = populatedQueue(SIZE);
721 <        try {
722 <            q.drainTo(q);
723 <            shouldThrow();
724 <        } catch (IllegalArgumentException success) {}
657 >        assertTrue(y.isEmpty());
658      }
659  
660      /**
# Line 765 | Line 698 | public class LinkedTransferQueueTest ext
698          for (int i = 0; i < SIZE; ++i) {
699              assertEquals(l.get(i), i);
700          }
701 <        t.join();
701 >        awaitTermination(t, MEDIUM_DELAY_MS);
702          assertTrue(q.size() + l.size() >= SIZE);
703      }
704  
705      /**
773     * drainTo(null, n) throws NullPointerException
774     */
775    public void testDrainToNullN() {
776        LinkedTransferQueue q = populatedQueue(SIZE);
777        try {
778            q.drainTo(null, SIZE);
779            shouldThrow();
780        } catch (NullPointerException success) {}
781    }
782
783    /**
784     * drainTo(this, n) throws IllegalArgumentException
785     */
786    public void testDrainToSelfN() {
787        LinkedTransferQueue q = populatedQueue(SIZE);
788        try {
789            q.drainTo(q, SIZE);
790            shouldThrow();
791        } catch (IllegalArgumentException success) {}
792    }
793
794    /**
706       * drainTo(c, n) empties first min(n, size) elements of queue into c
707       */
708      public void testDrainToN() {
# Line 821 | Line 732 | public class LinkedTransferQueueTest ext
732          final LinkedTransferQueue q = new LinkedTransferQueue();
733          assertEquals(q.getWaitingConsumerCount(), 0);
734          assertFalse(q.hasWaitingConsumer());
735 +        final CountDownLatch threadStarted = new CountDownLatch(1);
736  
737          Thread t = newStartedThread(new CheckedRunnable() {
738              public void realRun() throws InterruptedException {
739 <                Thread.sleep(SMALL_DELAY_MS);
740 <                assertTrue(q.hasWaitingConsumer());
829 <                assertEquals(q.getWaitingConsumerCount(), 1);
830 <                assertTrue(q.offer(one));
831 <                assertFalse(q.hasWaitingConsumer());
739 >                threadStarted.countDown();
740 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
741                  assertEquals(q.getWaitingConsumerCount(), 0);
742 +                assertFalse(q.hasWaitingConsumer());
743              }});
744  
745 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
745 >        threadStarted.await();
746 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
747 >        assertEquals(q.getWaitingConsumerCount(), 1);
748 >        assertTrue(q.hasWaitingConsumer());
749 >
750 >        assertTrue(q.offer(one));
751          assertEquals(q.getWaitingConsumerCount(), 0);
752          assertFalse(q.hasWaitingConsumer());
753 <        t.join();
753 >
754 >        awaitTermination(t, MEDIUM_DELAY_MS);
755      }
756  
757      /**
# Line 856 | Line 772 | public class LinkedTransferQueueTest ext
772      public void testTransfer2() throws InterruptedException {
773          final LinkedTransferQueue<Integer> q
774              = new LinkedTransferQueue<Integer>();
775 +        final CountDownLatch threadStarted = new CountDownLatch(1);
776  
777          Thread t = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                q.transfer(SIZE);
780 <                assertTrue(q.isEmpty());
779 >                threadStarted.countDown();
780 >                q.transfer(five);
781 >                checkEmpty(q);
782              }});
783  
784 <        Thread.sleep(SHORT_DELAY_MS);
784 >        threadStarted.await();
785 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
786          assertEquals(1, q.size());
787 <        assertEquals(SIZE, (int) q.poll());
788 <        assertTrue(q.isEmpty());
789 <        t.join();
787 >        assertSame(five, q.poll());
788 >        checkEmpty(q);
789 >        awaitTermination(t, MEDIUM_DELAY_MS);
790      }
791  
792      /**
# Line 879 | Line 798 | public class LinkedTransferQueueTest ext
798  
799          Thread first = newStartedThread(new CheckedRunnable() {
800              public void realRun() throws InterruptedException {
801 <                Integer i = SIZE + 1;
802 <                q.transfer(i);
884 <                assertTrue(!q.contains(i));
801 >                q.transfer(four);
802 >                assertTrue(!q.contains(four));
803                  assertEquals(1, q.size());
804              }});
805  
806          Thread interruptedThread = newStartedThread(
807              new CheckedInterruptedRunnable() {
808                  public void realRun() throws InterruptedException {
809 <                    while (q.size() == 0)
809 >                    while (q.isEmpty())
810                          Thread.yield();
811 <                    q.transfer(SIZE);
811 >                    q.transfer(five);
812                  }});
813  
814          while (q.size() < 2)
815              Thread.yield();
816          assertEquals(2, q.size());
817 <        assertEquals(SIZE + 1, (int) q.poll());
817 >        assertSame(four, q.poll());
818          first.join();
819          assertEquals(1, q.size());
820          interruptedThread.interrupt();
821          interruptedThread.join();
822 <        assertEquals(0, q.size());
905 <        assertTrue(q.isEmpty());
822 >        checkEmpty(q);
823      }
824  
825      /**
# Line 919 | Line 836 | public class LinkedTransferQueueTest ext
836                  assertSame(three, q.poll());
837              }});
838  
839 <        Thread.sleep(SHORT_DELAY_MS);
839 >        while (q.isEmpty())
840 >            Thread.yield();
841 >        assertFalse(q.isEmpty());
842 >        assertEquals(1, q.size());
843          assertTrue(q.offer(three));
844          assertSame(four, q.poll());
845 <        t.join();
845 >        awaitTermination(t, MEDIUM_DELAY_MS);
846      }
847  
848      /**
# Line 935 | Line 855 | public class LinkedTransferQueueTest ext
855  
856          Thread t = newStartedThread(new CheckedRunnable() {
857              public void realRun() throws InterruptedException {
858 <                q.transfer(SIZE);
858 >                q.transfer(four);
859                  checkEmpty(q);
860              }});
861  
862 <        Thread.sleep(SHORT_DELAY_MS);
863 <        assertEquals(SIZE, (int) q.take());
862 >        while (q.isEmpty())
863 >            Thread.yield();
864 >        assertFalse(q.isEmpty());
865 >        assertEquals(1, q.size());
866 >        assertSame(four, q.take());
867          checkEmpty(q);
868 <        t.join();
868 >        awaitTermination(t, MEDIUM_DELAY_MS);
869      }
870  
871      /**
# Line 980 | Line 903 | public class LinkedTransferQueueTest ext
903                  while (! q.hasWaitingConsumer())
904                      Thread.yield();
905                  assertTrue(q.hasWaitingConsumer());
906 <                assertTrue(q.isEmpty());
984 <                assertEquals(q.size(), 0);
906 >                checkEmpty(q);
907                  assertTrue(q.tryTransfer(hotPotato));
908              }});
909  
910          assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
911          checkEmpty(q);
912 <        t.join();
912 >        awaitTermination(t, MEDIUM_DELAY_MS);
913      }
914  
915      /**
# Line 1003 | Line 925 | public class LinkedTransferQueueTest ext
925                  while (! q.hasWaitingConsumer())
926                      Thread.yield();
927                  assertTrue(q.hasWaitingConsumer());
928 <                assertTrue(q.isEmpty());
1007 <                assertEquals(q.size(), 0);
928 >                checkEmpty(q);
929                  assertTrue(q.tryTransfer(hotPotato));
930              }});
931  
932          assertSame(q.take(), hotPotato);
933          checkEmpty(q);
934 <        t.join();
934 >        awaitTermination(t, MEDIUM_DELAY_MS);
935      }
936  
937      /**
938 <     * tryTransfer waits the amount given if interrupted, and
1018 <     * throws interrupted exception
938 >     * tryTransfer blocks interruptibly if no takers
939       */
940      public void testTryTransfer5() throws InterruptedException {
941          final LinkedTransferQueue q = new LinkedTransferQueue();
942 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
943 +        assertTrue(q.isEmpty());
944  
945 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
945 >        Thread t = newStartedThread(new CheckedRunnable() {
946              public void realRun() throws InterruptedException {
947 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
947 >                Thread.currentThread().interrupt();
948 >                try {
949 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
950 >                    shouldThrow();
951 >                } catch (InterruptedException success) {}
952 >                assertFalse(Thread.interrupted());
953 >
954 >                pleaseInterrupt.countDown();
955 >                try {
956 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
957 >                    shouldThrow();
958 >                } catch (InterruptedException success) {}
959 >                assertFalse(Thread.interrupted());
960              }});
961  
962 <        Thread.sleep(SMALL_DELAY_MS);
963 <        toInterrupt.interrupt();
964 <        toInterrupt.join();
962 >        await(pleaseInterrupt);
963 >        assertThreadStaysAlive(t);
964 >        t.interrupt();
965 >        awaitTermination(t);
966 >        checkEmpty(q);
967      }
968  
969      /**
970 <     * tryTransfer gives up after the timeout and return false
970 >     * tryTransfer gives up after the timeout and returns false
971       */
972      public void testTryTransfer6() throws InterruptedException {
973          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 1040 | Line 976 | public class LinkedTransferQueueTest ext
976              public void realRun() throws InterruptedException {
977                  long t0 = System.nanoTime();
978                  assertFalse(q.tryTransfer(new Object(),
979 <                                          SHORT_DELAY_MS, MILLISECONDS));
980 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
979 >                                          timeoutMillis(), MILLISECONDS));
980 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
981 >                checkEmpty(q);
982              }});
983  
984 <        checkEmpty(q);
1048 <        awaitTermination(t, MEDIUM_DELAY_MS);
984 >        awaitTermination(t);
985          checkEmpty(q);
986      }
987  
# Line 1060 | Line 996 | public class LinkedTransferQueueTest ext
996          Thread t = newStartedThread(new CheckedRunnable() {
997              public void realRun() throws InterruptedException {
998                  assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
999 <                assertTrue(q.isEmpty());
999 >                checkEmpty(q);
1000              }});
1001  
1002 <        Thread.sleep(SHORT_DELAY_MS);
1002 >        while (q.size() != 2)
1003 >            Thread.yield();
1004          assertEquals(2, q.size());
1005          assertSame(four, q.poll());
1006          assertSame(five, q.poll());
1007          checkEmpty(q);
1008 <        t.join();
1008 >        awaitTermination(t, MEDIUM_DELAY_MS);
1009      }
1010  
1011      /**
1012 <     * tryTransfer attempts to enqueue into the q and fails returning
1013 <     * false not enqueueing and the successive poll is null
1012 >     * tryTransfer attempts to enqueue into the queue and fails
1013 >     * returning false not enqueueing and the successive poll is null
1014       */
1015      public void testTryTransfer8() throws InterruptedException {
1016          final LinkedTransferQueue q = new LinkedTransferQueue();
1017          assertTrue(q.offer(four));
1018          assertEquals(1, q.size());
1019 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1019 >        long t0 = System.nanoTime();
1020 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1021 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1022          assertEquals(1, q.size());
1023          assertSame(four, q.poll());
1024          assertNull(q.poll());
# Line 1088 | Line 1027 | public class LinkedTransferQueueTest ext
1027  
1028      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1029          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1030 <        assertTrue(q.isEmpty());
1030 >        checkEmpty(q);
1031          for (int i = 0; i < n; i++) {
1032              assertEquals(i, q.size());
1033              assertTrue(q.offer(i));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines