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.22 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.58 by jsr166, Sat Feb 28 19:59:23 2015 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;
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;
22 import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
27  
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new LinkedTransferQueue();
31 +        }
32 +    }
33 +
34      public static void main(String[] args) {
35          junit.textui.TestRunner.run(suite());
36      }
37  
38      public static Test suite() {
39 <        return new TestSuite(LinkedTransferQueueTest.class);
40 <    }
34 <
35 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
36 <        assertTrue(q.isEmpty());
37 <        assertEquals(0, q.size());
38 <        assertNull(q.peek());
39 <        assertNull(q.poll());
40 <        assertNull(q.poll(0, MILLISECONDS));
41 <        assertEquals(q.toString(), "[]");
42 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
43 <        assertFalse(q.iterator().hasNext());
44 <        try {
45 <            q.element();
46 <            shouldThrow();
47 <        } catch (NoSuchElementException success) {}
48 <        try {
49 <            q.iterator().next();
50 <            shouldThrow();
51 <        } catch (NoSuchElementException success) {}
52 <        try {
53 <            q.remove();
54 <            shouldThrow();
55 <        } catch (NoSuchElementException success) {}
39 >        return newTestSuite(LinkedTransferQueueTest.class,
40 >                            new Generic().testSuite());
41      }
42  
43      /**
# Line 80 | 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];
85 <            new LinkedTransferQueue(Arrays.asList(ints));
70 >            new LinkedTransferQueue(elements);
71              shouldThrow();
72          } catch (NullPointerException success) {}
73      }
# Line 92 | 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];
97 <            for (int i = 0; i < SIZE - 1; ++i) {
98 <                ints[i] = i;
99 <            }
100 <            new LinkedTransferQueue(Arrays.asList(ints));
85 >            new LinkedTransferQueue(elements);
86              shouldThrow();
87          } catch (NullPointerException success) {}
88      }
# Line 130 | Line 115 | public class LinkedTransferQueueTest ext
115       * remainingCapacity() always returns Integer.MAX_VALUE
116       */
117      public void testRemainingCapacity() {
118 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
118 >        BlockingQueue q = populatedQueue(SIZE);
119          for (int i = 0; i < SIZE; ++i) {
120              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
121              assertEquals(SIZE - i, q.size());
122 <            q.remove();
122 >            assertEquals(i, q.remove());
123          }
124          for (int i = 0; i < SIZE; ++i) {
125              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
126              assertEquals(i, q.size());
127 <            q.add(i);
127 >            assertTrue(q.add(i));
128          }
129      }
130  
131      /**
147     * offer(null) throws NullPointerException
148     */
149    public void testOfferNull() {
150        try {
151            LinkedTransferQueue q = new LinkedTransferQueue();
152            q.offer(null);
153            shouldThrow();
154        } catch (NullPointerException success) {}
155    }
156
157    /**
158     * add(null) throws NullPointerException
159     */
160    public void testAddNull() {
161        try {
162            LinkedTransferQueue q = new LinkedTransferQueue();
163            q.add(null);
164            shouldThrow();
165        } catch (NullPointerException success) {}
166    }
167
168    /**
169     * addAll(null) throws NullPointerException
170     */
171    public void testAddAll1() {
172        try {
173            LinkedTransferQueue q = new LinkedTransferQueue();
174            q.addAll(null);
175            shouldThrow();
176        } catch (NullPointerException success) {}
177    }
178
179    /**
132       * addAll(this) throws IllegalArgumentException
133       */
134      public void testAddAllSelf() {
# Line 188 | Line 140 | public class LinkedTransferQueueTest ext
140      }
141  
142      /**
191     * addAll of a collection with null elements throws NullPointerException
192     */
193    public void testAddAll2() {
194        try {
195            LinkedTransferQueue q = new LinkedTransferQueue();
196            Integer[] ints = new Integer[SIZE];
197            q.addAll(Arrays.asList(ints));
198            shouldThrow();
199        } catch (NullPointerException success) {}
200    }
201
202    /**
143       * addAll of a collection with any null elements throws
144       * NullPointerException after possibly adding some elements
145       */
# Line 233 | Line 173 | public class LinkedTransferQueueTest ext
173      }
174  
175      /**
236     * put(null) throws NullPointerException
237     */
238    public void testPutNull() throws InterruptedException {
239        try {
240            LinkedTransferQueue q = new LinkedTransferQueue();
241            q.put(null);
242            shouldThrow();
243        } catch (NullPointerException success) {}
244    }
245
246    /**
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 266 | Line 195 | public class LinkedTransferQueueTest ext
195      }
196  
197      /**
198 <     * take blocks interruptibly when empty
270 <     */
271 <    public void testTakeFromEmpty() throws InterruptedException {
272 <        final LinkedTransferQueue q = new LinkedTransferQueue();
273 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
274 <            public void realRun() throws InterruptedException {
275 <                q.take();
276 <            }});
277 <        Thread.sleep(SHORT_DELAY_MS);
278 <        t.interrupt();
279 <        t.join();
280 <    }
281 <
282 <    /**
283 <     * Take removes existing elements until empty, then blocks interruptibly
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();
302 <        checkEmpty(q);
227 >        awaitTermination(t);
228      }
229  
230      /**
# Line 315 | 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 327 | 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);
338 <            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 346 | 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 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
282 <                                                       MILLISECONDS));
356 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
357 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
281 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
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 before a delayed offer fails; after offer succeeds;
303 <     * on interruption throws
302 >     * timed poll after thread interrupted throws InterruptedException
303 >     * instead of returning timeout status
304       */
305 <    public void testTimedPollWithOffer() throws InterruptedException {
306 <        final LinkedTransferQueue q = new LinkedTransferQueue();
307 <        Thread t = new Thread(new CheckedRunnable() {
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 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
310 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
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(LONG_DELAY_MS, MILLISECONDS);
316 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
317                      shouldThrow();
318                  } catch (InterruptedException success) {}
319              }});
320  
321 <        t.start();
322 <        Thread.sleep(SMALL_DELAY_MS);
389 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
390 <        t.interrupt();
391 <        t.join();
321 >        awaitTermination(t, MEDIUM_DELAY_MS);
322 >        checkEmpty(q);
323      }
324  
325      /**
# Line 438 | Line 369 | public class LinkedTransferQueueTest ext
369      }
370  
371      /**
441     * remove(x) removes x and returns true if present
442     */
443    public void testRemoveElement() throws InterruptedException {
444        LinkedTransferQueue q = populatedQueue(SIZE);
445        for (int i = 1; i < SIZE; i += 2) {
446            assertTrue(q.remove(i));
447        }
448        for (int i = 0; i < SIZE; i += 2) {
449            assertTrue(q.remove(i));
450            assertFalse(q.remove(i + 1));
451        }
452        checkEmpty(q);
453    }
454
455    /**
372       * An add following remove(x) succeeds
373       */
374      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 462 | Line 378 | public class LinkedTransferQueueTest ext
378          assertTrue(q.remove(one));
379          assertTrue(q.remove(two));
380          assertTrue(q.add(three));
381 <        assertTrue(q.take() == three);
381 >        assertSame(q.take(), three);
382      }
383  
384      /**
# Line 544 | 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
571 <     */
572 <    public void testToArray_BadArg() {
573 <        LinkedTransferQueue q = populatedQueue(SIZE);
574 <        try {
575 <            Object o[] = q.toArray(null);
576 <            shouldThrow();
577 <        } catch (NullPointerException success) {}
578 <    }
579 <
580 <    /**
581 <     * 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 594 | Line 500 | public class LinkedTransferQueueTest ext
500      public void testIterator() throws InterruptedException {
501          LinkedTransferQueue q = populatedQueue(SIZE);
502          Iterator it = q.iterator();
503 <        int i = 0;
504 <        while (it.hasNext()) {
505 <            assertEquals(it.next(), i++);
600 <        }
503 >        int i;
504 >        for (i = 0; it.hasNext(); i++)
505 >            assertTrue(q.contains(it.next()));
506          assertEquals(i, SIZE);
507 +        assertIteratorExhausted(it);
508 +
509 +        it = q.iterator();
510 +        for (i = 0; it.hasNext(); i++)
511 +            assertEquals(it.next(), q.take());
512 +        assertEquals(i, SIZE);
513 +        assertIteratorExhausted(it);
514 +    }
515 +
516 +    /**
517 +     * iterator of empty collection has no elements
518 +     */
519 +    public void testEmptyIterator() {
520 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
521      }
522  
523      /**
# Line 615 | Line 534 | public class LinkedTransferQueueTest ext
534          it.remove();
535  
536          it = q.iterator();
537 <        assertEquals(it.next(), one);
538 <        assertEquals(it.next(), three);
537 >        assertSame(it.next(), one);
538 >        assertSame(it.next(), three);
539          assertFalse(it.hasNext());
540      }
541  
# Line 660 | Line 579 | public class LinkedTransferQueueTest ext
579          LinkedTransferQueue q = populatedQueue(SIZE);
580          String s = q.toString();
581          for (int i = 0; i < SIZE; ++i) {
582 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
582 >            assertTrue(s.contains(String.valueOf(i)));
583          }
584      }
585  
# Line 669 | Line 588 | public class LinkedTransferQueueTest ext
588       */
589      public void testOfferInExecutor() {
590          final LinkedTransferQueue q = new LinkedTransferQueue();
591 <        q.add(one);
673 <        q.add(two);
591 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
592          ExecutorService executor = Executors.newFixedThreadPool(2);
593  
594          executor.execute(new CheckedRunnable() {
595 <            public void realRun() {
596 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
597 <                                         MILLISECONDS));
595 >            public void realRun() throws InterruptedException {
596 >                threadsStarted.await();
597 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
598              }});
599  
600          executor.execute(new CheckedRunnable() {
601              public void realRun() throws InterruptedException {
602 <                Thread.sleep(SMALL_DELAY_MS);
603 <                threadAssertEquals(one, q.take());
602 >                threadsStarted.await();
603 >                assertSame(one, q.take());
604 >                checkEmpty(q);
605              }});
606  
607          joinPool(executor);
# Line 693 | Line 612 | public class LinkedTransferQueueTest ext
612       */
613      public void testPollInExecutor() {
614          final LinkedTransferQueue q = new LinkedTransferQueue();
615 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
616          ExecutorService executor = Executors.newFixedThreadPool(2);
617  
618          executor.execute(new CheckedRunnable() {
619              public void realRun() throws InterruptedException {
620                  assertNull(q.poll());
621 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
622 <                assertTrue(q.isEmpty());
621 >                threadsStarted.await();
622 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
623 >                checkEmpty(q);
624              }});
625  
626          executor.execute(new CheckedRunnable() {
627              public void realRun() throws InterruptedException {
628 <                Thread.sleep(SMALL_DELAY_MS);
628 >                threadsStarted.await();
629                  q.put(one);
630              }});
631  
# Line 715 | Line 636 | public class LinkedTransferQueueTest ext
636       * A deserialized serialized queue has same elements in same order
637       */
638      public void testSerialization() throws Exception {
639 <        LinkedTransferQueue q = populatedQueue(SIZE);
640 <
720 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
721 <        ObjectOutputStream out
722 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
723 <        out.writeObject(q);
724 <        out.close();
639 >        Queue x = populatedQueue(SIZE);
640 >        Queue y = serialClone(x);
641  
642 <        ByteArrayInputStream bin
643 <            = new ByteArrayInputStream(bout.toByteArray());
644 <        ObjectInputStream in
645 <            = new ObjectInputStream(new BufferedInputStream(bin));
646 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
647 <
648 <        assertEquals(q.size(), r.size());
733 <        while (!q.isEmpty()) {
734 <            assertEquals(q.remove(), r.remove());
642 >        assertNotSame(y, x);
643 >        assertEquals(x.size(), y.size());
644 >        assertEquals(x.toString(), y.toString());
645 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
646 >        while (!x.isEmpty()) {
647 >            assertFalse(y.isEmpty());
648 >            assertEquals(x.remove(), y.remove());
649          }
650 <    }
737 <
738 <    /**
739 <     * drainTo(null) throws NullPointerException
740 <     */
741 <    public void testDrainToNull() {
742 <        LinkedTransferQueue q = populatedQueue(SIZE);
743 <        try {
744 <            q.drainTo(null);
745 <            shouldThrow();
746 <        } catch (NullPointerException success) {}
747 <    }
748 <
749 <    /**
750 <     * drainTo(this) throws IllegalArgumentException
751 <     */
752 <    public void testDrainToSelf() {
753 <        LinkedTransferQueue q = populatedQueue(SIZE);
754 <        try {
755 <            q.drainTo(q);
756 <            shouldThrow();
757 <        } catch (IllegalArgumentException success) {}
650 >        assertTrue(y.isEmpty());
651      }
652  
653      /**
# Line 764 | Line 657 | public class LinkedTransferQueueTest ext
657          LinkedTransferQueue q = populatedQueue(SIZE);
658          ArrayList l = new ArrayList();
659          q.drainTo(l);
660 <        assertEquals(q.size(), 0);
661 <        assertEquals(l.size(), SIZE);
660 >        assertEquals(0, q.size());
661 >        assertEquals(SIZE, l.size());
662          for (int i = 0; i < SIZE; ++i) {
663 <            assertEquals(l.get(i), i);
663 >            assertEquals(i, l.get(i));
664          }
665          q.add(zero);
666          q.add(one);
# Line 776 | Line 669 | public class LinkedTransferQueueTest ext
669          assertTrue(q.contains(one));
670          l.clear();
671          q.drainTo(l);
672 <        assertEquals(q.size(), 0);
673 <        assertEquals(l.size(), 2);
672 >        assertEquals(0, q.size());
673 >        assertEquals(2, l.size());
674          for (int i = 0; i < 2; ++i) {
675 <            assertEquals(l.get(i), i);
675 >            assertEquals(i, l.get(i));
676          }
677      }
678  
# Line 795 | Line 688 | public class LinkedTransferQueueTest ext
688          ArrayList l = new ArrayList();
689          q.drainTo(l);
690          assertTrue(l.size() >= SIZE);
691 <        for (int i = 0; i < SIZE; ++i) {
692 <            assertEquals(l.get(i), i);
693 <        }
801 <        t.join();
691 >        for (int i = 0; i < SIZE; ++i)
692 >            assertEquals(i, l.get(i));
693 >        awaitTermination(t, MEDIUM_DELAY_MS);
694          assertTrue(q.size() + l.size() >= SIZE);
695      }
696  
697      /**
698 <     * drainTo(null, n) throws NullPointerException
807 <     */
808 <    public void testDrainToNullN() {
809 <        LinkedTransferQueue q = populatedQueue(SIZE);
810 <        try {
811 <            q.drainTo(null, SIZE);
812 <            shouldThrow();
813 <        } catch (NullPointerException success) {}
814 <    }
815 <
816 <    /**
817 <     * drainTo(this, n) throws IllegalArgumentException
818 <     */
819 <    public void testDrainToSelfN() {
820 <        LinkedTransferQueue q = populatedQueue(SIZE);
821 <        try {
822 <            q.drainTo(q, SIZE);
823 <            shouldThrow();
824 <        } catch (IllegalArgumentException success) {}
825 <    }
826 <
827 <    /**
828 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
698 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
699       */
700      public void testDrainToN() {
701          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 836 | Line 706 | public class LinkedTransferQueueTest ext
706              ArrayList l = new ArrayList();
707              q.drainTo(l, i);
708              int k = (i < SIZE) ? i : SIZE;
709 <            assertEquals(l.size(), k);
710 <            assertEquals(q.size(), SIZE - k);
711 <            for (int j = 0; j < k; ++j) {
712 <                assertEquals(l.get(j), j);
713 <            }
844 <            while (q.poll() != null)
845 <                ;
709 >            assertEquals(k, l.size());
710 >            assertEquals(SIZE - k, q.size());
711 >            for (int j = 0; j < k; ++j)
712 >                assertEquals(j, l.get(j));
713 >            do {} while (q.poll() != null);
714          }
715      }
716  
# Line 852 | Line 720 | public class LinkedTransferQueueTest ext
720       */
721      public void testWaitingConsumer() throws InterruptedException {
722          final LinkedTransferQueue q = new LinkedTransferQueue();
723 <        assertEquals(q.getWaitingConsumerCount(), 0);
723 >        assertEquals(0, q.getWaitingConsumerCount());
724          assertFalse(q.hasWaitingConsumer());
725 +        final CountDownLatch threadStarted = new CountDownLatch(1);
726  
727          Thread t = newStartedThread(new CheckedRunnable() {
728              public void realRun() throws InterruptedException {
729 <                Thread.sleep(SMALL_DELAY_MS);
730 <                assertTrue(q.hasWaitingConsumer());
731 <                assertEquals(q.getWaitingConsumerCount(), 1);
863 <                assertTrue(q.offer(one));
729 >                threadStarted.countDown();
730 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
731 >                assertEquals(0, q.getWaitingConsumerCount());
732                  assertFalse(q.hasWaitingConsumer());
865                assertEquals(q.getWaitingConsumerCount(), 0);
733              }});
734  
735 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
736 <        assertEquals(q.getWaitingConsumerCount(), 0);
735 >        threadStarted.await();
736 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
737 >        assertEquals(1, q.getWaitingConsumerCount());
738 >        assertTrue(q.hasWaitingConsumer());
739 >
740 >        assertTrue(q.offer(one));
741 >        assertEquals(0, q.getWaitingConsumerCount());
742          assertFalse(q.hasWaitingConsumer());
743 <        t.join();
743 >
744 >        awaitTermination(t, MEDIUM_DELAY_MS);
745      }
746  
747      /**
# Line 889 | Line 762 | public class LinkedTransferQueueTest ext
762      public void testTransfer2() throws InterruptedException {
763          final LinkedTransferQueue<Integer> q
764              = new LinkedTransferQueue<Integer>();
765 +        final CountDownLatch threadStarted = new CountDownLatch(1);
766  
767          Thread t = newStartedThread(new CheckedRunnable() {
768              public void realRun() throws InterruptedException {
769 <                q.transfer(SIZE);
770 <                threadAssertTrue(q.isEmpty());
769 >                threadStarted.countDown();
770 >                q.transfer(five);
771 >                checkEmpty(q);
772              }});
773  
774 <        Thread.sleep(SHORT_DELAY_MS);
774 >        threadStarted.await();
775 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
776          assertEquals(1, q.size());
777 <        assertEquals(SIZE, (int) q.poll());
778 <        assertTrue(q.isEmpty());
779 <        t.join();
777 >        assertSame(five, q.poll());
778 >        checkEmpty(q);
779 >        awaitTermination(t, MEDIUM_DELAY_MS);
780      }
781  
782      /**
# Line 912 | Line 788 | public class LinkedTransferQueueTest ext
788  
789          Thread first = newStartedThread(new CheckedRunnable() {
790              public void realRun() throws InterruptedException {
791 <                Integer i = SIZE + 1;
792 <                q.transfer(i);
793 <                threadAssertTrue(!q.contains(i));
918 <                threadAssertEquals(1, q.size());
791 >                q.transfer(four);
792 >                assertTrue(!q.contains(four));
793 >                assertEquals(1, q.size());
794              }});
795  
796          Thread interruptedThread = newStartedThread(
797              new CheckedInterruptedRunnable() {
798                  public void realRun() throws InterruptedException {
799 <                    while (q.size() == 0)
799 >                    while (q.isEmpty())
800                          Thread.yield();
801 <                    q.transfer(SIZE);
801 >                    q.transfer(five);
802                  }});
803  
804          while (q.size() < 2)
805              Thread.yield();
806          assertEquals(2, q.size());
807 <        assertEquals(SIZE + 1, (int) q.poll());
807 >        assertSame(four, q.poll());
808          first.join();
809          assertEquals(1, q.size());
810          interruptedThread.interrupt();
811          interruptedThread.join();
812 <        assertEquals(0, q.size());
938 <        assertTrue(q.isEmpty());
812 >        checkEmpty(q);
813      }
814  
815      /**
# Line 948 | Line 822 | public class LinkedTransferQueueTest ext
822          Thread t = newStartedThread(new CheckedRunnable() {
823              public void realRun() throws InterruptedException {
824                  q.transfer(four);
825 <                threadAssertFalse(q.contains(four));
826 <                threadAssertEquals(three, q.poll());
825 >                assertFalse(q.contains(four));
826 >                assertSame(three, q.poll());
827              }});
828  
829 <        Thread.sleep(SHORT_DELAY_MS);
829 >        while (q.isEmpty())
830 >            Thread.yield();
831 >        assertFalse(q.isEmpty());
832 >        assertEquals(1, q.size());
833          assertTrue(q.offer(three));
834 <        assertEquals(four, q.poll());
835 <        t.join();
834 >        assertSame(four, q.poll());
835 >        awaitTermination(t, MEDIUM_DELAY_MS);
836      }
837  
838      /**
# Line 968 | Line 845 | public class LinkedTransferQueueTest ext
845  
846          Thread t = newStartedThread(new CheckedRunnable() {
847              public void realRun() throws InterruptedException {
848 <                q.transfer(SIZE);
848 >                q.transfer(four);
849                  checkEmpty(q);
850              }});
851  
852 <        Thread.sleep(SHORT_DELAY_MS);
853 <        assertEquals(SIZE, (int) q.take());
852 >        while (q.isEmpty())
853 >            Thread.yield();
854 >        assertFalse(q.isEmpty());
855 >        assertEquals(1, q.size());
856 >        assertSame(four, q.take());
857          checkEmpty(q);
858 <        t.join();
858 >        awaitTermination(t, MEDIUM_DELAY_MS);
859      }
860  
861      /**
# Line 1012 | Line 892 | public class LinkedTransferQueueTest ext
892              public void realRun() {
893                  while (! q.hasWaitingConsumer())
894                      Thread.yield();
895 <                threadAssertTrue(q.hasWaitingConsumer());
896 <                threadAssertTrue(q.isEmpty());
897 <                threadAssertTrue(q.size() == 0);
1018 <                threadAssertTrue(q.tryTransfer(hotPotato));
895 >                assertTrue(q.hasWaitingConsumer());
896 >                checkEmpty(q);
897 >                assertTrue(q.tryTransfer(hotPotato));
898              }});
899  
900 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
900 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
901          checkEmpty(q);
902 <        t.join();
902 >        awaitTermination(t, MEDIUM_DELAY_MS);
903      }
904  
905      /**
# Line 1035 | Line 914 | public class LinkedTransferQueueTest ext
914              public void realRun() {
915                  while (! q.hasWaitingConsumer())
916                      Thread.yield();
917 <                threadAssertTrue(q.hasWaitingConsumer());
918 <                threadAssertTrue(q.isEmpty());
919 <                threadAssertTrue(q.size() == 0);
1041 <                threadAssertTrue(q.tryTransfer(hotPotato));
917 >                assertTrue(q.hasWaitingConsumer());
918 >                checkEmpty(q);
919 >                assertTrue(q.tryTransfer(hotPotato));
920              }});
921  
922 <        assertTrue(q.take() == hotPotato);
922 >        assertSame(q.take(), hotPotato);
923          checkEmpty(q);
924 <        t.join();
924 >        awaitTermination(t, MEDIUM_DELAY_MS);
925      }
926  
927      /**
928 <     * tryTransfer waits the amount given if interrupted, and
1051 <     * throws interrupted exception
928 >     * tryTransfer blocks interruptibly if no takers
929       */
930      public void testTryTransfer5() throws InterruptedException {
931          final LinkedTransferQueue q = new LinkedTransferQueue();
932 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
933 +        assertTrue(q.isEmpty());
934  
935 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
935 >        Thread t = newStartedThread(new CheckedRunnable() {
936              public void realRun() throws InterruptedException {
937 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
937 >                Thread.currentThread().interrupt();
938 >                try {
939 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
940 >                    shouldThrow();
941 >                } catch (InterruptedException success) {}
942 >                assertFalse(Thread.interrupted());
943 >
944 >                pleaseInterrupt.countDown();
945 >                try {
946 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
947 >                    shouldThrow();
948 >                } catch (InterruptedException success) {}
949 >                assertFalse(Thread.interrupted());
950              }});
951  
952 <        Thread.sleep(SMALL_DELAY_MS);
953 <        toInterrupt.interrupt();
954 <        toInterrupt.join();
952 >        await(pleaseInterrupt);
953 >        assertThreadStaysAlive(t);
954 >        t.interrupt();
955 >        awaitTermination(t);
956 >        checkEmpty(q);
957      }
958  
959      /**
960 <     * tryTransfer gives up after the timeout and return false
960 >     * tryTransfer gives up after the timeout and returns false
961       */
962      public void testTryTransfer6() throws InterruptedException {
963          final LinkedTransferQueue q = new LinkedTransferQueue();
964  
965          Thread t = newStartedThread(new CheckedRunnable() {
966              public void realRun() throws InterruptedException {
967 <                threadAssertFalse
968 <                    (q.tryTransfer(new Object(),
969 <                                   SHORT_DELAY_MS, MILLISECONDS));
967 >                long t0 = System.nanoTime();
968 >                assertFalse(q.tryTransfer(new Object(),
969 >                                          timeoutMillis(), MILLISECONDS));
970 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
971 >                checkEmpty(q);
972              }});
973  
974 <        Thread.sleep(SMALL_DELAY_MS);
974 >        awaitTermination(t);
975          checkEmpty(q);
1081        t.join();
976      }
977  
978      /**
# Line 1091 | Line 985 | public class LinkedTransferQueueTest ext
985  
986          Thread t = newStartedThread(new CheckedRunnable() {
987              public void realRun() throws InterruptedException {
988 <                threadAssertTrue(q.tryTransfer(five,
989 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1096 <                threadAssertTrue(q.isEmpty());
988 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
989 >                checkEmpty(q);
990              }});
991  
992 <        Thread.sleep(SHORT_DELAY_MS);
992 >        while (q.size() != 2)
993 >            Thread.yield();
994          assertEquals(2, q.size());
995 <        assertEquals(four, q.poll());
996 <        assertEquals(five, q.poll());
995 >        assertSame(four, q.poll());
996 >        assertSame(five, q.poll());
997          checkEmpty(q);
998 <        t.join();
998 >        awaitTermination(t, MEDIUM_DELAY_MS);
999      }
1000  
1001      /**
1002 <     * tryTransfer attempts to enqueue into the q and fails returning
1003 <     * false not enqueueing and the successive poll is null
1002 >     * tryTransfer attempts to enqueue into the queue and fails
1003 >     * returning false not enqueueing and the successive poll is null
1004       */
1005      public void testTryTransfer8() throws InterruptedException {
1006          final LinkedTransferQueue q = new LinkedTransferQueue();
1007          assertTrue(q.offer(four));
1008          assertEquals(1, q.size());
1009 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1009 >        long t0 = System.nanoTime();
1010 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1011 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1012          assertEquals(1, q.size());
1013 <        assertEquals(four, q.poll());
1013 >        assertSame(four, q.poll());
1014          assertNull(q.poll());
1015          checkEmpty(q);
1016      }
1017  
1018      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1019          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1020 <        assertTrue(q.isEmpty());
1020 >        checkEmpty(q);
1021          for (int i = 0; i < n; i++) {
1022              assertEquals(i, q.size());
1023              assertTrue(q.offer(i));
# Line 1130 | Line 1026 | public class LinkedTransferQueueTest ext
1026          assertFalse(q.isEmpty());
1027          return q;
1028      }
1029 +
1030 +    /**
1031 +     * remove(null), contains(null) always return false
1032 +     */
1033 +    public void testNeverContainsNull() {
1034 +        Collection<?>[] qs = {
1035 +            new LinkedTransferQueue<Object>(),
1036 +            populatedQueue(2),
1037 +        };
1038 +
1039 +        for (Collection<?> q : qs) {
1040 +            assertFalse(q.contains(null));
1041 +            assertFalse(q.remove(null));
1042 +        }
1043 +    }
1044   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines