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.29 by jsr166, Thu Oct 28 19:05:04 2010 UTC vs.
Revision 1.64 by jsr166, Tue Oct 6 00:03:55 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;
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 +    static class Implementation implements CollectionImplementation {
28 +        public Class<?> klazz() { return LinkedTransferQueue.class; }
29 +        public Collection emptyCollection() { return new LinkedTransferQueue(); }
30 +        public Object makeElement(int i) { return i; }
31 +        public boolean isConcurrent() { return true; }
32 +        public boolean permitsNulls() { return false; }
33 +    }
34  
35      public static class Generic extends BlockingQueueTest {
36          protected BlockingQueue emptyCollection() {
# Line 32 | Line 39 | public class LinkedTransferQueueTest ext
39      }
40  
41      public static void main(String[] args) {
42 <        junit.textui.TestRunner.run(suite());
42 >        main(suite(), args);
43      }
44  
45      public static Test suite() {
46          return newTestSuite(LinkedTransferQueueTest.class,
47 <                            new Generic().testSuite());
48 <    }
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) {}
47 >                            new Generic().testSuite(),
48 >                            CollectionTest.testSuite(new Implementation()));
49      }
50  
51      /**
# Line 88 | Line 73 | public class LinkedTransferQueueTest ext
73       * NullPointerException
74       */
75      public void testConstructor3() {
76 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
77          try {
78 <            Integer[] ints = new Integer[SIZE];
93 <            new LinkedTransferQueue(Arrays.asList(ints));
78 >            new LinkedTransferQueue(elements);
79              shouldThrow();
80          } catch (NullPointerException success) {}
81      }
# Line 100 | Line 85 | public class LinkedTransferQueueTest ext
85       * throws NullPointerException
86       */
87      public void testConstructor4() {
88 +        Integer[] ints = new Integer[SIZE];
89 +        for (int i = 0; i < SIZE - 1; ++i)
90 +            ints[i] = i;
91 +        Collection<Integer> elements = Arrays.asList(ints);
92          try {
93 <            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));
93 >            new LinkedTransferQueue(elements);
94              shouldThrow();
95          } catch (NullPointerException success) {}
96      }
# Line 138 | Line 123 | public class LinkedTransferQueueTest ext
123       * remainingCapacity() always returns Integer.MAX_VALUE
124       */
125      public void testRemainingCapacity() {
126 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
126 >        BlockingQueue q = populatedQueue(SIZE);
127          for (int i = 0; i < SIZE; ++i) {
128              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
129              assertEquals(SIZE - i, q.size());
130 <            q.remove();
130 >            assertEquals(i, q.remove());
131          }
132          for (int i = 0; i < SIZE; ++i) {
133              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
134              assertEquals(i, q.size());
135 <            q.add(i);
135 >            assertTrue(q.add(i));
136          }
137      }
138  
139      /**
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    /**
140       * addAll(this) throws IllegalArgumentException
141       */
142      public void testAddAllSelf() {
143 +        LinkedTransferQueue q = populatedQueue(SIZE);
144          try {
192            LinkedTransferQueue q = populatedQueue(SIZE);
145              q.addAll(q);
146              shouldThrow();
147          } catch (IllegalArgumentException success) {}
148      }
149  
150      /**
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    /**
151       * addAll of a collection with any null elements throws
152       * NullPointerException after possibly adding some elements
153       */
154      public void testAddAll3() {
155 +        LinkedTransferQueue q = new LinkedTransferQueue();
156 +        Integer[] ints = new Integer[SIZE];
157 +        for (int i = 0; i < SIZE - 1; ++i)
158 +            ints[i] = i;
159          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            }
160              q.addAll(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
# Line 241 | Line 180 | public class LinkedTransferQueueTest ext
180      }
181  
182      /**
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    /**
183       * all elements successfully put are contained
184       */
185      public void testPut() {
186          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
187          for (int i = 0; i < SIZE; ++i) {
188 <            assertEquals(q.size(), i);
188 >            assertEquals(i, q.size());
189              q.put(i);
190              assertTrue(q.contains(i));
191          }
# Line 277 | Line 205 | public class LinkedTransferQueueTest ext
205       * take removes existing elements until empty, then blocks interruptibly
206       */
207      public void testBlockingTake() throws InterruptedException {
208 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
209 <        Thread t = new Thread(new CheckedRunnable() {
208 >        final BlockingQueue q = populatedQueue(SIZE);
209 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
210 >        Thread t = newStartedThread(new CheckedRunnable() {
211              public void realRun() throws InterruptedException {
212                  for (int i = 0; i < SIZE; ++i) {
213 <                    assertEquals(i, (int) q.take());
213 >                    assertEquals(i, q.take());
214                  }
215 +
216 +                Thread.currentThread().interrupt();
217                  try {
218                      q.take();
219                      shouldThrow();
220                  } catch (InterruptedException success) {}
221 +                assertFalse(Thread.interrupted());
222 +
223 +                pleaseInterrupt.countDown();
224 +                try {
225 +                    q.take();
226 +                    shouldThrow();
227 +                } catch (InterruptedException success) {}
228 +                assertFalse(Thread.interrupted());
229              }});
230  
231 <        t.start();
232 <        Thread.sleep(SHORT_DELAY_MS);
231 >        await(pleaseInterrupt);
232 >        assertThreadStaysAlive(t);
233          t.interrupt();
234 <        awaitTermination(t, MEDIUM_DELAY_MS);
296 <        checkEmpty(q);
234 >        awaitTermination(t);
235      }
236  
237      /**
# Line 309 | Line 247 | public class LinkedTransferQueueTest ext
247      }
248  
249      /**
250 <     * timed pool with zero timeout succeeds when non-empty, else times out
250 >     * timed poll with zero timeout succeeds when non-empty, else times out
251       */
252      public void testTimedPoll0() throws InterruptedException {
253          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 321 | Line 259 | public class LinkedTransferQueueTest ext
259      }
260  
261      /**
262 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
262 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
263       */
264      public void testTimedPoll() throws InterruptedException {
265          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
266          for (int i = 0; i < SIZE; ++i) {
267 <            long t0 = System.nanoTime();
267 >            long startTime = System.nanoTime();
268              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
269 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
269 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
270          }
271 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
271 >        long startTime = System.nanoTime();
272 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
273 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
274          checkEmpty(q);
275      }
276  
# Line 339 | Line 279 | public class LinkedTransferQueueTest ext
279       * returning timeout status
280       */
281      public void testInterruptedTimedPoll() throws InterruptedException {
282 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
282 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
283 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
284          Thread t = newStartedThread(new CheckedRunnable() {
285              public void realRun() throws InterruptedException {
286 +                long startTime = System.nanoTime();
287 +                for (int i = 0; i < SIZE; ++i) {
288 +                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
289 +                }
290 +                aboutToWait.countDown();
291 +                try {
292 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
293 +                    shouldThrow();
294 +                } catch (InterruptedException success) {
295 +                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
296 +                }
297 +            }});
298 +
299 +        aboutToWait.await();
300 +        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
301 +        t.interrupt();
302 +        awaitTermination(t);
303 +        checkEmpty(q);
304 +    }
305 +
306 +    /**
307 +     * timed poll after thread interrupted throws InterruptedException
308 +     * instead of returning timeout status
309 +     */
310 +    public void testTimedPollAfterInterrupt() throws InterruptedException {
311 +        final BlockingQueue<Integer> q = populatedQueue(SIZE);
312 +        Thread t = newStartedThread(new CheckedRunnable() {
313 +            public void realRun() throws InterruptedException {
314 +                Thread.currentThread().interrupt();
315                  for (int i = 0; i < SIZE; ++i) {
316                      long t0 = System.nanoTime();
317                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
318                      assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
319                  }
320                  try {
321 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
321 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
322                      shouldThrow();
323                  } catch (InterruptedException success) {}
324              }});
325  
356        Thread.sleep(SMALL_DELAY_MS);
357        t.interrupt();
326          awaitTermination(t, MEDIUM_DELAY_MS);
327          checkEmpty(q);
328      }
# Line 406 | Line 374 | public class LinkedTransferQueueTest ext
374      }
375  
376      /**
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    /**
377       * An add following remove(x) succeeds
378       */
379      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 512 | Line 465 | public class LinkedTransferQueueTest ext
465      }
466  
467      /**
468 <     * toArray() contains all elements
468 >     * toArray() contains all elements in FIFO order
469       */
470 <    public void testToArray() throws InterruptedException {
470 >    public void testToArray() {
471          LinkedTransferQueue q = populatedQueue(SIZE);
472          Object[] o = q.toArray();
473          for (int i = 0; i < o.length; i++) {
474 <            assertEquals(o[i], q.take());
474 >            assertSame(o[i], q.poll());
475          }
476      }
477  
478      /**
479 <     * toArray(a) contains all elements
479 >     * toArray(a) contains all elements in FIFO order
480       */
481 <    public void testToArray2() throws InterruptedException {
481 >    public void testToArray2() {
482          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
483          Integer[] ints = new Integer[SIZE];
484 <        ints = q.toArray(ints);
484 >        Integer[] array = q.toArray(ints);
485 >        assertSame(ints, array);
486          for (int i = 0; i < ints.length; i++) {
487 <            assertEquals(ints[i], q.take());
487 >            assertSame(ints[i], q.poll());
488          }
489      }
490  
491      /**
492 <     * 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
492 >     * toArray(incompatible array type) throws ArrayStoreException
493       */
494      public void testToArray1_BadArg() {
495          LinkedTransferQueue q = populatedQueue(SIZE);
496          try {
497 <            Object o[] = q.toArray(new String[10]);
497 >            q.toArray(new String[10]);
498              shouldThrow();
499          } catch (ArrayStoreException success) {}
500      }
# Line 562 | Line 505 | public class LinkedTransferQueueTest ext
505      public void testIterator() throws InterruptedException {
506          LinkedTransferQueue q = populatedQueue(SIZE);
507          Iterator it = q.iterator();
508 <        int i = 0;
509 <        while (it.hasNext()) {
510 <            assertEquals(it.next(), i++);
568 <        }
508 >        int i;
509 >        for (i = 0; it.hasNext(); i++)
510 >            assertTrue(q.contains(it.next()));
511          assertEquals(i, SIZE);
512 +        assertIteratorExhausted(it);
513 +
514 +        it = q.iterator();
515 +        for (i = 0; it.hasNext(); i++)
516 +            assertEquals(it.next(), q.take());
517 +        assertEquals(i, SIZE);
518 +        assertIteratorExhausted(it);
519 +    }
520 +
521 +    /**
522 +     * iterator of empty collection has no elements
523 +     */
524 +    public void testEmptyIterator() {
525 +        assertIteratorExhausted(new LinkedTransferQueue().iterator());
526      }
527  
528      /**
# Line 628 | Line 584 | public class LinkedTransferQueueTest ext
584          LinkedTransferQueue q = populatedQueue(SIZE);
585          String s = q.toString();
586          for (int i = 0; i < SIZE; ++i) {
587 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
587 >            assertTrue(s.contains(String.valueOf(i)));
588          }
589      }
590  
# Line 637 | Line 593 | public class LinkedTransferQueueTest ext
593       */
594      public void testOfferInExecutor() {
595          final LinkedTransferQueue q = new LinkedTransferQueue();
596 <        q.add(one);
597 <        q.add(two);
598 <        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 <            }});
596 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
597 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
598 >        try (PoolCleaner cleaner = cleaner(executor)) {
599  
600 <        executor.execute(new CheckedRunnable() {
601 <            public void realRun() throws InterruptedException {
602 <                Thread.sleep(SMALL_DELAY_MS);
603 <                assertSame(one, q.take());
604 <            }});
600 >            executor.execute(new CheckedRunnable() {
601 >                public void realRun() throws InterruptedException {
602 >                    threadsStarted.await();
603 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
604 >                }});
605  
606 <        joinPool(executor);
606 >            executor.execute(new CheckedRunnable() {
607 >                public void realRun() throws InterruptedException {
608 >                    threadsStarted.await();
609 >                    assertSame(one, q.take());
610 >                    checkEmpty(q);
611 >                }});
612 >        }
613      }
614  
615      /**
# Line 660 | Line 617 | public class LinkedTransferQueueTest ext
617       */
618      public void testPollInExecutor() {
619          final LinkedTransferQueue q = new LinkedTransferQueue();
620 <        ExecutorService executor = Executors.newFixedThreadPool(2);
620 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
621 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
622 >        try (PoolCleaner cleaner = cleaner(executor)) {
623  
624 <        executor.execute(new CheckedRunnable() {
625 <            public void realRun() throws InterruptedException {
626 <                assertNull(q.poll());
627 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
628 <                assertTrue(q.isEmpty());
629 <            }});
630 <
672 <        executor.execute(new CheckedRunnable() {
673 <            public void realRun() throws InterruptedException {
674 <                Thread.sleep(SMALL_DELAY_MS);
675 <                q.put(one);
676 <            }});
624 >            executor.execute(new CheckedRunnable() {
625 >                public void realRun() throws InterruptedException {
626 >                    assertNull(q.poll());
627 >                    threadsStarted.await();
628 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
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);
767 <        }
696 >        for (int i = 0; i < SIZE; ++i)
697 >            assertEquals(i, l.get(i));
698          awaitTermination(t, MEDIUM_DELAY_MS);
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);
830 <                assertTrue(q.offer(one));
734 >                threadStarted.countDown();
735 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
736 >                assertEquals(0, q.getWaitingConsumerCount());
737                  assertFalse(q.hasWaitingConsumer());
832                assertEquals(q.getWaitingConsumerCount(), 0);
738              }});
739  
740 <        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
741 <        assertEquals(q.getWaitingConsumerCount(), 0);
740 >        threadStarted.await();
741 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
742 >        assertEquals(1, q.getWaitingConsumerCount());
743 >        assertTrue(q.hasWaitingConsumer());
744 >
745 >        assertTrue(q.offer(one));
746 >        assertEquals(0, q.getWaitingConsumerCount());
747          assertFalse(q.hasWaitingConsumer());
748 +
749          awaitTermination(t, MEDIUM_DELAY_MS);
750      }
751  
# Line 856 | Line 767 | public class LinkedTransferQueueTest ext
767      public void testTransfer2() throws InterruptedException {
768          final LinkedTransferQueue<Integer> q
769              = new LinkedTransferQueue<Integer>();
770 +        final CountDownLatch threadStarted = new CountDownLatch(1);
771  
772          Thread t = newStartedThread(new CheckedRunnable() {
773              public void realRun() throws InterruptedException {
774 <                q.transfer(SIZE);
775 <                assertTrue(q.isEmpty());
774 >                threadStarted.countDown();
775 >                q.transfer(five);
776 >                checkEmpty(q);
777              }});
778  
779 <        Thread.sleep(SHORT_DELAY_MS);
779 >        threadStarted.await();
780 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
781          assertEquals(1, q.size());
782 <        assertEquals(SIZE, (int) q.poll());
783 <        assertTrue(q.isEmpty());
782 >        assertSame(five, q.poll());
783 >        checkEmpty(q);
784          awaitTermination(t, MEDIUM_DELAY_MS);
785      }
786  
# Line 879 | Line 793 | public class LinkedTransferQueueTest ext
793  
794          Thread first = newStartedThread(new CheckedRunnable() {
795              public void realRun() throws InterruptedException {
796 <                Integer i = SIZE + 1;
797 <                q.transfer(i);
884 <                assertTrue(!q.contains(i));
796 >                q.transfer(four);
797 >                assertTrue(!q.contains(four));
798                  assertEquals(1, q.size());
799              }});
800  
801          Thread interruptedThread = newStartedThread(
802              new CheckedInterruptedRunnable() {
803                  public void realRun() throws InterruptedException {
804 <                    while (q.size() == 0)
804 >                    while (q.isEmpty())
805                          Thread.yield();
806 <                    q.transfer(SIZE);
806 >                    q.transfer(five);
807                  }});
808  
809          while (q.size() < 2)
810              Thread.yield();
811          assertEquals(2, q.size());
812 <        assertEquals(SIZE + 1, (int) q.poll());
812 >        assertSame(four, q.poll());
813          first.join();
814          assertEquals(1, q.size());
815          interruptedThread.interrupt();
816          interruptedThread.join();
817 <        assertEquals(0, q.size());
905 <        assertTrue(q.isEmpty());
817 >        checkEmpty(q);
818      }
819  
820      /**
# Line 919 | Line 831 | public class LinkedTransferQueueTest ext
831                  assertSame(three, q.poll());
832              }});
833  
834 <        Thread.sleep(SHORT_DELAY_MS);
834 >        while (q.isEmpty())
835 >            Thread.yield();
836 >        assertFalse(q.isEmpty());
837 >        assertEquals(1, q.size());
838          assertTrue(q.offer(three));
839          assertSame(four, q.poll());
840          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 935 | Line 850 | public class LinkedTransferQueueTest ext
850  
851          Thread t = newStartedThread(new CheckedRunnable() {
852              public void realRun() throws InterruptedException {
853 <                q.transfer(SIZE);
853 >                q.transfer(four);
854                  checkEmpty(q);
855              }});
856  
857 <        Thread.sleep(SHORT_DELAY_MS);
858 <        assertEquals(SIZE, (int) q.take());
857 >        while (q.isEmpty())
858 >            Thread.yield();
859 >        assertFalse(q.isEmpty());
860 >        assertEquals(1, q.size());
861 >        assertSame(four, q.take());
862          checkEmpty(q);
863          awaitTermination(t, MEDIUM_DELAY_MS);
864      }
# Line 949 | Line 867 | public class LinkedTransferQueueTest ext
867       * tryTransfer(null) throws NullPointerException
868       */
869      public void testTryTransfer1() {
870 +        final LinkedTransferQueue q = new LinkedTransferQueue();
871          try {
953            final LinkedTransferQueue q = new LinkedTransferQueue();
872              q.tryTransfer(null);
873              shouldThrow();
874          } catch (NullPointerException success) {}
# Line 980 | Line 898 | public class LinkedTransferQueueTest ext
898                  while (! q.hasWaitingConsumer())
899                      Thread.yield();
900                  assertTrue(q.hasWaitingConsumer());
901 <                assertTrue(q.isEmpty());
984 <                assertEquals(q.size(), 0);
901 >                checkEmpty(q);
902                  assertTrue(q.tryTransfer(hotPotato));
903              }});
904  
# Line 1003 | Line 920 | public class LinkedTransferQueueTest ext
920                  while (! q.hasWaitingConsumer())
921                      Thread.yield();
922                  assertTrue(q.hasWaitingConsumer());
923 <                assertTrue(q.isEmpty());
1007 <                assertEquals(q.size(), 0);
923 >                checkEmpty(q);
924                  assertTrue(q.tryTransfer(hotPotato));
925              }});
926  
# Line 1014 | Line 930 | public class LinkedTransferQueueTest ext
930      }
931  
932      /**
933 <     * tryTransfer waits the amount given if interrupted, and
1018 <     * throws interrupted exception
933 >     * tryTransfer blocks interruptibly if no takers
934       */
935      public void testTryTransfer5() throws InterruptedException {
936          final LinkedTransferQueue q = new LinkedTransferQueue();
937 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
938 +        assertTrue(q.isEmpty());
939  
940 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
940 >        Thread t = newStartedThread(new CheckedRunnable() {
941              public void realRun() throws InterruptedException {
942 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
942 >                Thread.currentThread().interrupt();
943 >                try {
944 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
945 >                    shouldThrow();
946 >                } catch (InterruptedException success) {}
947 >                assertFalse(Thread.interrupted());
948 >
949 >                pleaseInterrupt.countDown();
950 >                try {
951 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
952 >                    shouldThrow();
953 >                } catch (InterruptedException success) {}
954 >                assertFalse(Thread.interrupted());
955              }});
956  
957 <        Thread.sleep(SMALL_DELAY_MS);
958 <        toInterrupt.interrupt();
959 <        toInterrupt.join();
957 >        await(pleaseInterrupt);
958 >        assertThreadStaysAlive(t);
959 >        t.interrupt();
960 >        awaitTermination(t);
961 >        checkEmpty(q);
962      }
963  
964      /**
965 <     * tryTransfer gives up after the timeout and return false
965 >     * tryTransfer gives up after the timeout and returns false
966       */
967      public void testTryTransfer6() throws InterruptedException {
968          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 1040 | Line 971 | public class LinkedTransferQueueTest ext
971              public void realRun() throws InterruptedException {
972                  long t0 = System.nanoTime();
973                  assertFalse(q.tryTransfer(new Object(),
974 <                                          SHORT_DELAY_MS, MILLISECONDS));
975 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
974 >                                          timeoutMillis(), MILLISECONDS));
975 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
976 >                checkEmpty(q);
977              }});
978  
979 <        checkEmpty(q);
1048 <        awaitTermination(t, MEDIUM_DELAY_MS);
979 >        awaitTermination(t);
980          checkEmpty(q);
981      }
982  
# Line 1060 | Line 991 | public class LinkedTransferQueueTest ext
991          Thread t = newStartedThread(new CheckedRunnable() {
992              public void realRun() throws InterruptedException {
993                  assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
994 <                assertTrue(q.isEmpty());
994 >                checkEmpty(q);
995              }});
996  
997 <        Thread.sleep(SHORT_DELAY_MS);
997 >        while (q.size() != 2)
998 >            Thread.yield();
999          assertEquals(2, q.size());
1000          assertSame(four, q.poll());
1001          assertSame(five, q.poll());
# Line 1072 | Line 1004 | public class LinkedTransferQueueTest ext
1004      }
1005  
1006      /**
1007 <     * tryTransfer attempts to enqueue into the q and fails returning
1008 <     * false not enqueueing and the successive poll is null
1007 >     * tryTransfer attempts to enqueue into the queue and fails
1008 >     * returning false not enqueueing and the successive poll is null
1009       */
1010      public void testTryTransfer8() throws InterruptedException {
1011          final LinkedTransferQueue q = new LinkedTransferQueue();
1012          assertTrue(q.offer(four));
1013          assertEquals(1, q.size());
1014 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1014 >        long t0 = System.nanoTime();
1015 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1016 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1017          assertEquals(1, q.size());
1018          assertSame(four, q.poll());
1019          assertNull(q.poll());
# Line 1088 | Line 1022 | public class LinkedTransferQueueTest ext
1022  
1023      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1024          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1025 <        assertTrue(q.isEmpty());
1025 >        checkEmpty(q);
1026          for (int i = 0; i < n; i++) {
1027              assertEquals(i, q.size());
1028              assertTrue(q.offer(i));
# Line 1097 | Line 1031 | public class LinkedTransferQueueTest ext
1031          assertFalse(q.isEmpty());
1032          return q;
1033      }
1034 +
1035 +    /**
1036 +     * remove(null), contains(null) always return false
1037 +     */
1038 +    public void testNeverContainsNull() {
1039 +        Collection<?>[] qs = {
1040 +            new LinkedTransferQueue<Object>(),
1041 +            populatedQueue(2),
1042 +        };
1043 +
1044 +        for (Collection<?> q : qs) {
1045 +            assertFalse(q.contains(null));
1046 +            assertFalse(q.remove(null));
1047 +        }
1048 +    }
1049   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines