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.27 by jsr166, Thu Oct 28 17:22:13 2010 UTC vs.
Revision 1.55 by jsr166, Wed Dec 31 19:05:43 2014 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11   import java.util.Arrays;
12 + import java.util.Collection;
13   import java.util.Iterator;
14   import java.util.List;
15   import java.util.NoSuchElementException;
16 < import java.util.concurrent.*;
17 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
18 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
16 > import java.util.Queue;
17 > import java.util.concurrent.BlockingQueue;
18 > import java.util.concurrent.CountDownLatch;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.LinkedTransferQueue;
22 >
23   import junit.framework.Test;
23 import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 40 | Line 40 | public class LinkedTransferQueueTest ext
40                              new Generic().testSuite());
41      }
42  
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
43      /**
44       * Constructor builds new queue with size being zero and empty
45       * being true
# Line 88 | Line 65 | public class LinkedTransferQueueTest ext
65       * NullPointerException
66       */
67      public void testConstructor3() {
68 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
69          try {
70 <            Integer[] ints = new Integer[SIZE];
93 <            new LinkedTransferQueue(Arrays.asList(ints));
70 >            new LinkedTransferQueue(elements);
71              shouldThrow();
72          } catch (NullPointerException success) {}
73      }
# Line 100 | Line 77 | public class LinkedTransferQueueTest ext
77       * throws NullPointerException
78       */
79      public void testConstructor4() {
80 +        Integer[] ints = new Integer[SIZE];
81 +        for (int i = 0; i < SIZE-1; ++i)
82 +            ints[i] = i;
83 +        Collection<Integer> elements = Arrays.asList(ints);
84          try {
85 <            Integer[] ints = new Integer[SIZE];
105 <            for (int i = 0; i < SIZE - 1; ++i) {
106 <                ints[i] = i;
107 <            }
108 <            new LinkedTransferQueue(Arrays.asList(ints));
85 >            new LinkedTransferQueue(elements);
86              shouldThrow();
87          } catch (NullPointerException success) {}
88      }
# Line 152 | Line 129 | public class LinkedTransferQueueTest ext
129      }
130  
131      /**
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    /**
132       * addAll(this) throws IllegalArgumentException
133       */
134      public void testAddAllSelf() {
# Line 196 | Line 140 | public class LinkedTransferQueueTest ext
140      }
141  
142      /**
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    /**
143       * addAll of a collection with any null elements throws
144       * NullPointerException after possibly adding some elements
145       */
# Line 241 | Line 173 | public class LinkedTransferQueueTest ext
173      }
174  
175      /**
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    /**
176       * all elements successfully put are contained
177       */
178      public void testPut() {
179          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
180          for (int i = 0; i < SIZE; ++i) {
181 <            assertEquals(q.size(), i);
181 >            assertEquals(i, q.size());
182              q.put(i);
183              assertTrue(q.contains(i));
184          }
# Line 274 | Line 195 | public class LinkedTransferQueueTest ext
195      }
196  
197      /**
198 <     * take blocks interruptibly when empty
278 <     */
279 <    public void testTakeFromEmpty() throws InterruptedException {
280 <        final LinkedTransferQueue q = new LinkedTransferQueue();
281 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
282 <            public void realRun() throws InterruptedException {
283 <                q.take();
284 <            }});
285 <        Thread.sleep(SHORT_DELAY_MS);
286 <        t.interrupt();
287 <        t.join();
288 <    }
289 <
290 <    /**
291 <     * Take removes existing elements until empty, then blocks interruptibly
198 >     * take removes existing elements until empty, then blocks interruptibly
199       */
200      public void testBlockingTake() throws InterruptedException {
201 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
202 <        Thread t = new Thread(new CheckedRunnable() {
201 >        final BlockingQueue q = populatedQueue(SIZE);
202 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
203 >        Thread t = newStartedThread(new CheckedRunnable() {
204              public void realRun() throws InterruptedException {
205                  for (int i = 0; i < SIZE; ++i) {
206 <                    assertEquals(i, (int) q.take());
206 >                    assertEquals(i, q.take());
207                  }
208 +
209 +                Thread.currentThread().interrupt();
210 +                try {
211 +                    q.take();
212 +                    shouldThrow();
213 +                } catch (InterruptedException success) {}
214 +                assertFalse(Thread.interrupted());
215 +
216 +                pleaseInterrupt.countDown();
217                  try {
218                      q.take();
219                      shouldThrow();
220                  } catch (InterruptedException success) {}
221 +                assertFalse(Thread.interrupted());
222              }});
223  
224 <        t.start();
225 <        Thread.sleep(SHORT_DELAY_MS);
224 >        await(pleaseInterrupt);
225 >        assertThreadStaysAlive(t);
226          t.interrupt();
227 <        t.join();
310 <        checkEmpty(q);
227 >        awaitTermination(t);
228      }
229  
230      /**
# Line 323 | Line 240 | public class LinkedTransferQueueTest ext
240      }
241  
242      /**
243 <     * timed pool with zero timeout succeeds when non-empty, else times out
243 >     * timed poll with zero timeout succeeds when non-empty, else times out
244       */
245      public void testTimedPoll0() throws InterruptedException {
246          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 335 | Line 252 | public class LinkedTransferQueueTest ext
252      }
253  
254      /**
255 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
255 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
256       */
257      public void testTimedPoll() throws InterruptedException {
258          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            long t0 = System.nanoTime();
260 >            long startTime = System.nanoTime();
261              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
262 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
346 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
262 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
263          }
264 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
264 >        long startTime = System.nanoTime();
265 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
266 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
267          checkEmpty(q);
268      }
269  
# Line 354 | Line 272 | public class LinkedTransferQueueTest ext
272       * returning timeout status
273       */
274      public void testInterruptedTimedPoll() throws InterruptedException {
275 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
275 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
276 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
277          Thread t = newStartedThread(new CheckedRunnable() {
278              public void realRun() throws InterruptedException {
279                  for (int i = 0; i < SIZE; ++i) {
280                      long t0 = System.nanoTime();
281                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
282 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
364 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
282 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
283                  }
284 +                long t0 = System.nanoTime();
285 +                aboutToWait.countDown();
286                  try {
287 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
287 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
288                      shouldThrow();
289 <                } catch (InterruptedException success) {}
289 >                } catch (InterruptedException success) {
290 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
291 >                }
292              }});
293  
294 <        Thread.sleep(SMALL_DELAY_MS);
294 >        aboutToWait.await();
295 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
296          t.interrupt();
297 <        t.join();
297 >        awaitTermination(t, MEDIUM_DELAY_MS);
298 >        checkEmpty(q);
299 >    }
300 >
301 >    /**
302 >     * timed poll after thread interrupted throws InterruptedException
303 >     * instead of returning timeout status
304 >     */
305 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
306 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
307 >        Thread t = newStartedThread(new CheckedRunnable() {
308 >            public void realRun() throws InterruptedException {
309 >                Thread.currentThread().interrupt();
310 >                for (int i = 0; i < SIZE; ++i) {
311 >                    long t0 = System.nanoTime();
312 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
313 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
314 >                }
315 >                try {
316 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
317 >                    shouldThrow();
318 >                } catch (InterruptedException success) {}
319 >            }});
320 >
321 >        awaitTermination(t, MEDIUM_DELAY_MS);
322          checkEmpty(q);
323      }
324  
# Line 422 | Line 369 | public class LinkedTransferQueueTest ext
369      }
370  
371      /**
425     * remove(x) removes x and returns true if present
426     */
427    public void testRemoveElement() throws InterruptedException {
428        LinkedTransferQueue q = populatedQueue(SIZE);
429        for (int i = 1; i < SIZE; i += 2) {
430            assertTrue(q.remove(i));
431        }
432        for (int i = 0; i < SIZE; i += 2) {
433            assertTrue(q.remove(i));
434            assertFalse(q.remove(i + 1));
435        }
436        checkEmpty(q);
437    }
438
439    /**
372       * An add following remove(x) succeeds
373       */
374      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 528 | Line 460 | public class LinkedTransferQueueTest ext
460      }
461  
462      /**
463 <     * toArray() contains all elements
463 >     * toArray() contains all elements in FIFO order
464       */
465 <    public void testToArray() throws InterruptedException {
465 >    public void testToArray() {
466          LinkedTransferQueue q = populatedQueue(SIZE);
467          Object[] o = q.toArray();
468          for (int i = 0; i < o.length; i++) {
469 <            assertEquals(o[i], q.take());
469 >            assertSame(o[i], q.poll());
470          }
471      }
472  
473      /**
474 <     * toArray(a) contains all elements
474 >     * toArray(a) contains all elements in FIFO order
475       */
476 <    public void testToArray2() throws InterruptedException {
476 >    public void testToArray2() {
477          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
478          Integer[] ints = new Integer[SIZE];
479 <        ints = q.toArray(ints);
479 >        Integer[] array = q.toArray(ints);
480 >        assertSame(ints, array);
481          for (int i = 0; i < ints.length; i++) {
482 <            assertEquals(ints[i], q.take());
482 >            assertSame(ints[i], q.poll());
483          }
484      }
485  
486      /**
487 <     * toArray(null) throws NullPointerException
555 <     */
556 <    public void testToArray_BadArg() {
557 <        LinkedTransferQueue q = populatedQueue(SIZE);
558 <        try {
559 <            Object o[] = q.toArray(null);
560 <            shouldThrow();
561 <        } catch (NullPointerException success) {}
562 <    }
563 <
564 <    /**
565 <     * toArray(incompatible array type) throws CCE
487 >     * toArray(incompatible array type) throws ArrayStoreException
488       */
489      public void testToArray1_BadArg() {
490          LinkedTransferQueue q = populatedQueue(SIZE);
491          try {
492 <            Object o[] = q.toArray(new String[10]);
492 >            q.toArray(new String[10]);
493              shouldThrow();
494          } catch (ArrayStoreException success) {}
495      }
# Line 644 | Line 566 | public class LinkedTransferQueueTest ext
566          LinkedTransferQueue q = populatedQueue(SIZE);
567          String s = q.toString();
568          for (int i = 0; i < SIZE; ++i) {
569 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
569 >            assertTrue(s.contains(String.valueOf(i)));
570          }
571      }
572  
# Line 653 | Line 575 | public class LinkedTransferQueueTest ext
575       */
576      public void testOfferInExecutor() {
577          final LinkedTransferQueue q = new LinkedTransferQueue();
578 <        q.add(one);
657 <        q.add(two);
578 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
579          ExecutorService executor = Executors.newFixedThreadPool(2);
580  
581          executor.execute(new CheckedRunnable() {
582 <            public void realRun() {
583 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
582 >            public void realRun() throws InterruptedException {
583 >                threadsStarted.await();
584 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
585              }});
586  
587          executor.execute(new CheckedRunnable() {
588              public void realRun() throws InterruptedException {
589 <                Thread.sleep(SMALL_DELAY_MS);
589 >                threadsStarted.await();
590                  assertSame(one, q.take());
591 +                checkEmpty(q);
592              }});
593  
594          joinPool(executor);
# Line 676 | Line 599 | public class LinkedTransferQueueTest ext
599       */
600      public void testPollInExecutor() {
601          final LinkedTransferQueue q = new LinkedTransferQueue();
602 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603          ExecutorService executor = Executors.newFixedThreadPool(2);
604  
605          executor.execute(new CheckedRunnable() {
606              public void realRun() throws InterruptedException {
607                  assertNull(q.poll());
608 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
609 <                assertTrue(q.isEmpty());
608 >                threadsStarted.await();
609 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
610 >                checkEmpty(q);
611              }});
612  
613          executor.execute(new CheckedRunnable() {
614              public void realRun() throws InterruptedException {
615 <                Thread.sleep(SMALL_DELAY_MS);
615 >                threadsStarted.await();
616                  q.put(one);
617              }});
618  
# Line 698 | Line 623 | public class LinkedTransferQueueTest ext
623       * A deserialized serialized queue has same elements in same order
624       */
625      public void testSerialization() throws Exception {
626 <        LinkedTransferQueue q = populatedQueue(SIZE);
627 <
703 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
704 <        ObjectOutputStream out
705 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
706 <        out.writeObject(q);
707 <        out.close();
626 >        Queue x = populatedQueue(SIZE);
627 >        Queue y = serialClone(x);
628  
629 <        ByteArrayInputStream bin
630 <            = new ByteArrayInputStream(bout.toByteArray());
631 <        ObjectInputStream in
632 <            = new ObjectInputStream(new BufferedInputStream(bin));
633 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
634 <
635 <        assertEquals(q.size(), r.size());
716 <        while (!q.isEmpty()) {
717 <            assertEquals(q.remove(), r.remove());
629 >        assertNotSame(y, x);
630 >        assertEquals(x.size(), y.size());
631 >        assertEquals(x.toString(), y.toString());
632 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
633 >        while (!x.isEmpty()) {
634 >            assertFalse(y.isEmpty());
635 >            assertEquals(x.remove(), y.remove());
636          }
637 <    }
720 <
721 <    /**
722 <     * drainTo(null) throws NullPointerException
723 <     */
724 <    public void testDrainToNull() {
725 <        LinkedTransferQueue q = populatedQueue(SIZE);
726 <        try {
727 <            q.drainTo(null);
728 <            shouldThrow();
729 <        } catch (NullPointerException success) {}
730 <    }
731 <
732 <    /**
733 <     * drainTo(this) throws IllegalArgumentException
734 <     */
735 <    public void testDrainToSelf() {
736 <        LinkedTransferQueue q = populatedQueue(SIZE);
737 <        try {
738 <            q.drainTo(q);
739 <            shouldThrow();
740 <        } catch (IllegalArgumentException success) {}
637 >        assertTrue(y.isEmpty());
638      }
639  
640      /**
# Line 747 | Line 644 | public class LinkedTransferQueueTest ext
644          LinkedTransferQueue q = populatedQueue(SIZE);
645          ArrayList l = new ArrayList();
646          q.drainTo(l);
647 <        assertEquals(q.size(), 0);
648 <        assertEquals(l.size(), SIZE);
647 >        assertEquals(0, q.size());
648 >        assertEquals(SIZE, l.size());
649          for (int i = 0; i < SIZE; ++i) {
650 <            assertEquals(l.get(i), i);
650 >            assertEquals(i, l.get(i));
651          }
652          q.add(zero);
653          q.add(one);
# Line 759 | Line 656 | public class LinkedTransferQueueTest ext
656          assertTrue(q.contains(one));
657          l.clear();
658          q.drainTo(l);
659 <        assertEquals(q.size(), 0);
660 <        assertEquals(l.size(), 2);
659 >        assertEquals(0, q.size());
660 >        assertEquals(2, l.size());
661          for (int i = 0; i < 2; ++i) {
662 <            assertEquals(l.get(i), i);
662 >            assertEquals(i, l.get(i));
663          }
664      }
665  
# Line 778 | Line 675 | public class LinkedTransferQueueTest ext
675          ArrayList l = new ArrayList();
676          q.drainTo(l);
677          assertTrue(l.size() >= SIZE);
678 <        for (int i = 0; i < SIZE; ++i) {
679 <            assertEquals(l.get(i), i);
680 <        }
784 <        t.join();
678 >        for (int i = 0; i < SIZE; ++i)
679 >            assertEquals(i, l.get(i));
680 >        awaitTermination(t, MEDIUM_DELAY_MS);
681          assertTrue(q.size() + l.size() >= SIZE);
682      }
683  
684      /**
789     * drainTo(null, n) throws NullPointerException
790     */
791    public void testDrainToNullN() {
792        LinkedTransferQueue q = populatedQueue(SIZE);
793        try {
794            q.drainTo(null, SIZE);
795            shouldThrow();
796        } catch (NullPointerException success) {}
797    }
798
799    /**
800     * drainTo(this, n) throws IllegalArgumentException
801     */
802    public void testDrainToSelfN() {
803        LinkedTransferQueue q = populatedQueue(SIZE);
804        try {
805            q.drainTo(q, SIZE);
806            shouldThrow();
807        } catch (IllegalArgumentException success) {}
808    }
809
810    /**
685       * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
# Line 819 | Line 693 | public class LinkedTransferQueueTest ext
693              ArrayList l = new ArrayList();
694              q.drainTo(l, i);
695              int k = (i < SIZE) ? i : SIZE;
696 <            assertEquals(l.size(), k);
697 <            assertEquals(q.size(), SIZE - k);
698 <            for (int j = 0; j < k; ++j) {
699 <                assertEquals(l.get(j), j);
826 <            }
696 >            assertEquals(k, l.size());
697 >            assertEquals(SIZE - k, q.size());
698 >            for (int j = 0; j < k; ++j)
699 >                assertEquals(j, l.get(j));
700              while (q.poll() != null)
701                  ;
702          }
# Line 835 | Line 708 | public class LinkedTransferQueueTest ext
708       */
709      public void testWaitingConsumer() throws InterruptedException {
710          final LinkedTransferQueue q = new LinkedTransferQueue();
711 <        assertEquals(q.getWaitingConsumerCount(), 0);
711 >        assertEquals(0, q.getWaitingConsumerCount());
712          assertFalse(q.hasWaitingConsumer());
713 +        final CountDownLatch threadStarted = new CountDownLatch(1);
714  
715          Thread t = newStartedThread(new CheckedRunnable() {
716              public void realRun() throws InterruptedException {
717 <                Thread.sleep(SMALL_DELAY_MS);
718 <                assertTrue(q.hasWaitingConsumer());
719 <                assertEquals(q.getWaitingConsumerCount(), 1);
846 <                assertTrue(q.offer(one));
717 >                threadStarted.countDown();
718 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
719 >                assertEquals(0, q.getWaitingConsumerCount());
720                  assertFalse(q.hasWaitingConsumer());
848                assertEquals(q.getWaitingConsumerCount(), 0);
721              }});
722  
723 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
724 <        assertEquals(q.getWaitingConsumerCount(), 0);
723 >        threadStarted.await();
724 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
725 >        assertEquals(1, q.getWaitingConsumerCount());
726 >        assertTrue(q.hasWaitingConsumer());
727 >
728 >        assertTrue(q.offer(one));
729 >        assertEquals(0, q.getWaitingConsumerCount());
730          assertFalse(q.hasWaitingConsumer());
731 <        t.join();
731 >
732 >        awaitTermination(t, MEDIUM_DELAY_MS);
733      }
734  
735      /**
# Line 872 | Line 750 | public class LinkedTransferQueueTest ext
750      public void testTransfer2() throws InterruptedException {
751          final LinkedTransferQueue<Integer> q
752              = new LinkedTransferQueue<Integer>();
753 +        final CountDownLatch threadStarted = new CountDownLatch(1);
754  
755          Thread t = newStartedThread(new CheckedRunnable() {
756              public void realRun() throws InterruptedException {
757 <                q.transfer(SIZE);
758 <                assertTrue(q.isEmpty());
757 >                threadStarted.countDown();
758 >                q.transfer(five);
759 >                checkEmpty(q);
760              }});
761  
762 <        Thread.sleep(SHORT_DELAY_MS);
762 >        threadStarted.await();
763 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
764          assertEquals(1, q.size());
765 <        assertEquals(SIZE, (int) q.poll());
766 <        assertTrue(q.isEmpty());
767 <        t.join();
765 >        assertSame(five, q.poll());
766 >        checkEmpty(q);
767 >        awaitTermination(t, MEDIUM_DELAY_MS);
768      }
769  
770      /**
# Line 895 | Line 776 | public class LinkedTransferQueueTest ext
776  
777          Thread first = newStartedThread(new CheckedRunnable() {
778              public void realRun() throws InterruptedException {
779 <                Integer i = SIZE + 1;
780 <                q.transfer(i);
900 <                assertTrue(!q.contains(i));
779 >                q.transfer(four);
780 >                assertTrue(!q.contains(four));
781                  assertEquals(1, q.size());
782              }});
783  
784          Thread interruptedThread = newStartedThread(
785              new CheckedInterruptedRunnable() {
786                  public void realRun() throws InterruptedException {
787 <                    while (q.size() == 0)
787 >                    while (q.isEmpty())
788                          Thread.yield();
789 <                    q.transfer(SIZE);
789 >                    q.transfer(five);
790                  }});
791  
792          while (q.size() < 2)
793              Thread.yield();
794          assertEquals(2, q.size());
795 <        assertEquals(SIZE + 1, (int) q.poll());
795 >        assertSame(four, q.poll());
796          first.join();
797          assertEquals(1, q.size());
798          interruptedThread.interrupt();
799          interruptedThread.join();
800 <        assertEquals(0, q.size());
921 <        assertTrue(q.isEmpty());
800 >        checkEmpty(q);
801      }
802  
803      /**
# Line 935 | Line 814 | public class LinkedTransferQueueTest ext
814                  assertSame(three, q.poll());
815              }});
816  
817 <        Thread.sleep(SHORT_DELAY_MS);
817 >        while (q.isEmpty())
818 >            Thread.yield();
819 >        assertFalse(q.isEmpty());
820 >        assertEquals(1, q.size());
821          assertTrue(q.offer(three));
822          assertSame(four, q.poll());
823 <        t.join();
823 >        awaitTermination(t, MEDIUM_DELAY_MS);
824      }
825  
826      /**
# Line 951 | Line 833 | public class LinkedTransferQueueTest ext
833  
834          Thread t = newStartedThread(new CheckedRunnable() {
835              public void realRun() throws InterruptedException {
836 <                q.transfer(SIZE);
836 >                q.transfer(four);
837                  checkEmpty(q);
838              }});
839  
840 <        Thread.sleep(SHORT_DELAY_MS);
841 <        assertEquals(SIZE, (int) q.take());
840 >        while (q.isEmpty())
841 >            Thread.yield();
842 >        assertFalse(q.isEmpty());
843 >        assertEquals(1, q.size());
844 >        assertSame(four, q.take());
845          checkEmpty(q);
846 <        t.join();
846 >        awaitTermination(t, MEDIUM_DELAY_MS);
847      }
848  
849      /**
# Line 996 | Line 881 | public class LinkedTransferQueueTest ext
881                  while (! q.hasWaitingConsumer())
882                      Thread.yield();
883                  assertTrue(q.hasWaitingConsumer());
884 <                assertTrue(q.isEmpty());
1000 <                assertEquals(q.size(), 0);
884 >                checkEmpty(q);
885                  assertTrue(q.tryTransfer(hotPotato));
886              }});
887  
888          assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
889          checkEmpty(q);
890 <        t.join();
890 >        awaitTermination(t, MEDIUM_DELAY_MS);
891      }
892  
893      /**
# Line 1019 | Line 903 | public class LinkedTransferQueueTest ext
903                  while (! q.hasWaitingConsumer())
904                      Thread.yield();
905                  assertTrue(q.hasWaitingConsumer());
906 <                assertTrue(q.isEmpty());
1023 <                assertEquals(q.size(), 0);
906 >                checkEmpty(q);
907                  assertTrue(q.tryTransfer(hotPotato));
908              }});
909  
910          assertSame(q.take(), hotPotato);
911          checkEmpty(q);
912 <        t.join();
912 >        awaitTermination(t, MEDIUM_DELAY_MS);
913      }
914  
915      /**
916 <     * tryTransfer waits the amount given if interrupted, and
1034 <     * throws interrupted exception
916 >     * tryTransfer blocks interruptibly if no takers
917       */
918      public void testTryTransfer5() throws InterruptedException {
919          final LinkedTransferQueue q = new LinkedTransferQueue();
920 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
921 +        assertTrue(q.isEmpty());
922  
923 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
923 >        Thread t = newStartedThread(new CheckedRunnable() {
924              public void realRun() throws InterruptedException {
925 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
925 >                Thread.currentThread().interrupt();
926 >                try {
927 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
928 >                    shouldThrow();
929 >                } catch (InterruptedException success) {}
930 >                assertFalse(Thread.interrupted());
931 >
932 >                pleaseInterrupt.countDown();
933 >                try {
934 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
935 >                    shouldThrow();
936 >                } catch (InterruptedException success) {}
937 >                assertFalse(Thread.interrupted());
938              }});
939  
940 <        Thread.sleep(SMALL_DELAY_MS);
941 <        toInterrupt.interrupt();
942 <        toInterrupt.join();
940 >        await(pleaseInterrupt);
941 >        assertThreadStaysAlive(t);
942 >        t.interrupt();
943 >        awaitTermination(t);
944 >        checkEmpty(q);
945      }
946  
947      /**
948 <     * tryTransfer gives up after the timeout and return false
948 >     * tryTransfer gives up after the timeout and returns false
949       */
950      public void testTryTransfer6() throws InterruptedException {
951          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 1056 | Line 954 | public class LinkedTransferQueueTest ext
954              public void realRun() throws InterruptedException {
955                  long t0 = System.nanoTime();
956                  assertFalse(q.tryTransfer(new Object(),
957 <                                          SHORT_DELAY_MS, MILLISECONDS));
958 <                long elapsed = NANOSECONDS.toMillis(System.nanoTime() - t0);
959 <                assertTrue(elapsed >= SHORT_DELAY_MS);
957 >                                          timeoutMillis(), MILLISECONDS));
958 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
959 >                checkEmpty(q);
960              }});
961  
962 <        checkEmpty(q);
1065 <        awaitTermination(t, MEDIUM_DELAY_MS);
962 >        awaitTermination(t);
963          checkEmpty(q);
964      }
965  
# Line 1077 | Line 974 | public class LinkedTransferQueueTest ext
974          Thread t = newStartedThread(new CheckedRunnable() {
975              public void realRun() throws InterruptedException {
976                  assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
977 <                assertTrue(q.isEmpty());
977 >                checkEmpty(q);
978              }});
979  
980 <        Thread.sleep(SHORT_DELAY_MS);
980 >        while (q.size() != 2)
981 >            Thread.yield();
982          assertEquals(2, q.size());
983          assertSame(four, q.poll());
984          assertSame(five, q.poll());
985          checkEmpty(q);
986 <        t.join();
986 >        awaitTermination(t, MEDIUM_DELAY_MS);
987      }
988  
989      /**
990 <     * tryTransfer attempts to enqueue into the q and fails returning
991 <     * false not enqueueing and the successive poll is null
990 >     * tryTransfer attempts to enqueue into the queue and fails
991 >     * returning false not enqueueing and the successive poll is null
992       */
993      public void testTryTransfer8() throws InterruptedException {
994          final LinkedTransferQueue q = new LinkedTransferQueue();
995          assertTrue(q.offer(four));
996          assertEquals(1, q.size());
997 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
997 >        long t0 = System.nanoTime();
998 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
999 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1000          assertEquals(1, q.size());
1001          assertSame(four, q.poll());
1002          assertNull(q.poll());
# Line 1105 | Line 1005 | public class LinkedTransferQueueTest ext
1005  
1006      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1007          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1008 <        assertTrue(q.isEmpty());
1008 >        checkEmpty(q);
1009          for (int i = 0; i < n; i++) {
1010              assertEquals(i, q.size());
1011              assertTrue(q.offer(i));
# Line 1114 | Line 1014 | public class LinkedTransferQueueTest ext
1014          assertFalse(q.isEmpty());
1015          return q;
1016      }
1017 +
1018 +    /**
1019 +     * remove(null), contains(null) always return false
1020 +     */
1021 +    public void testNeverContainsNull() {
1022 +        Collection<?>[] qs = {
1023 +            new LinkedTransferQueue<Object>(),
1024 +            populatedQueue(2),
1025 +        };
1026 +
1027 +        for (Collection<?> q : qs) {
1028 +            assertFalse(q.contains(null));
1029 +            assertFalse(q.remove(null));
1030 +        }
1031 +    }
1032   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines