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.30 by jsr166, Thu Oct 28 22:20:47 2010 UTC vs.
Revision 1.67 by jsr166, Sun Oct 16 20:16:36 2016 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 {
27
27      public static class Generic extends BlockingQueueTest {
28          protected BlockingQueue emptyCollection() {
29              return new LinkedTransferQueue();
# Line 32 | Line 31 | public class LinkedTransferQueueTest ext
31      }
32  
33      public static void main(String[] args) {
34 <        junit.textui.TestRunner.run(suite());
34 >        main(suite(), args);
35      }
36  
37      public static Test suite() {
38 +        class Implementation implements CollectionImplementation {
39 +            public Class<?> klazz() { return LinkedTransferQueue.class; }
40 +            public Collection emptyCollection() { return new LinkedTransferQueue(); }
41 +            public Object makeElement(int i) { return i; }
42 +            public boolean isConcurrent() { return true; }
43 +            public boolean permitsNulls() { return false; }
44 +        }
45          return newTestSuite(LinkedTransferQueueTest.class,
46 <                            new Generic().testSuite());
47 <    }
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) {}
46 >                            new Generic().testSuite(),
47 >                            CollectionTest.testSuite(new Implementation()));
48      }
49  
50      /**
# Line 88 | Line 72 | public class LinkedTransferQueueTest ext
72       * NullPointerException
73       */
74      public void testConstructor3() {
75 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
76          try {
77 <            Integer[] ints = new Integer[SIZE];
93 <            new LinkedTransferQueue(Arrays.asList(ints));
77 >            new LinkedTransferQueue(elements);
78              shouldThrow();
79          } catch (NullPointerException success) {}
80      }
# Line 100 | Line 84 | public class LinkedTransferQueueTest ext
84       * throws NullPointerException
85       */
86      public void testConstructor4() {
87 +        Integer[] ints = new Integer[SIZE];
88 +        for (int i = 0; i < SIZE - 1; ++i)
89 +            ints[i] = i;
90 +        Collection<Integer> elements = Arrays.asList(ints);
91          try {
92 <            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));
92 >            new LinkedTransferQueue(elements);
93              shouldThrow();
94          } catch (NullPointerException success) {}
95      }
# Line 138 | Line 122 | public class LinkedTransferQueueTest ext
122       * remainingCapacity() always returns Integer.MAX_VALUE
123       */
124      public void testRemainingCapacity() {
125 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
125 >        BlockingQueue q = populatedQueue(SIZE);
126          for (int i = 0; i < SIZE; ++i) {
127              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
128              assertEquals(SIZE - i, q.size());
129 <            q.remove();
129 >            assertEquals(i, q.remove());
130          }
131          for (int i = 0; i < SIZE; ++i) {
132              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133              assertEquals(i, q.size());
134 <            q.add(i);
134 >            assertTrue(q.add(i));
135          }
136      }
137  
138      /**
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    /**
139       * addAll(this) throws IllegalArgumentException
140       */
141      public void testAddAllSelf() {
142 +        LinkedTransferQueue q = populatedQueue(SIZE);
143          try {
192            LinkedTransferQueue q = populatedQueue(SIZE);
144              q.addAll(q);
145              shouldThrow();
146          } catch (IllegalArgumentException success) {}
147      }
148  
149      /**
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    /**
150       * addAll of a collection with any null elements throws
151       * NullPointerException after possibly adding some elements
152       */
153      public void testAddAll3() {
154 +        LinkedTransferQueue q = new LinkedTransferQueue();
155 +        Integer[] ints = new Integer[SIZE];
156 +        for (int i = 0; i < SIZE - 1; ++i)
157 +            ints[i] = i;
158          try {
216            LinkedTransferQueue q = new LinkedTransferQueue();
217            Integer[] ints = new Integer[SIZE];
218            for (int i = 0; i < SIZE - 1; ++i) {
219                ints[i] = i;
220            }
159              q.addAll(Arrays.asList(ints));
160              shouldThrow();
161          } catch (NullPointerException success) {}
# Line 241 | Line 179 | public class LinkedTransferQueueTest ext
179      }
180  
181      /**
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    /**
182       * all elements successfully put are contained
183       */
184      public void testPut() {
185          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
186          for (int i = 0; i < SIZE; ++i) {
187 <            assertEquals(q.size(), i);
187 >            assertEquals(i, q.size());
188              q.put(i);
189              assertTrue(q.contains(i));
190          }
# Line 277 | Line 204 | public class LinkedTransferQueueTest ext
204       * take removes existing elements until empty, then blocks interruptibly
205       */
206      public void testBlockingTake() throws InterruptedException {
207 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
208 <        Thread t = new Thread(new CheckedRunnable() {
207 >        final BlockingQueue q = populatedQueue(SIZE);
208 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
209 >        Thread t = newStartedThread(new CheckedRunnable() {
210              public void realRun() throws InterruptedException {
211                  for (int i = 0; i < SIZE; ++i) {
212 <                    assertEquals(i, (int) q.take());
212 >                    assertEquals(i, q.take());
213                  }
214 +
215 +                Thread.currentThread().interrupt();
216                  try {
217                      q.take();
218                      shouldThrow();
219                  } catch (InterruptedException success) {}
220 +                assertFalse(Thread.interrupted());
221 +
222 +                pleaseInterrupt.countDown();
223 +                try {
224 +                    q.take();
225 +                    shouldThrow();
226 +                } catch (InterruptedException success) {}
227 +                assertFalse(Thread.interrupted());
228              }});
229  
230 <        t.start();
231 <        Thread.sleep(SHORT_DELAY_MS);
230 >        await(pleaseInterrupt);
231 >        assertThreadStaysAlive(t);
232          t.interrupt();
233 <        awaitTermination(t, MEDIUM_DELAY_MS);
296 <        checkEmpty(q);
233 >        awaitTermination(t);
234      }
235  
236      /**
# Line 325 | Line 262 | public class LinkedTransferQueueTest ext
262       */
263      public void testTimedPoll() throws InterruptedException {
264          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
265 <        for (int i = 0; i < SIZE; ++i) {
266 <            long t0 = System.nanoTime();
265 >        long startTime = System.nanoTime();
266 >        for (int i = 0; i < SIZE; ++i)
267              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
268 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
269 <        }
270 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
268 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
269 >
270 >        startTime = System.nanoTime();
271 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
272 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
273          checkEmpty(q);
274      }
275  
# Line 339 | Line 278 | public class LinkedTransferQueueTest ext
278       * returning timeout status
279       */
280      public void testInterruptedTimedPoll() throws InterruptedException {
281 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
281 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
282 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
283          Thread t = newStartedThread(new CheckedRunnable() {
284              public void realRun() throws InterruptedException {
285 <                for (int i = 0; i < SIZE; ++i) {
286 <                    long t0 = System.nanoTime();
285 >                long startTime = System.nanoTime();
286 >                for (int i = 0; i < SIZE; ++i)
287                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
288 <                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
349 <                }
288 >                aboutToWait.countDown();
289                  try {
290                      q.poll(LONG_DELAY_MS, MILLISECONDS);
291                      shouldThrow();
292                  } catch (InterruptedException success) {}
293 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
294              }});
295  
296 <        Thread.sleep(SMALL_DELAY_MS);
296 >        aboutToWait.await();
297 >        waitForThreadToEnterWaitState(t);
298          t.interrupt();
299 <        awaitTermination(t, MEDIUM_DELAY_MS);
299 >        awaitTermination(t);
300 >        checkEmpty(q);
301 >    }
302 >
303 >    /**
304 >     * timed poll after thread interrupted throws InterruptedException
305 >     * instead of returning timeout status
306 >     */
307 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
308 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
309 >        Thread t = newStartedThread(new CheckedRunnable() {
310 >            public void realRun() throws InterruptedException {
311 >                long startTime = System.nanoTime();
312 >                Thread.currentThread().interrupt();
313 >                for (int i = 0; i < SIZE; ++i)
314 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
315 >                try {
316 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
317 >                    shouldThrow();
318 >                } catch (InterruptedException success) {}
319 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
320 >            }});
321 >
322 >        awaitTermination(t);
323          checkEmpty(q);
324      }
325  
# Line 406 | Line 370 | public class LinkedTransferQueueTest ext
370      }
371  
372      /**
409     * remove(x) removes x and returns true if present
410     */
411    public void testRemoveElement() throws InterruptedException {
412        LinkedTransferQueue q = populatedQueue(SIZE);
413        for (int i = 1; i < SIZE; i += 2) {
414            assertTrue(q.remove(i));
415        }
416        for (int i = 0; i < SIZE; i += 2) {
417            assertTrue(q.remove(i));
418            assertFalse(q.remove(i + 1));
419        }
420        checkEmpty(q);
421    }
422
423    /**
373       * An add following remove(x) succeeds
374       */
375      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 512 | Line 461 | public class LinkedTransferQueueTest ext
461      }
462  
463      /**
464 <     * toArray() contains all elements
464 >     * toArray() contains all elements in FIFO order
465       */
466 <    public void testToArray() throws InterruptedException {
466 >    public void testToArray() {
467          LinkedTransferQueue q = populatedQueue(SIZE);
468          Object[] o = q.toArray();
469          for (int i = 0; i < o.length; i++) {
470 <            assertEquals(o[i], q.take());
470 >            assertSame(o[i], q.poll());
471          }
472      }
473  
474      /**
475 <     * toArray(a) contains all elements
475 >     * toArray(a) contains all elements in FIFO order
476       */
477 <    public void testToArray2() throws InterruptedException {
477 >    public void testToArray2() {
478          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
479          Integer[] ints = new Integer[SIZE];
480 <        ints = q.toArray(ints);
480 >        Integer[] array = q.toArray(ints);
481 >        assertSame(ints, array);
482          for (int i = 0; i < ints.length; i++) {
483 <            assertEquals(ints[i], q.take());
483 >            assertSame(ints[i], q.poll());
484          }
485      }
486  
487      /**
488 <     * toArray(null) throws NullPointerException
539 <     */
540 <    public void testToArray_BadArg() {
541 <        LinkedTransferQueue q = populatedQueue(SIZE);
542 <        try {
543 <            Object o[] = q.toArray(null);
544 <            shouldThrow();
545 <        } catch (NullPointerException success) {}
546 <    }
547 <
548 <    /**
549 <     * toArray(incompatible array type) throws CCE
488 >     * toArray(incompatible array type) throws ArrayStoreException
489       */
490      public void testToArray1_BadArg() {
491          LinkedTransferQueue q = populatedQueue(SIZE);
492          try {
493 <            Object o[] = q.toArray(new String[10]);
493 >            q.toArray(new String[10]);
494              shouldThrow();
495          } catch (ArrayStoreException success) {}
496      }
# Line 562 | Line 501 | public class LinkedTransferQueueTest ext
501      public void testIterator() throws InterruptedException {
502          LinkedTransferQueue q = populatedQueue(SIZE);
503          Iterator it = q.iterator();
504 <        int i = 0;
505 <        while (it.hasNext()) {
506 <            assertEquals(it.next(), i++);
568 <        }
504 >        int i;
505 >        for (i = 0; it.hasNext(); i++)
506 >            assertTrue(q.contains(it.next()));
507          assertEquals(i, SIZE);
508 +        assertIteratorExhausted(it);
509 +
510 +        it = q.iterator();
511 +        for (i = 0; it.hasNext(); i++)
512 +            assertEquals(it.next(), q.take());
513 +        assertEquals(i, SIZE);
514 +        assertIteratorExhausted(it);
515 +    }
516 +
517 +    /**
518 +     * iterator of empty collection has no elements
519 +     */
520 +    public void testEmptyIterator() {
521 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
522      }
523  
524      /**
# Line 628 | Line 580 | public class LinkedTransferQueueTest ext
580          LinkedTransferQueue q = populatedQueue(SIZE);
581          String s = q.toString();
582          for (int i = 0; i < SIZE; ++i) {
583 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
583 >            assertTrue(s.contains(String.valueOf(i)));
584          }
585      }
586  
# Line 637 | Line 589 | public class LinkedTransferQueueTest ext
589       */
590      public void testOfferInExecutor() {
591          final LinkedTransferQueue q = new LinkedTransferQueue();
592 <        q.add(one);
593 <        q.add(two);
594 <        ExecutorService executor = Executors.newFixedThreadPool(2);
643 <
644 <        executor.execute(new CheckedRunnable() {
645 <            public void realRun() {
646 <                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
647 <            }});
592 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
593 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
594 >        try (PoolCleaner cleaner = cleaner(executor)) {
595  
596 <        executor.execute(new CheckedRunnable() {
597 <            public void realRun() throws InterruptedException {
598 <                Thread.sleep(SMALL_DELAY_MS);
599 <                assertSame(one, q.take());
600 <            }});
596 >            executor.execute(new CheckedRunnable() {
597 >                public void realRun() throws InterruptedException {
598 >                    threadsStarted.await();
599 >                    long startTime = System.nanoTime();
600 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
601 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
602 >                }});
603  
604 <        joinPool(executor);
604 >            executor.execute(new CheckedRunnable() {
605 >                public void realRun() throws InterruptedException {
606 >                    threadsStarted.await();
607 >                    assertSame(one, q.take());
608 >                    checkEmpty(q);
609 >                }});
610 >        }
611      }
612  
613      /**
# Line 660 | Line 615 | public class LinkedTransferQueueTest ext
615       */
616      public void testPollInExecutor() {
617          final LinkedTransferQueue q = new LinkedTransferQueue();
618 <        ExecutorService executor = Executors.newFixedThreadPool(2);
618 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
619 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
620 >        try (PoolCleaner cleaner = cleaner(executor)) {
621  
622 <        executor.execute(new CheckedRunnable() {
623 <            public void realRun() throws InterruptedException {
624 <                assertNull(q.poll());
625 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
626 <                assertTrue(q.isEmpty());
627 <            }});
628 <
629 <        executor.execute(new CheckedRunnable() {
630 <            public void realRun() throws InterruptedException {
674 <                Thread.sleep(SMALL_DELAY_MS);
675 <                q.put(one);
676 <            }});
622 >            executor.execute(new CheckedRunnable() {
623 >                public void realRun() throws InterruptedException {
624 >                    assertNull(q.poll());
625 >                    threadsStarted.await();
626 >                    long startTime = System.nanoTime();
627 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
628 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
629 >                    checkEmpty(q);
630 >                }});
631  
632 <        joinPool(executor);
632 >            executor.execute(new CheckedRunnable() {
633 >                public void realRun() throws InterruptedException {
634 >                    threadsStarted.await();
635 >                    q.put(one);
636 >                }});
637 >        }
638      }
639  
640      /**
641       * A deserialized serialized queue has same elements in same order
642       */
643      public void testSerialization() throws Exception {
644 <        LinkedTransferQueue q = populatedQueue(SIZE);
644 >        Queue x = populatedQueue(SIZE);
645 >        Queue y = serialClone(x);
646  
647 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
648 <        ObjectOutputStream out
649 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
650 <        out.writeObject(q);
651 <        out.close();
652 <
653 <        ByteArrayInputStream bin
694 <            = new ByteArrayInputStream(bout.toByteArray());
695 <        ObjectInputStream in
696 <            = new ObjectInputStream(new BufferedInputStream(bin));
697 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
698 <
699 <        assertEquals(q.size(), r.size());
700 <        while (!q.isEmpty()) {
701 <            assertEquals(q.remove(), r.remove());
647 >        assertNotSame(y, x);
648 >        assertEquals(x.size(), y.size());
649 >        assertEquals(x.toString(), y.toString());
650 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
651 >        while (!x.isEmpty()) {
652 >            assertFalse(y.isEmpty());
653 >            assertEquals(x.remove(), y.remove());
654          }
655 <    }
704 <
705 <    /**
706 <     * drainTo(null) throws NullPointerException
707 <     */
708 <    public void testDrainToNull() {
709 <        LinkedTransferQueue q = populatedQueue(SIZE);
710 <        try {
711 <            q.drainTo(null);
712 <            shouldThrow();
713 <        } catch (NullPointerException success) {}
714 <    }
715 <
716 <    /**
717 <     * drainTo(this) throws IllegalArgumentException
718 <     */
719 <    public void testDrainToSelf() {
720 <        LinkedTransferQueue q = populatedQueue(SIZE);
721 <        try {
722 <            q.drainTo(q);
723 <            shouldThrow();
724 <        } catch (IllegalArgumentException success) {}
655 >        assertTrue(y.isEmpty());
656      }
657  
658      /**
# Line 731 | Line 662 | public class LinkedTransferQueueTest ext
662          LinkedTransferQueue q = populatedQueue(SIZE);
663          ArrayList l = new ArrayList();
664          q.drainTo(l);
665 <        assertEquals(q.size(), 0);
666 <        assertEquals(l.size(), SIZE);
665 >        assertEquals(0, q.size());
666 >        assertEquals(SIZE, l.size());
667          for (int i = 0; i < SIZE; ++i) {
668 <            assertEquals(l.get(i), i);
668 >            assertEquals(i, l.get(i));
669          }
670          q.add(zero);
671          q.add(one);
# Line 743 | Line 674 | public class LinkedTransferQueueTest ext
674          assertTrue(q.contains(one));
675          l.clear();
676          q.drainTo(l);
677 <        assertEquals(q.size(), 0);
678 <        assertEquals(l.size(), 2);
677 >        assertEquals(0, q.size());
678 >        assertEquals(2, l.size());
679          for (int i = 0; i < 2; ++i) {
680 <            assertEquals(l.get(i), i);
680 >            assertEquals(i, l.get(i));
681          }
682      }
683  
# Line 762 | Line 693 | public class LinkedTransferQueueTest ext
693          ArrayList l = new ArrayList();
694          q.drainTo(l);
695          assertTrue(l.size() >= SIZE);
696 <        for (int i = 0; i < SIZE; ++i) {
697 <            assertEquals(l.get(i), i);
698 <        }
768 <        awaitTermination(t, MEDIUM_DELAY_MS);
696 >        for (int i = 0; i < SIZE; ++i)
697 >            assertEquals(i, l.get(i));
698 >        awaitTermination(t);
699          assertTrue(q.size() + l.size() >= SIZE);
700      }
701  
702      /**
773     * drainTo(null, n) throws NullPointerException
774     */
775    public void testDrainToNullN() {
776        LinkedTransferQueue q = populatedQueue(SIZE);
777        try {
778            q.drainTo(null, SIZE);
779            shouldThrow();
780        } catch (NullPointerException success) {}
781    }
782
783    /**
784     * drainTo(this, n) throws IllegalArgumentException
785     */
786    public void testDrainToSelfN() {
787        LinkedTransferQueue q = populatedQueue(SIZE);
788        try {
789            q.drainTo(q, SIZE);
790            shouldThrow();
791        } catch (IllegalArgumentException success) {}
792    }
793
794    /**
703       * drainTo(c, n) empties first min(n, size) elements of queue into c
704       */
705      public void testDrainToN() {
# Line 803 | Line 711 | public class LinkedTransferQueueTest ext
711              ArrayList l = new ArrayList();
712              q.drainTo(l, i);
713              int k = (i < SIZE) ? i : SIZE;
714 <            assertEquals(l.size(), k);
715 <            assertEquals(q.size(), SIZE - k);
716 <            for (int j = 0; j < k; ++j) {
717 <                assertEquals(l.get(j), j);
718 <            }
811 <            while (q.poll() != null)
812 <                ;
714 >            assertEquals(k, l.size());
715 >            assertEquals(SIZE - k, q.size());
716 >            for (int j = 0; j < k; ++j)
717 >                assertEquals(j, l.get(j));
718 >            do {} while (q.poll() != null);
719          }
720      }
721  
# Line 819 | Line 725 | public class LinkedTransferQueueTest ext
725       */
726      public void testWaitingConsumer() throws InterruptedException {
727          final LinkedTransferQueue q = new LinkedTransferQueue();
728 <        assertEquals(q.getWaitingConsumerCount(), 0);
728 >        assertEquals(0, q.getWaitingConsumerCount());
729          assertFalse(q.hasWaitingConsumer());
730 +        final CountDownLatch threadStarted = new CountDownLatch(1);
731  
732          Thread t = newStartedThread(new CheckedRunnable() {
733              public void realRun() throws InterruptedException {
734 <                Thread.sleep(SMALL_DELAY_MS);
735 <                assertTrue(q.hasWaitingConsumer());
736 <                assertEquals(q.getWaitingConsumerCount(), 1);
737 <                assertTrue(q.offer(one));
734 >                threadStarted.countDown();
735 >                long startTime = System.nanoTime();
736 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
737 >                assertEquals(0, q.getWaitingConsumerCount());
738                  assertFalse(q.hasWaitingConsumer());
739 <                assertEquals(q.getWaitingConsumerCount(), 0);
739 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
740              }});
741  
742 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
743 <        assertEquals(q.getWaitingConsumerCount(), 0);
742 >        threadStarted.await();
743 >        waitForThreadToEnterWaitState(t);
744 >        assertEquals(1, q.getWaitingConsumerCount());
745 >        assertTrue(q.hasWaitingConsumer());
746 >
747 >        assertTrue(q.offer(one));
748 >        assertEquals(0, q.getWaitingConsumerCount());
749          assertFalse(q.hasWaitingConsumer());
750 <        awaitTermination(t, MEDIUM_DELAY_MS);
750 >
751 >        awaitTermination(t);
752      }
753  
754      /**
# Line 856 | Line 769 | public class LinkedTransferQueueTest ext
769      public void testTransfer2() throws InterruptedException {
770          final LinkedTransferQueue<Integer> q
771              = new LinkedTransferQueue<Integer>();
772 +        final CountDownLatch threadStarted = new CountDownLatch(1);
773  
774          Thread t = newStartedThread(new CheckedRunnable() {
775              public void realRun() throws InterruptedException {
776 <                q.transfer(SIZE);
777 <                assertTrue(q.isEmpty());
776 >                threadStarted.countDown();
777 >                q.transfer(five);
778 >                checkEmpty(q);
779              }});
780  
781 <        Thread.sleep(SHORT_DELAY_MS);
781 >        threadStarted.await();
782 >        waitForThreadToEnterWaitState(t);
783          assertEquals(1, q.size());
784 <        assertEquals(SIZE, (int) q.poll());
785 <        assertTrue(q.isEmpty());
786 <        awaitTermination(t, MEDIUM_DELAY_MS);
784 >        assertSame(five, q.poll());
785 >        checkEmpty(q);
786 >        awaitTermination(t);
787      }
788  
789      /**
# Line 879 | Line 795 | public class LinkedTransferQueueTest ext
795  
796          Thread first = newStartedThread(new CheckedRunnable() {
797              public void realRun() throws InterruptedException {
798 <                Integer i = SIZE + 1;
799 <                q.transfer(i);
884 <                assertTrue(!q.contains(i));
798 >                q.transfer(four);
799 >                assertTrue(!q.contains(four));
800                  assertEquals(1, q.size());
801              }});
802  
803          Thread interruptedThread = newStartedThread(
804              new CheckedInterruptedRunnable() {
805                  public void realRun() throws InterruptedException {
806 <                    while (q.size() == 0)
806 >                    while (q.isEmpty())
807                          Thread.yield();
808 <                    q.transfer(SIZE);
808 >                    q.transfer(five);
809                  }});
810  
811          while (q.size() < 2)
812              Thread.yield();
813          assertEquals(2, q.size());
814 <        assertEquals(SIZE + 1, (int) q.poll());
814 >        assertSame(four, q.poll());
815          first.join();
816          assertEquals(1, q.size());
817          interruptedThread.interrupt();
818          interruptedThread.join();
819 <        assertEquals(0, q.size());
905 <        assertTrue(q.isEmpty());
819 >        checkEmpty(q);
820      }
821  
822      /**
# Line 919 | Line 833 | public class LinkedTransferQueueTest ext
833                  assertSame(three, q.poll());
834              }});
835  
836 <        Thread.sleep(SHORT_DELAY_MS);
836 >        while (q.isEmpty())
837 >            Thread.yield();
838 >        assertFalse(q.isEmpty());
839 >        assertEquals(1, q.size());
840          assertTrue(q.offer(three));
841          assertSame(four, q.poll());
842 <        awaitTermination(t, MEDIUM_DELAY_MS);
842 >        awaitTermination(t);
843      }
844  
845      /**
# Line 935 | Line 852 | public class LinkedTransferQueueTest ext
852  
853          Thread t = newStartedThread(new CheckedRunnable() {
854              public void realRun() throws InterruptedException {
855 <                q.transfer(SIZE);
855 >                q.transfer(four);
856                  checkEmpty(q);
857              }});
858  
859 <        Thread.sleep(SHORT_DELAY_MS);
860 <        assertEquals(SIZE, (int) q.take());
859 >        while (q.isEmpty())
860 >            Thread.yield();
861 >        assertFalse(q.isEmpty());
862 >        assertEquals(1, q.size());
863 >        assertSame(four, q.take());
864          checkEmpty(q);
865 <        awaitTermination(t, MEDIUM_DELAY_MS);
865 >        awaitTermination(t);
866      }
867  
868      /**
869       * tryTransfer(null) throws NullPointerException
870       */
871      public void testTryTransfer1() {
872 +        final LinkedTransferQueue q = new LinkedTransferQueue();
873          try {
953            final LinkedTransferQueue q = new LinkedTransferQueue();
874              q.tryTransfer(null);
875              shouldThrow();
876          } catch (NullPointerException success) {}
# Line 980 | Line 900 | public class LinkedTransferQueueTest ext
900                  while (! q.hasWaitingConsumer())
901                      Thread.yield();
902                  assertTrue(q.hasWaitingConsumer());
903 <                assertTrue(q.isEmpty());
984 <                assertEquals(q.size(), 0);
903 >                checkEmpty(q);
904                  assertTrue(q.tryTransfer(hotPotato));
905              }});
906  
907 <        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
907 >        long startTime = System.nanoTime();
908 >        assertSame(hotPotato, q.poll(LONG_DELAY_MS, MILLISECONDS));
909 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
910          checkEmpty(q);
911 <        awaitTermination(t, MEDIUM_DELAY_MS);
911 >        awaitTermination(t);
912      }
913  
914      /**
# Line 1003 | Line 924 | public class LinkedTransferQueueTest ext
924                  while (! q.hasWaitingConsumer())
925                      Thread.yield();
926                  assertTrue(q.hasWaitingConsumer());
927 <                assertTrue(q.isEmpty());
1007 <                assertEquals(q.size(), 0);
927 >                checkEmpty(q);
928                  assertTrue(q.tryTransfer(hotPotato));
929              }});
930  
931          assertSame(q.take(), hotPotato);
932          checkEmpty(q);
933 <        awaitTermination(t, MEDIUM_DELAY_MS);
933 >        awaitTermination(t);
934      }
935  
936      /**
937 <     * tryTransfer waits the amount given if interrupted, and
1018 <     * throws interrupted exception
937 >     * tryTransfer blocks interruptibly if no takers
938       */
939      public void testTryTransfer5() throws InterruptedException {
940          final LinkedTransferQueue q = new LinkedTransferQueue();
941 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
942 +        assertTrue(q.isEmpty());
943  
944 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
944 >        Thread t = newStartedThread(new CheckedRunnable() {
945              public void realRun() throws InterruptedException {
946 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
946 >                long startTime = System.nanoTime();
947 >                Thread.currentThread().interrupt();
948 >                try {
949 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
950 >                    shouldThrow();
951 >                } catch (InterruptedException success) {}
952 >                assertFalse(Thread.interrupted());
953 >
954 >                pleaseInterrupt.countDown();
955 >                try {
956 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
957 >                    shouldThrow();
958 >                } catch (InterruptedException success) {}
959 >                assertFalse(Thread.interrupted());
960 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
961              }});
962  
963 <        Thread.sleep(SMALL_DELAY_MS);
964 <        toInterrupt.interrupt();
965 <        toInterrupt.join();
963 >        await(pleaseInterrupt);
964 >        assertThreadStaysAlive(t);
965 >        t.interrupt();
966 >        awaitTermination(t);
967 >        checkEmpty(q);
968      }
969  
970      /**
971 <     * tryTransfer gives up after the timeout and return false
971 >     * tryTransfer gives up after the timeout and returns false
972       */
973      public void testTryTransfer6() throws InterruptedException {
974          final LinkedTransferQueue q = new LinkedTransferQueue();
975  
976          Thread t = newStartedThread(new CheckedRunnable() {
977              public void realRun() throws InterruptedException {
978 <                long t0 = System.nanoTime();
978 >                long startTime = System.nanoTime();
979                  assertFalse(q.tryTransfer(new Object(),
980 <                                          SHORT_DELAY_MS, MILLISECONDS));
981 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
980 >                                          timeoutMillis(), MILLISECONDS));
981 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
982 >                checkEmpty(q);
983              }});
984  
985 <        checkEmpty(q);
1048 <        awaitTermination(t, MEDIUM_DELAY_MS);
985 >        awaitTermination(t);
986          checkEmpty(q);
987      }
988  
# Line 1059 | Line 996 | public class LinkedTransferQueueTest ext
996  
997          Thread t = newStartedThread(new CheckedRunnable() {
998              public void realRun() throws InterruptedException {
999 <                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1000 <                assertTrue(q.isEmpty());
999 >                long startTime = System.nanoTime();
1000 >                assertTrue(q.tryTransfer(five, LONG_DELAY_MS, MILLISECONDS));
1001 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1002 >                checkEmpty(q);
1003              }});
1004  
1005 <        Thread.sleep(SHORT_DELAY_MS);
1005 >        while (q.size() != 2)
1006 >            Thread.yield();
1007          assertEquals(2, q.size());
1008          assertSame(four, q.poll());
1009          assertSame(five, q.poll());
1010          checkEmpty(q);
1011 <        awaitTermination(t, MEDIUM_DELAY_MS);
1011 >        awaitTermination(t);
1012      }
1013  
1014      /**
1015 <     * tryTransfer attempts to enqueue into the q and fails returning
1016 <     * false not enqueueing and the successive poll is null
1015 >     * tryTransfer attempts to enqueue into the queue and fails
1016 >     * returning false not enqueueing and the successive poll is null
1017       */
1018      public void testTryTransfer8() throws InterruptedException {
1019          final LinkedTransferQueue q = new LinkedTransferQueue();
1020          assertTrue(q.offer(four));
1021          assertEquals(1, q.size());
1022 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1022 >        long startTime = System.nanoTime();
1023 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1024 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1025          assertEquals(1, q.size());
1026          assertSame(four, q.poll());
1027          assertNull(q.poll());
# Line 1088 | Line 1030 | public class LinkedTransferQueueTest ext
1030  
1031      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1032          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1033 <        assertTrue(q.isEmpty());
1033 >        checkEmpty(q);
1034          for (int i = 0; i < n; i++) {
1035              assertEquals(i, q.size());
1036              assertTrue(q.offer(i));
# Line 1097 | Line 1039 | public class LinkedTransferQueueTest ext
1039          assertFalse(q.isEmpty());
1040          return q;
1041      }
1042 +
1043 +    /**
1044 +     * remove(null), contains(null) always return false
1045 +     */
1046 +    public void testNeverContainsNull() {
1047 +        Collection<?>[] qs = {
1048 +            new LinkedTransferQueue<Object>(),
1049 +            populatedQueue(2),
1050 +        };
1051 +
1052 +        for (Collection<?> q : qs) {
1053 +            assertFalse(q.contains(null));
1054 +            assertFalse(q.remove(null));
1055 +        }
1056 +    }
1057   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines