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.12 by jsr166, Sat Aug 15 00:35:01 2009 UTC vs.
Revision 1.55 by jsr166, Wed Dec 31 19:05:43 2014 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11   import java.util.Arrays;
12 < import java.util.ConcurrentModificationException;
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;
23 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 <    }
35 <
36 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
37 <        assertTrue(q.isEmpty());
38 <        assertEquals(0, q.size());
39 <        assertNull(q.peek());
40 <        assertNull(q.poll());
41 <        assertNull(q.poll(0, MILLISECONDS));
42 <        assertEquals(q.toString(), "[]");
43 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
44 <        assertFalse(q.iterator().hasNext());
45 <        try {
46 <            q.element();
47 <            shouldThrow();
48 <        } catch (NoSuchElementException success) {
49 <        }
50 <        try {
51 <            q.iterator().next();
52 <            shouldThrow();
53 <        } catch (NoSuchElementException success) {
54 <        }
55 <        try {
56 <            q.remove();
57 <            shouldThrow();
58 <        } catch (NoSuchElementException success) {
59 <        }
39 >        return newTestSuite(LinkedTransferQueueTest.class,
40 >                            new Generic().testSuite());
41      }
42  
43      /**
# Line 76 | Line 57 | public class LinkedTransferQueueTest ext
57          try {
58              new LinkedTransferQueue(null);
59              shouldThrow();
60 <        } catch (NullPointerException success) {
80 <        }
60 >        } catch (NullPointerException success) {}
61      }
62  
63      /**
# Line 85 | 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];
90 <            new LinkedTransferQueue(Arrays.asList(ints));
70 >            new LinkedTransferQueue(elements);
71              shouldThrow();
72 <        } catch (NullPointerException success) {
93 <        }
72 >        } catch (NullPointerException success) {}
73      }
74  
75      /**
# Line 98 | 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];
103 <            for (int i = 0; i < SIZE - 1; ++i) {
104 <                ints[i] = i;
105 <            }
106 <            new LinkedTransferQueue(Arrays.asList(ints));
85 >            new LinkedTransferQueue(elements);
86              shouldThrow();
87 <        } catch (NullPointerException success) {
109 <        }
87 >        } catch (NullPointerException success) {}
88      }
89  
90      /**
# Line 151 | Line 129 | public class LinkedTransferQueueTest ext
129      }
130  
131      /**
154     * offer(null) throws NullPointerException
155     */
156    public void testOfferNull() {
157        try {
158            LinkedTransferQueue q = new LinkedTransferQueue();
159            q.offer(null);
160            shouldThrow();
161        } catch (NullPointerException success) {
162        }
163    }
164
165    /**
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    /**
178     * addAll(null) throws NullPointerException
179     */
180    public void testAddAll1() {
181        try {
182            LinkedTransferQueue q = new LinkedTransferQueue();
183            q.addAll(null);
184            shouldThrow();
185        } catch (NullPointerException success) {
186        }
187    }
188
189    /**
132       * addAll(this) throws IllegalArgumentException
133       */
134      public void testAddAllSelf() {
# Line 194 | Line 136 | public class LinkedTransferQueueTest ext
136              LinkedTransferQueue q = populatedQueue(SIZE);
137              q.addAll(q);
138              shouldThrow();
139 <        } catch (IllegalArgumentException success) {
198 <        }
199 <    }
200 <
201 <    /**
202 <     * addAll of a collection with null elements throws NullPointerException
203 <     */
204 <    public void testAddAll2() {
205 <        try {
206 <            LinkedTransferQueue q = new LinkedTransferQueue();
207 <            Integer[] ints = new Integer[SIZE];
208 <            q.addAll(Arrays.asList(ints));
209 <            shouldThrow();
210 <        } catch (NullPointerException success) {
211 <        }
139 >        } catch (IllegalArgumentException success) {}
140      }
141  
142      /**
# Line 224 | Line 152 | public class LinkedTransferQueueTest ext
152              }
153              q.addAll(Arrays.asList(ints));
154              shouldThrow();
155 <        } catch (NullPointerException success) {
228 <        }
155 >        } catch (NullPointerException success) {}
156      }
157  
158      /**
# Line 246 | Line 173 | public class LinkedTransferQueueTest ext
173      }
174  
175      /**
249     * put(null) throws NullPointerException
250     */
251    public void testPutNull() throws InterruptedException {
252        try {
253            LinkedTransferQueue q = new LinkedTransferQueue();
254            q.put(null);
255            shouldThrow();
256        } catch (NullPointerException success) {}
257    }
258
259    /**
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 279 | Line 195 | public class LinkedTransferQueueTest ext
195      }
196  
197      /**
198 <     * take blocks interruptibly when empty
283 <     */
284 <    public void testTakeFromEmpty() throws InterruptedException {
285 <        final LinkedTransferQueue q = new LinkedTransferQueue();
286 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
287 <            void realRun() throws InterruptedException {
288 <                q.take();
289 <            }});
290 <        Thread.sleep(SHORT_DELAY_MS);
291 <        t.interrupt();
292 <        t.join();
293 <    }
294 <
295 <    /**
296 <     * 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 = newStartedThread(new CheckedInterruptedRunnable() {
203 <            void realRun() throws InterruptedException {
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 <                    threadAssertEquals(i, (int) q.take());
206 >                    assertEquals(i, q.take());
207                  }
208 <                q.take();
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 <        Thread.sleep(SMALL_DELAY_MS);
223 >
224 >        await(pleaseInterrupt);
225 >        assertThreadStaysAlive(t);
226          t.interrupt();
227 <        t.join();
310 <        checkEmpty(q);
227 >        awaitTermination(t);
228      }
229  
230      /**
# Line 323 | Line 240 | public class LinkedTransferQueueTest ext
240      }
241  
242      /**
243 <     * timed pool with zero timeout succeeds when non-empty, else times out
243 >     * timed poll with zero timeout succeeds when non-empty, else times out
244       */
245      public void testTimedPoll0() throws InterruptedException {
246          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 335 | Line 252 | public class LinkedTransferQueueTest ext
252      }
253  
254      /**
255 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
255 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
256       */
257      public void testTimedPoll() throws InterruptedException {
258          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            long t0 = System.nanoTime();
260 >            long startTime = System.nanoTime();
261              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
262 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
346 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
262 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
263          }
264 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
264 >        long startTime = System.nanoTime();
265 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
266 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
267          checkEmpty(q);
268      }
269  
# Line 354 | Line 272 | public class LinkedTransferQueueTest ext
272       * returning timeout status
273       */
274      public void testInterruptedTimedPoll() throws InterruptedException {
275 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
276 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
277 <            void realRun() throws InterruptedException {
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));
283 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
284 <                    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(MEDIUM_DELAY_MS, MILLISECONDS);
288 >                    shouldThrow();
289 >                } catch (InterruptedException success) {
290 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
291                  }
367                q.poll(LONG_DELAY_MS, MILLISECONDS);
292              }});
293 <        Thread.sleep(SMALL_DELAY_MS);
293 >
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 = newStartedThread(new CheckedInterruptedRunnable() {
308 <            void realRun() throws InterruptedException {
309 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
310 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
311 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
305 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
306 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
307 >        Thread t = newStartedThread(new CheckedRunnable() {
308 >            public void realRun() throws InterruptedException {
309 >                Thread.currentThread().interrupt();
310 >                for (int i = 0; i < SIZE; ++i) {
311 >                    long t0 = System.nanoTime();
312 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
313 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
314 >                }
315 >                try {
316 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
317 >                    shouldThrow();
318 >                } catch (InterruptedException success) {}
319              }});
320 <        Thread.sleep(SMALL_DELAY_MS);
321 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
322 <        t.interrupt();
390 <        t.join();
320 >
321 >        awaitTermination(t, MEDIUM_DELAY_MS);
322 >        checkEmpty(q);
323      }
324  
325      /**
# Line 417 | Line 349 | public class LinkedTransferQueueTest ext
349          try {
350              q.element();
351              shouldThrow();
352 <        } catch (NoSuchElementException success) {
421 <        }
352 >        } catch (NoSuchElementException success) {}
353          checkEmpty(q);
354      }
355  
# Line 433 | Line 364 | public class LinkedTransferQueueTest ext
364          try {
365              q.remove();
366              shouldThrow();
367 <        } catch (NoSuchElementException success) {
437 <        }
438 <        checkEmpty(q);
439 <    }
440 <
441 <    /**
442 <     * remove(x) removes x and returns true if present
443 <     */
444 <    public void testRemoveElement() throws InterruptedException {
445 <        LinkedTransferQueue q = populatedQueue(SIZE);
446 <        for (int i = 1; i < SIZE; i += 2) {
447 <            assertTrue(q.remove(i));
448 <        }
449 <        for (int i = 0; i < SIZE; i += 2) {
450 <            assertTrue(q.remove(i));
451 <            assertFalse(q.remove(i + 1));
452 <        }
367 >        } catch (NoSuchElementException success) {}
368          checkEmpty(q);
369      }
370  
# Line 463 | 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 545 | 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
572 <     */
573 <    public void testToArray_BadArg() {
574 <        try {
575 <            LinkedTransferQueue q = populatedQueue(SIZE);
576 <            Object o[] = q.toArray(null);
577 <            shouldThrow();
578 <        } catch (NullPointerException success) {
579 <        }
580 <    }
581 <
582 <    /**
583 <     * toArray with 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 <            LinkedTransferQueue q = populatedQueue(SIZE);
588 <            Object o[] = q.toArray(new String[10]);
492 >            q.toArray(new String[10]);
493              shouldThrow();
494 <        } catch (ArrayStoreException success) {
591 <        }
494 >        } catch (ArrayStoreException success) {}
495      }
496  
497      /**
# Line 618 | Line 521 | public class LinkedTransferQueueTest ext
521          it.remove();
522  
523          it = q.iterator();
524 <        assertEquals(it.next(), one);
525 <        assertEquals(it.next(), three);
524 >        assertSame(it.next(), one);
525 >        assertSame(it.next(), three);
526          assertFalse(it.hasNext());
527      }
528  
# Line 663 | Line 566 | public class LinkedTransferQueueTest ext
566          LinkedTransferQueue q = populatedQueue(SIZE);
567          String s = q.toString();
568          for (int i = 0; i < SIZE; ++i) {
569 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
569 >            assertTrue(s.contains(String.valueOf(i)));
570          }
571      }
572  
# Line 672 | Line 575 | public class LinkedTransferQueueTest ext
575       */
576      public void testOfferInExecutor() {
577          final LinkedTransferQueue q = new LinkedTransferQueue();
578 <        q.add(one);
676 <        q.add(two);
578 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
579          ExecutorService executor = Executors.newFixedThreadPool(2);
580  
581          executor.execute(new CheckedRunnable() {
582 <            void realRun() {
583 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
584 <                                         MILLISECONDS));
582 >            public void realRun() throws InterruptedException {
583 >                threadsStarted.await();
584 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
585              }});
586  
587          executor.execute(new CheckedRunnable() {
588 <            void realRun() throws InterruptedException {
589 <                Thread.sleep(SMALL_DELAY_MS);
590 <                threadAssertEquals(one, q.take());
588 >            public void realRun() throws InterruptedException {
589 >                threadsStarted.await();
590 >                assertSame(one, q.take());
591 >                checkEmpty(q);
592              }});
593  
594          joinPool(executor);
595      }
596  
597      /**
598 <     * poll retrieves elements across Executor threads
598 >     * timed poll retrieves elements across Executor threads
599       */
600      public void testPollInExecutor() {
601          final LinkedTransferQueue q = new LinkedTransferQueue();
602 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
603          ExecutorService executor = Executors.newFixedThreadPool(2);
604  
605          executor.execute(new CheckedRunnable() {
606 <            void realRun() throws InterruptedException {
607 <                threadAssertNull(q.poll());
608 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
609 <                                                MILLISECONDS));
610 <                threadAssertTrue(q.isEmpty());
606 >            public void realRun() throws InterruptedException {
607 >                assertNull(q.poll());
608 >                threadsStarted.await();
609 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
610 >                checkEmpty(q);
611              }});
612  
613          executor.execute(new CheckedRunnable() {
614 <            void realRun() throws InterruptedException {
615 <                Thread.sleep(SMALL_DELAY_MS);
614 >            public void realRun() throws InterruptedException {
615 >                threadsStarted.await();
616                  q.put(one);
617              }});
618  
# Line 719 | Line 623 | public class LinkedTransferQueueTest ext
623       * A deserialized serialized queue has same elements in same order
624       */
625      public void testSerialization() throws Exception {
626 <        LinkedTransferQueue q = populatedQueue(SIZE);
627 <
724 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
725 <        ObjectOutputStream out
726 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
727 <        out.writeObject(q);
728 <        out.close();
729 <
730 <        ByteArrayInputStream bin
731 <            = new ByteArrayInputStream(bout.toByteArray());
732 <        ObjectInputStream in
733 <            = new ObjectInputStream(new BufferedInputStream(bin));
734 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
626 >        Queue x = populatedQueue(SIZE);
627 >        Queue y = serialClone(x);
628  
629 <        assertEquals(q.size(), r.size());
630 <        while (!q.isEmpty()) {
631 <            assertEquals(q.remove(), r.remove());
632 <        }
633 <    }
634 <
635 <    /**
743 <     * drainTo(null) throws NullPointerException
744 <     */
745 <    public void testDrainToNull() {
746 <        LinkedTransferQueue q = populatedQueue(SIZE);
747 <        try {
748 <            q.drainTo(null);
749 <            shouldThrow();
750 <        } catch (NullPointerException success) {
751 <        }
752 <    }
753 <
754 <    /**
755 <     * drainTo(this) throws IllegalArgumentException
756 <     */
757 <    public void testDrainToSelf() {
758 <        LinkedTransferQueue q = populatedQueue(SIZE);
759 <        try {
760 <            q.drainTo(q);
761 <            shouldThrow();
762 <        } catch (IllegalArgumentException success) {
629 >        assertNotSame(y, x);
630 >        assertEquals(x.size(), y.size());
631 >        assertEquals(x.toString(), y.toString());
632 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
633 >        while (!x.isEmpty()) {
634 >            assertFalse(y.isEmpty());
635 >            assertEquals(x.remove(), y.remove());
636          }
637 +        assertTrue(y.isEmpty());
638      }
639  
640      /**
# Line 770 | Line 644 | public class LinkedTransferQueueTest ext
644          LinkedTransferQueue q = populatedQueue(SIZE);
645          ArrayList l = new ArrayList();
646          q.drainTo(l);
647 <        assertEquals(q.size(), 0);
648 <        assertEquals(l.size(), SIZE);
647 >        assertEquals(0, q.size());
648 >        assertEquals(SIZE, l.size());
649          for (int i = 0; i < SIZE; ++i) {
650 <            assertEquals(l.get(i), i);
650 >            assertEquals(i, l.get(i));
651          }
652          q.add(zero);
653          q.add(one);
# Line 782 | Line 656 | public class LinkedTransferQueueTest ext
656          assertTrue(q.contains(one));
657          l.clear();
658          q.drainTo(l);
659 <        assertEquals(q.size(), 0);
660 <        assertEquals(l.size(), 2);
659 >        assertEquals(0, q.size());
660 >        assertEquals(2, l.size());
661          for (int i = 0; i < 2; ++i) {
662 <            assertEquals(l.get(i), i);
662 >            assertEquals(i, l.get(i));
663          }
664      }
665  
666      /**
667 <     * drainTo empties full queue, unblocking a waiting put.
667 >     * drainTo(c) empties full queue, unblocking a waiting put.
668       */
669      public void testDrainToWithActivePut() throws InterruptedException {
670          final LinkedTransferQueue q = populatedQueue(SIZE);
671          Thread t = newStartedThread(new CheckedRunnable() {
672 <            void realRun() {
672 >            public void realRun() {
673                  q.put(SIZE + 1);
674              }});
675          ArrayList l = new ArrayList();
676          q.drainTo(l);
677          assertTrue(l.size() >= SIZE);
678 <        for (int i = 0; i < SIZE; ++i) {
679 <            assertEquals(l.get(i), i);
680 <        }
807 <        t.join();
678 >        for (int i = 0; i < SIZE; ++i)
679 >            assertEquals(i, l.get(i));
680 >        awaitTermination(t, MEDIUM_DELAY_MS);
681          assertTrue(q.size() + l.size() >= SIZE);
682      }
683  
684      /**
685 <     * drainTo(null, n) throws NullPointerException
813 <     */
814 <    public void testDrainToNullN() {
815 <        LinkedTransferQueue q = populatedQueue(SIZE);
816 <        try {
817 <            q.drainTo(null, SIZE);
818 <            shouldThrow();
819 <        } catch (NullPointerException success) {
820 <        }
821 <    }
822 <
823 <    /**
824 <     * drainTo(this, n) throws IllegalArgumentException
825 <     */
826 <    public void testDrainToSelfN() {
827 <        LinkedTransferQueue q = populatedQueue(SIZE);
828 <        try {
829 <            q.drainTo(q, SIZE);
830 <            shouldThrow();
831 <        } catch (IllegalArgumentException success) {
832 <        }
833 <    }
834 <
835 <    /**
836 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
685 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
688          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 844 | Line 693 | public class LinkedTransferQueueTest ext
693              ArrayList l = new ArrayList();
694              q.drainTo(l, i);
695              int k = (i < SIZE) ? i : SIZE;
696 <            assertEquals(l.size(), k);
697 <            assertEquals(q.size(), SIZE - k);
698 <            for (int j = 0; j < k; ++j) {
699 <                assertEquals(l.get(j), j);
851 <            }
696 >            assertEquals(k, l.size());
697 >            assertEquals(SIZE - k, q.size());
698 >            for (int j = 0; j < k; ++j)
699 >                assertEquals(j, l.get(j));
700              while (q.poll() != null)
701                  ;
702          }
703      }
704  
705      /**
706 <     * poll and take decrement the waiting consumer count
706 >     * timed poll() or take() increments the waiting consumer count;
707 >     * offer(e) decrements the waiting consumer count
708       */
709      public void testWaitingConsumer() throws InterruptedException {
710          final LinkedTransferQueue q = new LinkedTransferQueue();
711 <        final ConsumerObserver waiting = new ConsumerObserver();
711 >        assertEquals(0, q.getWaitingConsumerCount());
712 >        assertFalse(q.hasWaitingConsumer());
713 >        final CountDownLatch threadStarted = new CountDownLatch(1);
714  
715          Thread t = newStartedThread(new CheckedRunnable() {
716 <            void realRun() throws InterruptedException {
717 <                Thread.sleep(SMALL_DELAY_MS);
718 <                threadAssertTrue(q.hasWaitingConsumer());
719 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
720 <                threadAssertTrue(q.offer(new Object()));
716 >            public void realRun() throws InterruptedException {
717 >                threadStarted.countDown();
718 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
719 >                assertEquals(0, q.getWaitingConsumerCount());
720 >                assertFalse(q.hasWaitingConsumer());
721              }});
722  
723 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
724 <        assertTrue(q.getWaitingConsumerCount()
725 <                   < waiting.getWaitingConsumers());
726 <        t.join();
723 >        threadStarted.await();
724 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
725 >        assertEquals(1, q.getWaitingConsumerCount());
726 >        assertTrue(q.hasWaitingConsumer());
727 >
728 >        assertTrue(q.offer(one));
729 >        assertEquals(0, q.getWaitingConsumerCount());
730 >        assertFalse(q.hasWaitingConsumer());
731 >
732 >        awaitTermination(t, MEDIUM_DELAY_MS);
733      }
734  
735      /**
# Line 883 | Line 740 | public class LinkedTransferQueueTest ext
740              LinkedTransferQueue q = new LinkedTransferQueue();
741              q.transfer(null);
742              shouldThrow();
743 <        } catch (NullPointerException ex) {
887 <        }
743 >        } catch (NullPointerException success) {}
744      }
745  
746      /**
# Line 894 | Line 750 | public class LinkedTransferQueueTest ext
750      public void testTransfer2() throws InterruptedException {
751          final LinkedTransferQueue<Integer> q
752              = new LinkedTransferQueue<Integer>();
753 +        final CountDownLatch threadStarted = new CountDownLatch(1);
754  
755          Thread t = newStartedThread(new CheckedRunnable() {
756 <            void realRun() throws InterruptedException {
757 <                q.transfer(SIZE);
758 <                threadAssertTrue(q.isEmpty());
756 >            public void realRun() throws InterruptedException {
757 >                threadStarted.countDown();
758 >                q.transfer(five);
759 >                checkEmpty(q);
760              }});
761  
762 <        Thread.sleep(SHORT_DELAY_MS);
762 >        threadStarted.await();
763 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
764          assertEquals(1, q.size());
765 <        assertEquals(SIZE, (int) q.poll());
766 <        assertTrue(q.isEmpty());
767 <        t.join();
765 >        assertSame(five, q.poll());
766 >        checkEmpty(q);
767 >        awaitTermination(t, MEDIUM_DELAY_MS);
768      }
769  
770      /**
# Line 916 | Line 775 | public class LinkedTransferQueueTest ext
775              = new LinkedTransferQueue<Integer>();
776  
777          Thread first = newStartedThread(new CheckedRunnable() {
778 <            void realRun() throws InterruptedException {
779 <                Integer i = SIZE + 1;
780 <                q.transfer(i);
781 <                threadAssertTrue(!q.contains(i));
923 <                threadAssertEquals(1, q.size());
778 >            public void realRun() throws InterruptedException {
779 >                q.transfer(four);
780 >                assertTrue(!q.contains(four));
781 >                assertEquals(1, q.size());
782              }});
783  
784          Thread interruptedThread = newStartedThread(
785              new CheckedInterruptedRunnable() {
786 <                void realRun() throws InterruptedException {
787 <                    while (q.size() == 0)
786 >                public void realRun() throws InterruptedException {
787 >                    while (q.isEmpty())
788                          Thread.yield();
789 <                    q.transfer(SIZE);
789 >                    q.transfer(five);
790                  }});
791  
792          while (q.size() < 2)
793              Thread.yield();
794          assertEquals(2, q.size());
795 <        assertEquals(SIZE + 1, (int) q.poll());
795 >        assertSame(four, q.poll());
796          first.join();
797          assertEquals(1, q.size());
798          interruptedThread.interrupt();
799          interruptedThread.join();
800 <        assertEquals(0, q.size());
943 <        assertTrue(q.isEmpty());
800 >        checkEmpty(q);
801      }
802  
803      /**
# Line 951 | Line 808 | public class LinkedTransferQueueTest ext
808          final LinkedTransferQueue q = new LinkedTransferQueue();
809  
810          Thread t = newStartedThread(new CheckedRunnable() {
811 <            void realRun() throws InterruptedException {
811 >            public void realRun() throws InterruptedException {
812                  q.transfer(four);
813 <                threadAssertFalse(q.contains(four));
814 <                threadAssertEquals(three, q.poll());
813 >                assertFalse(q.contains(four));
814 >                assertSame(three, q.poll());
815              }});
816  
817 <        Thread.sleep(SHORT_DELAY_MS);
817 >        while (q.isEmpty())
818 >            Thread.yield();
819 >        assertFalse(q.isEmpty());
820 >        assertEquals(1, q.size());
821          assertTrue(q.offer(three));
822 <        assertEquals(four, q.poll());
823 <        t.join();
822 >        assertSame(four, q.poll());
823 >        awaitTermination(t, MEDIUM_DELAY_MS);
824      }
825  
826      /**
# Line 972 | Line 832 | public class LinkedTransferQueueTest ext
832              = new LinkedTransferQueue<Integer>();
833  
834          Thread t = newStartedThread(new CheckedRunnable() {
835 <            void realRun() throws InterruptedException {
836 <                q.transfer(SIZE);
835 >            public void realRun() throws InterruptedException {
836 >                q.transfer(four);
837                  checkEmpty(q);
838              }});
839  
840 <        Thread.sleep(SHORT_DELAY_MS);
841 <        assertEquals(SIZE, (int) q.take());
840 >        while (q.isEmpty())
841 >            Thread.yield();
842 >        assertFalse(q.isEmpty());
843 >        assertEquals(1, q.size());
844 >        assertSame(four, q.take());
845          checkEmpty(q);
846 <        t.join();
846 >        awaitTermination(t, MEDIUM_DELAY_MS);
847      }
848  
849      /**
# Line 991 | Line 854 | public class LinkedTransferQueueTest ext
854              final LinkedTransferQueue q = new LinkedTransferQueue();
855              q.tryTransfer(null);
856              shouldThrow();
857 <        } catch (NullPointerException ex) {
995 <        }
857 >        } catch (NullPointerException success) {}
858      }
859  
860      /**
# Line 1015 | Line 877 | public class LinkedTransferQueueTest ext
877          final LinkedTransferQueue q = new LinkedTransferQueue();
878  
879          Thread t = newStartedThread(new CheckedRunnable() {
880 <            void realRun() {
880 >            public void realRun() {
881                  while (! q.hasWaitingConsumer())
882                      Thread.yield();
883 <                threadAssertTrue(q.hasWaitingConsumer());
884 <                threadAssertTrue(q.isEmpty());
885 <                threadAssertTrue(q.size() == 0);
1024 <                threadAssertTrue(q.tryTransfer(hotPotato));
883 >                assertTrue(q.hasWaitingConsumer());
884 >                checkEmpty(q);
885 >                assertTrue(q.tryTransfer(hotPotato));
886              }});
887  
888 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
888 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
889          checkEmpty(q);
890 <        t.join();
890 >        awaitTermination(t, MEDIUM_DELAY_MS);
891      }
892  
893      /**
# Line 1038 | Line 899 | public class LinkedTransferQueueTest ext
899          final LinkedTransferQueue q = new LinkedTransferQueue();
900  
901          Thread t = newStartedThread(new CheckedRunnable() {
902 <            void realRun() {
902 >            public void realRun() {
903                  while (! q.hasWaitingConsumer())
904                      Thread.yield();
905 <                threadAssertTrue(q.hasWaitingConsumer());
906 <                threadAssertTrue(q.isEmpty());
907 <                threadAssertTrue(q.size() == 0);
1047 <                threadAssertTrue(q.tryTransfer(hotPotato));
905 >                assertTrue(q.hasWaitingConsumer());
906 >                checkEmpty(q);
907 >                assertTrue(q.tryTransfer(hotPotato));
908              }});
909  
910 <        assertTrue(q.take() == hotPotato);
910 >        assertSame(q.take(), hotPotato);
911          checkEmpty(q);
912 <        t.join();
912 >        awaitTermination(t, MEDIUM_DELAY_MS);
913      }
914  
915      /**
916 <     * tryTransfer waits the amount given if interrupted, and
1057 <     * throws interrupted exception
916 >     * tryTransfer blocks interruptibly if no takers
917       */
918      public void testTryTransfer5() throws InterruptedException {
919          final LinkedTransferQueue q = new LinkedTransferQueue();
920 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
921 +        assertTrue(q.isEmpty());
922  
923 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
924 <            void realRun() throws InterruptedException {
925 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
923 >        Thread t = newStartedThread(new CheckedRunnable() {
924 >            public void realRun() throws InterruptedException {
925 >                Thread.currentThread().interrupt();
926 >                try {
927 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
928 >                    shouldThrow();
929 >                } catch (InterruptedException success) {}
930 >                assertFalse(Thread.interrupted());
931 >
932 >                pleaseInterrupt.countDown();
933 >                try {
934 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
935 >                    shouldThrow();
936 >                } catch (InterruptedException success) {}
937 >                assertFalse(Thread.interrupted());
938              }});
939  
940 <        Thread.sleep(SMALL_DELAY_MS);
941 <        toInterrupt.interrupt();
942 <        toInterrupt.join();
940 >        await(pleaseInterrupt);
941 >        assertThreadStaysAlive(t);
942 >        t.interrupt();
943 >        awaitTermination(t);
944 >        checkEmpty(q);
945      }
946  
947      /**
948 <     * tryTransfer gives up after the timeout and return false
948 >     * tryTransfer gives up after the timeout and returns false
949       */
950      public void testTryTransfer6() throws InterruptedException {
951          final LinkedTransferQueue q = new LinkedTransferQueue();
952  
953          Thread t = newStartedThread(new CheckedRunnable() {
954 <            void realRun() throws InterruptedException {
955 <                threadAssertFalse
956 <                    (q.tryTransfer(new Object(),
957 <                                   SHORT_DELAY_MS, MILLISECONDS));
954 >            public void realRun() throws InterruptedException {
955 >                long t0 = System.nanoTime();
956 >                assertFalse(q.tryTransfer(new Object(),
957 >                                          timeoutMillis(), MILLISECONDS));
958 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
959 >                checkEmpty(q);
960              }});
961  
962 <        Thread.sleep(SMALL_DELAY_MS);
962 >        awaitTermination(t);
963          checkEmpty(q);
1087        t.join();
964      }
965  
966      /**
# Line 1096 | Line 972 | public class LinkedTransferQueueTest ext
972          assertTrue(q.offer(four));
973  
974          Thread t = newStartedThread(new CheckedRunnable() {
975 <            void realRun() throws InterruptedException {
976 <                threadAssertTrue(q.tryTransfer(five,
977 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1102 <                threadAssertTrue(q.isEmpty());
975 >            public void realRun() throws InterruptedException {
976 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
977 >                checkEmpty(q);
978              }});
979  
980 <        Thread.sleep(SHORT_DELAY_MS);
980 >        while (q.size() != 2)
981 >            Thread.yield();
982          assertEquals(2, q.size());
983 <        assertEquals(four, q.poll());
984 <        assertEquals(five, q.poll());
983 >        assertSame(four, q.poll());
984 >        assertSame(five, q.poll());
985          checkEmpty(q);
986 <        t.join();
986 >        awaitTermination(t, MEDIUM_DELAY_MS);
987      }
988  
989      /**
990 <     * tryTransfer attempts to enqueue into the q and fails returning
991 <     * false not enqueueing and the successive poll is null
990 >     * tryTransfer attempts to enqueue into the queue and fails
991 >     * returning false not enqueueing and the successive poll is null
992       */
993      public void testTryTransfer8() throws InterruptedException {
994          final LinkedTransferQueue q = new LinkedTransferQueue();
995          assertTrue(q.offer(four));
996          assertEquals(1, q.size());
997 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
997 >        long t0 = System.nanoTime();
998 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
999 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1000          assertEquals(1, q.size());
1001 <        assertEquals(four, q.poll());
1124 <        checkEmpty(q);
1001 >        assertSame(four, q.poll());
1002          assertNull(q.poll());
1003 +        checkEmpty(q);
1004      }
1005  
1006      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1007          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1008 <        assertTrue(q.isEmpty());
1008 >        checkEmpty(q);
1009          for (int i = 0; i < n; i++) {
1010              assertEquals(i, q.size());
1011              assertTrue(q.offer(i));
# Line 1137 | Line 1015 | public class LinkedTransferQueueTest ext
1015          return q;
1016      }
1017  
1018 <    private static class ConsumerObserver {
1019 <
1020 <        private int waitingConsumers;
1021 <
1022 <        private ConsumerObserver() {
1023 <        }
1024 <
1025 <        private void setWaitingConsumer(int i) {
1026 <            this.waitingConsumers = i;
1027 <        }
1028 <
1029 <        private int getWaitingConsumers() {
1152 <            return waitingConsumers;
1018 >    /**
1019 >     * remove(null), contains(null) always return false
1020 >     */
1021 >    public void testNeverContainsNull() {
1022 >        Collection<?>[] qs = {
1023 >            new LinkedTransferQueue<Object>(),
1024 >            populatedQueue(2),
1025 >        };
1026 >
1027 >        for (Collection<?> q : qs) {
1028 >            assertFalse(q.contains(null));
1029 >            assertFalse(q.remove(null));
1030          }
1031      }
1032   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines