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.25 by jsr166, Wed Oct 6 07:49:22 2010 UTC vs.
Revision 1.54 by jsr166, Wed Dec 31 16:44:02 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;
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;
21 import junit.framework.Test;
22 import junit.framework.TestSuite;
22  
23   @SuppressWarnings({"unchecked", "rawtypes"})
24   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 39 | Line 38 | public class LinkedTransferQueueTest ext
38                              new Generic().testSuite());
39      }
40  
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
41      /**
42       * Constructor builds new queue with size being zero and empty
43       * being true
# Line 87 | Line 63 | public class LinkedTransferQueueTest ext
63       * NullPointerException
64       */
65      public void testConstructor3() {
66 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
67          try {
68 <            Integer[] ints = new Integer[SIZE];
92 <            new LinkedTransferQueue(Arrays.asList(ints));
68 >            new LinkedTransferQueue(elements);
69              shouldThrow();
70          } catch (NullPointerException success) {}
71      }
# Line 99 | Line 75 | public class LinkedTransferQueueTest ext
75       * throws NullPointerException
76       */
77      public void testConstructor4() {
78 +        Integer[] ints = new Integer[SIZE];
79 +        for (int i = 0; i < SIZE-1; ++i)
80 +            ints[i] = i;
81 +        Collection<Integer> elements = Arrays.asList(ints);
82          try {
83 <            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));
83 >            new LinkedTransferQueue(elements);
84              shouldThrow();
85          } catch (NullPointerException success) {}
86      }
# Line 151 | Line 127 | public class LinkedTransferQueueTest ext
127      }
128  
129      /**
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    /**
130       * addAll(this) throws IllegalArgumentException
131       */
132      public void testAddAllSelf() {
# Line 195 | Line 138 | public class LinkedTransferQueueTest ext
138      }
139  
140      /**
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    /**
141       * addAll of a collection with any null elements throws
142       * NullPointerException after possibly adding some elements
143       */
# Line 240 | Line 171 | public class LinkedTransferQueueTest ext
171      }
172  
173      /**
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    /**
174       * all elements successfully put are contained
175       */
176      public void testPut() {
177          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
178          for (int i = 0; i < SIZE; ++i) {
179 <            assertEquals(q.size(), i);
179 >            assertEquals(i, q.size());
180              q.put(i);
181              assertTrue(q.contains(i));
182          }
# Line 273 | Line 193 | public class LinkedTransferQueueTest ext
193      }
194  
195      /**
196 <     * 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
196 >     * take removes existing elements until empty, then blocks interruptibly
197       */
198      public void testBlockingTake() throws InterruptedException {
199 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
200 <        Thread t = new Thread(new CheckedRunnable() {
199 >        final BlockingQueue q = populatedQueue(SIZE);
200 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
201 >        Thread t = newStartedThread(new CheckedRunnable() {
202              public void realRun() throws InterruptedException {
203                  for (int i = 0; i < SIZE; ++i) {
204 <                    assertEquals(i, (int) q.take());
204 >                    assertEquals(i, q.take());
205                  }
206 +
207 +                Thread.currentThread().interrupt();
208 +                try {
209 +                    q.take();
210 +                    shouldThrow();
211 +                } catch (InterruptedException success) {}
212 +                assertFalse(Thread.interrupted());
213 +
214 +                pleaseInterrupt.countDown();
215                  try {
216                      q.take();
217                      shouldThrow();
218                  } catch (InterruptedException success) {}
219 +                assertFalse(Thread.interrupted());
220              }});
221  
222 <        t.start();
223 <        Thread.sleep(SHORT_DELAY_MS);
222 >        await(pleaseInterrupt);
223 >        assertThreadStaysAlive(t);
224          t.interrupt();
225 <        t.join();
309 <        checkEmpty(q);
225 >        awaitTermination(t);
226      }
227  
228      /**
# Line 322 | Line 238 | public class LinkedTransferQueueTest ext
238      }
239  
240      /**
241 <     * timed pool with zero timeout succeeds when non-empty, else times out
241 >     * timed poll with zero timeout succeeds when non-empty, else times out
242       */
243      public void testTimedPoll0() throws InterruptedException {
244          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 334 | Line 250 | public class LinkedTransferQueueTest ext
250      }
251  
252      /**
253 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
253 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
254       */
255      public void testTimedPoll() throws InterruptedException {
256          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
257          for (int i = 0; i < SIZE; ++i) {
258 <            long t0 = System.nanoTime();
258 >            long startTime = System.nanoTime();
259              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
260 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
345 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
260 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
261          }
262 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
262 >        long startTime = System.nanoTime();
263 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
264 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
265          checkEmpty(q);
266      }
267  
# Line 353 | Line 270 | public class LinkedTransferQueueTest ext
270       * returning timeout status
271       */
272      public void testInterruptedTimedPoll() throws InterruptedException {
273 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
273 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
274 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
275          Thread t = newStartedThread(new CheckedRunnable() {
276              public void realRun() throws InterruptedException {
277                  for (int i = 0; i < SIZE; ++i) {
278                      long t0 = System.nanoTime();
279                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
280 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
363 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
280 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
281                  }
282 +                long t0 = System.nanoTime();
283 +                aboutToWait.countDown();
284                  try {
285 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
285 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
286                      shouldThrow();
287 <                } catch (InterruptedException success) {}
287 >                } catch (InterruptedException success) {
288 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
289 >                }
290              }});
291  
292 <        Thread.sleep(SMALL_DELAY_MS);
292 >        aboutToWait.await();
293 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
294          t.interrupt();
295 <        t.join();
295 >        awaitTermination(t, MEDIUM_DELAY_MS);
296 >        checkEmpty(q);
297 >    }
298 >
299 >    /**
300 >     * timed poll after thread interrupted throws InterruptedException
301 >     * instead of returning timeout status
302 >     */
303 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
304 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
305 >        Thread t = newStartedThread(new CheckedRunnable() {
306 >            public void realRun() throws InterruptedException {
307 >                Thread.currentThread().interrupt();
308 >                for (int i = 0; i < SIZE; ++i) {
309 >                    long t0 = System.nanoTime();
310 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
311 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
312 >                }
313 >                try {
314 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
315 >                    shouldThrow();
316 >                } catch (InterruptedException success) {}
317 >            }});
318 >
319 >        awaitTermination(t, MEDIUM_DELAY_MS);
320          checkEmpty(q);
321      }
322  
# Line 421 | Line 367 | public class LinkedTransferQueueTest ext
367      }
368  
369      /**
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    /**
370       * An add following remove(x) succeeds
371       */
372      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 527 | Line 458 | public class LinkedTransferQueueTest ext
458      }
459  
460      /**
461 <     * toArray() contains all elements
461 >     * toArray() contains all elements in FIFO order
462       */
463 <    public void testToArray() throws InterruptedException {
463 >    public void testToArray() {
464          LinkedTransferQueue q = populatedQueue(SIZE);
465          Object[] o = q.toArray();
466          for (int i = 0; i < o.length; i++) {
467 <            assertEquals(o[i], q.take());
467 >            assertSame(o[i], q.poll());
468          }
469      }
470  
471      /**
472 <     * toArray(a) contains all elements
472 >     * toArray(a) contains all elements in FIFO order
473       */
474 <    public void testToArray2() throws InterruptedException {
474 >    public void testToArray2() {
475          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
476          Integer[] ints = new Integer[SIZE];
477 <        ints = q.toArray(ints);
477 >        Integer[] array = q.toArray(ints);
478 >        assertSame(ints, array);
479          for (int i = 0; i < ints.length; i++) {
480 <            assertEquals(ints[i], q.take());
480 >            assertSame(ints[i], q.poll());
481          }
482      }
483  
484      /**
485 <     * 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
485 >     * toArray(incompatible array type) throws ArrayStoreException
486       */
487      public void testToArray1_BadArg() {
488          LinkedTransferQueue q = populatedQueue(SIZE);
489          try {
490 <            Object o[] = q.toArray(new String[10]);
490 >            q.toArray(new String[10]);
491              shouldThrow();
492          } catch (ArrayStoreException success) {}
493      }
# Line 643 | Line 564 | public class LinkedTransferQueueTest ext
564          LinkedTransferQueue q = populatedQueue(SIZE);
565          String s = q.toString();
566          for (int i = 0; i < SIZE; ++i) {
567 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
567 >            assertTrue(s.contains(String.valueOf(i)));
568          }
569      }
570  
# Line 652 | Line 573 | public class LinkedTransferQueueTest ext
573       */
574      public void testOfferInExecutor() {
575          final LinkedTransferQueue q = new LinkedTransferQueue();
576 <        q.add(one);
656 <        q.add(two);
576 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
577          ExecutorService executor = Executors.newFixedThreadPool(2);
578  
579          executor.execute(new CheckedRunnable() {
580 <            public void realRun() {
581 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
580 >            public void realRun() throws InterruptedException {
581 >                threadsStarted.await();
582 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
583              }});
584  
585          executor.execute(new CheckedRunnable() {
586              public void realRun() throws InterruptedException {
587 <                Thread.sleep(SMALL_DELAY_MS);
587 >                threadsStarted.await();
588                  assertSame(one, q.take());
589 +                checkEmpty(q);
590              }});
591  
592          joinPool(executor);
# Line 675 | Line 597 | public class LinkedTransferQueueTest ext
597       */
598      public void testPollInExecutor() {
599          final LinkedTransferQueue q = new LinkedTransferQueue();
600 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
601          ExecutorService executor = Executors.newFixedThreadPool(2);
602  
603          executor.execute(new CheckedRunnable() {
604              public void realRun() throws InterruptedException {
605                  assertNull(q.poll());
606 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
607 <                assertTrue(q.isEmpty());
606 >                threadsStarted.await();
607 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
608 >                checkEmpty(q);
609              }});
610  
611          executor.execute(new CheckedRunnable() {
612              public void realRun() throws InterruptedException {
613 <                Thread.sleep(SMALL_DELAY_MS);
613 >                threadsStarted.await();
614                  q.put(one);
615              }});
616  
# Line 697 | Line 621 | public class LinkedTransferQueueTest ext
621       * A deserialized serialized queue has same elements in same order
622       */
623      public void testSerialization() throws Exception {
624 <        LinkedTransferQueue q = populatedQueue(SIZE);
624 >        Queue x = populatedQueue(SIZE);
625 >        Queue y = serialClone(x);
626  
627 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
628 <        ObjectOutputStream out
629 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
630 <        out.writeObject(q);
631 <        out.close();
632 <
633 <        ByteArrayInputStream bin
709 <            = new ByteArrayInputStream(bout.toByteArray());
710 <        ObjectInputStream in
711 <            = new ObjectInputStream(new BufferedInputStream(bin));
712 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
713 <
714 <        assertEquals(q.size(), r.size());
715 <        while (!q.isEmpty()) {
716 <            assertEquals(q.remove(), r.remove());
627 >        assertNotSame(y, x);
628 >        assertEquals(x.size(), y.size());
629 >        assertEquals(x.toString(), y.toString());
630 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
631 >        while (!x.isEmpty()) {
632 >            assertFalse(y.isEmpty());
633 >            assertEquals(x.remove(), y.remove());
634          }
635 <    }
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) {}
635 >        assertTrue(y.isEmpty());
636      }
637  
638      /**
# Line 746 | Line 642 | public class LinkedTransferQueueTest ext
642          LinkedTransferQueue q = populatedQueue(SIZE);
643          ArrayList l = new ArrayList();
644          q.drainTo(l);
645 <        assertEquals(q.size(), 0);
646 <        assertEquals(l.size(), SIZE);
645 >        assertEquals(0, q.size());
646 >        assertEquals(SIZE, l.size());
647          for (int i = 0; i < SIZE; ++i) {
648 <            assertEquals(l.get(i), i);
648 >            assertEquals(i, l.get(i));
649          }
650          q.add(zero);
651          q.add(one);
# Line 758 | Line 654 | public class LinkedTransferQueueTest ext
654          assertTrue(q.contains(one));
655          l.clear();
656          q.drainTo(l);
657 <        assertEquals(q.size(), 0);
658 <        assertEquals(l.size(), 2);
657 >        assertEquals(0, q.size());
658 >        assertEquals(2, l.size());
659          for (int i = 0; i < 2; ++i) {
660 <            assertEquals(l.get(i), i);
660 >            assertEquals(i, l.get(i));
661          }
662      }
663  
# Line 777 | Line 673 | public class LinkedTransferQueueTest ext
673          ArrayList l = new ArrayList();
674          q.drainTo(l);
675          assertTrue(l.size() >= SIZE);
676 <        for (int i = 0; i < SIZE; ++i) {
677 <            assertEquals(l.get(i), i);
678 <        }
783 <        t.join();
676 >        for (int i = 0; i < SIZE; ++i)
677 >            assertEquals(i, l.get(i));
678 >        awaitTermination(t, MEDIUM_DELAY_MS);
679          assertTrue(q.size() + l.size() >= SIZE);
680      }
681  
682      /**
683 <     * 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 <    /**
810 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
683 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
684       */
685      public void testDrainToN() {
686          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 818 | Line 691 | public class LinkedTransferQueueTest ext
691              ArrayList l = new ArrayList();
692              q.drainTo(l, i);
693              int k = (i < SIZE) ? i : SIZE;
694 <            assertEquals(l.size(), k);
695 <            assertEquals(q.size(), SIZE - k);
696 <            for (int j = 0; j < k; ++j) {
697 <                assertEquals(l.get(j), j);
825 <            }
694 >            assertEquals(k, l.size());
695 >            assertEquals(SIZE - k, q.size());
696 >            for (int j = 0; j < k; ++j)
697 >                assertEquals(j, l.get(j));
698              while (q.poll() != null)
699                  ;
700          }
# Line 834 | Line 706 | public class LinkedTransferQueueTest ext
706       */
707      public void testWaitingConsumer() throws InterruptedException {
708          final LinkedTransferQueue q = new LinkedTransferQueue();
709 <        assertEquals(q.getWaitingConsumerCount(), 0);
709 >        assertEquals(0, q.getWaitingConsumerCount());
710          assertFalse(q.hasWaitingConsumer());
711 +        final CountDownLatch threadStarted = new CountDownLatch(1);
712  
713          Thread t = newStartedThread(new CheckedRunnable() {
714              public void realRun() throws InterruptedException {
715 <                Thread.sleep(SMALL_DELAY_MS);
716 <                assertTrue(q.hasWaitingConsumer());
717 <                assertEquals(q.getWaitingConsumerCount(), 1);
845 <                assertTrue(q.offer(one));
715 >                threadStarted.countDown();
716 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
717 >                assertEquals(0, q.getWaitingConsumerCount());
718                  assertFalse(q.hasWaitingConsumer());
847                assertEquals(q.getWaitingConsumerCount(), 0);
719              }});
720  
721 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
722 <        assertEquals(q.getWaitingConsumerCount(), 0);
721 >        threadStarted.await();
722 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
723 >        assertEquals(1, q.getWaitingConsumerCount());
724 >        assertTrue(q.hasWaitingConsumer());
725 >
726 >        assertTrue(q.offer(one));
727 >        assertEquals(0, q.getWaitingConsumerCount());
728          assertFalse(q.hasWaitingConsumer());
729 <        t.join();
729 >
730 >        awaitTermination(t, MEDIUM_DELAY_MS);
731      }
732  
733      /**
# Line 871 | Line 748 | public class LinkedTransferQueueTest ext
748      public void testTransfer2() throws InterruptedException {
749          final LinkedTransferQueue<Integer> q
750              = new LinkedTransferQueue<Integer>();
751 +        final CountDownLatch threadStarted = new CountDownLatch(1);
752  
753          Thread t = newStartedThread(new CheckedRunnable() {
754              public void realRun() throws InterruptedException {
755 <                q.transfer(SIZE);
756 <                assertTrue(q.isEmpty());
755 >                threadStarted.countDown();
756 >                q.transfer(five);
757 >                checkEmpty(q);
758              }});
759  
760 <        Thread.sleep(SHORT_DELAY_MS);
760 >        threadStarted.await();
761 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
762          assertEquals(1, q.size());
763 <        assertEquals(SIZE, (int) q.poll());
764 <        assertTrue(q.isEmpty());
765 <        t.join();
763 >        assertSame(five, q.poll());
764 >        checkEmpty(q);
765 >        awaitTermination(t, MEDIUM_DELAY_MS);
766      }
767  
768      /**
# Line 894 | Line 774 | public class LinkedTransferQueueTest ext
774  
775          Thread first = newStartedThread(new CheckedRunnable() {
776              public void realRun() throws InterruptedException {
777 <                Integer i = SIZE + 1;
778 <                q.transfer(i);
899 <                assertTrue(!q.contains(i));
777 >                q.transfer(four);
778 >                assertTrue(!q.contains(four));
779                  assertEquals(1, q.size());
780              }});
781  
782          Thread interruptedThread = newStartedThread(
783              new CheckedInterruptedRunnable() {
784                  public void realRun() throws InterruptedException {
785 <                    while (q.size() == 0)
785 >                    while (q.isEmpty())
786                          Thread.yield();
787 <                    q.transfer(SIZE);
787 >                    q.transfer(five);
788                  }});
789  
790          while (q.size() < 2)
791              Thread.yield();
792          assertEquals(2, q.size());
793 <        assertEquals(SIZE + 1, (int) q.poll());
793 >        assertSame(four, q.poll());
794          first.join();
795          assertEquals(1, q.size());
796          interruptedThread.interrupt();
797          interruptedThread.join();
798 <        assertEquals(0, q.size());
920 <        assertTrue(q.isEmpty());
798 >        checkEmpty(q);
799      }
800  
801      /**
# Line 934 | Line 812 | public class LinkedTransferQueueTest ext
812                  assertSame(three, q.poll());
813              }});
814  
815 <        Thread.sleep(SHORT_DELAY_MS);
815 >        while (q.isEmpty())
816 >            Thread.yield();
817 >        assertFalse(q.isEmpty());
818 >        assertEquals(1, q.size());
819          assertTrue(q.offer(three));
820          assertSame(four, q.poll());
821 <        t.join();
821 >        awaitTermination(t, MEDIUM_DELAY_MS);
822      }
823  
824      /**
# Line 950 | Line 831 | public class LinkedTransferQueueTest ext
831  
832          Thread t = newStartedThread(new CheckedRunnable() {
833              public void realRun() throws InterruptedException {
834 <                q.transfer(SIZE);
834 >                q.transfer(four);
835                  checkEmpty(q);
836              }});
837  
838 <        Thread.sleep(SHORT_DELAY_MS);
839 <        assertEquals(SIZE, (int) q.take());
838 >        while (q.isEmpty())
839 >            Thread.yield();
840 >        assertFalse(q.isEmpty());
841 >        assertEquals(1, q.size());
842 >        assertSame(four, q.take());
843          checkEmpty(q);
844 <        t.join();
844 >        awaitTermination(t, MEDIUM_DELAY_MS);
845      }
846  
847      /**
# Line 995 | Line 879 | public class LinkedTransferQueueTest ext
879                  while (! q.hasWaitingConsumer())
880                      Thread.yield();
881                  assertTrue(q.hasWaitingConsumer());
882 <                assertTrue(q.isEmpty());
999 <                assertEquals(q.size(), 0);
882 >                checkEmpty(q);
883                  assertTrue(q.tryTransfer(hotPotato));
884              }});
885  
886          assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
887          checkEmpty(q);
888 <        t.join();
888 >        awaitTermination(t, MEDIUM_DELAY_MS);
889      }
890  
891      /**
# Line 1018 | Line 901 | public class LinkedTransferQueueTest ext
901                  while (! q.hasWaitingConsumer())
902                      Thread.yield();
903                  assertTrue(q.hasWaitingConsumer());
904 <                assertTrue(q.isEmpty());
1022 <                assertEquals(q.size(), 0);
904 >                checkEmpty(q);
905                  assertTrue(q.tryTransfer(hotPotato));
906              }});
907  
908          assertSame(q.take(), hotPotato);
909          checkEmpty(q);
910 <        t.join();
910 >        awaitTermination(t, MEDIUM_DELAY_MS);
911      }
912  
913      /**
914 <     * tryTransfer waits the amount given if interrupted, and
1033 <     * throws interrupted exception
914 >     * tryTransfer blocks interruptibly if no takers
915       */
916      public void testTryTransfer5() throws InterruptedException {
917          final LinkedTransferQueue q = new LinkedTransferQueue();
918 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
919 +        assertTrue(q.isEmpty());
920  
921 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
921 >        Thread t = newStartedThread(new CheckedRunnable() {
922              public void realRun() throws InterruptedException {
923 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
923 >                Thread.currentThread().interrupt();
924 >                try {
925 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
926 >                    shouldThrow();
927 >                } catch (InterruptedException success) {}
928 >                assertFalse(Thread.interrupted());
929 >
930 >                pleaseInterrupt.countDown();
931 >                try {
932 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
933 >                    shouldThrow();
934 >                } catch (InterruptedException success) {}
935 >                assertFalse(Thread.interrupted());
936              }});
937  
938 <        Thread.sleep(SMALL_DELAY_MS);
939 <        toInterrupt.interrupt();
940 <        toInterrupt.join();
938 >        await(pleaseInterrupt);
939 >        assertThreadStaysAlive(t);
940 >        t.interrupt();
941 >        awaitTermination(t);
942 >        checkEmpty(q);
943      }
944  
945      /**
946 <     * tryTransfer gives up after the timeout and return false
946 >     * tryTransfer gives up after the timeout and returns false
947       */
948      public void testTryTransfer6() throws InterruptedException {
949          final LinkedTransferQueue q = new LinkedTransferQueue();
950  
951          Thread t = newStartedThread(new CheckedRunnable() {
952              public void realRun() throws InterruptedException {
953 +                long t0 = System.nanoTime();
954                  assertFalse(q.tryTransfer(new Object(),
955 <                                          SHORT_DELAY_MS, MILLISECONDS));
955 >                                          timeoutMillis(), MILLISECONDS));
956 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
957 >                checkEmpty(q);
958              }});
959  
960 <        Thread.sleep(SMALL_DELAY_MS);
960 >        awaitTermination(t);
961          checkEmpty(q);
1062        t.join();
962      }
963  
964      /**
# Line 1073 | Line 972 | public class LinkedTransferQueueTest ext
972          Thread t = newStartedThread(new CheckedRunnable() {
973              public void realRun() throws InterruptedException {
974                  assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
975 <                assertTrue(q.isEmpty());
975 >                checkEmpty(q);
976              }});
977  
978 <        Thread.sleep(SHORT_DELAY_MS);
978 >        while (q.size() != 2)
979 >            Thread.yield();
980          assertEquals(2, q.size());
981          assertSame(four, q.poll());
982          assertSame(five, q.poll());
983          checkEmpty(q);
984 <        t.join();
984 >        awaitTermination(t, MEDIUM_DELAY_MS);
985      }
986  
987      /**
988 <     * tryTransfer attempts to enqueue into the q and fails returning
989 <     * false not enqueueing and the successive poll is null
988 >     * tryTransfer attempts to enqueue into the queue and fails
989 >     * returning false not enqueueing and the successive poll is null
990       */
991      public void testTryTransfer8() throws InterruptedException {
992          final LinkedTransferQueue q = new LinkedTransferQueue();
993          assertTrue(q.offer(four));
994          assertEquals(1, q.size());
995 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
995 >        long t0 = System.nanoTime();
996 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
997 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
998          assertEquals(1, q.size());
999          assertSame(four, q.poll());
1000          assertNull(q.poll());
# Line 1101 | Line 1003 | public class LinkedTransferQueueTest ext
1003  
1004      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1005          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1006 <        assertTrue(q.isEmpty());
1006 >        checkEmpty(q);
1007          for (int i = 0; i < n; i++) {
1008              assertEquals(i, q.size());
1009              assertTrue(q.offer(i));
# Line 1110 | Line 1012 | public class LinkedTransferQueueTest ext
1012          assertFalse(q.isEmpty());
1013          return q;
1014      }
1015 +
1016 +    /**
1017 +     * remove(null), contains(null) always return false
1018 +     */
1019 +    public void testNeverContainsNull() {
1020 +        Collection<?>[] qs = {
1021 +            new LinkedTransferQueue<Object>(),
1022 +            populatedQueue(2),
1023 +        };
1024 +
1025 +        for (Collection<?> q : qs) {
1026 +            assertFalse(q.contains(null));
1027 +            assertFalse(q.remove(null));
1028 +        }
1029 +    }
1030   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines