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.15 by jsr166, Sat Nov 21 17:38:05 2009 UTC vs.
Revision 1.48 by jsr166, Tue May 31 16:16:24 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
14 < import java.util.ArrayList;
8 > import junit.framework.*;
9   import java.util.Arrays;
10 + import java.util.ArrayList;
11 + import java.util.Collection;
12   import java.util.Iterator;
13   import java.util.List;
14   import java.util.NoSuchElementException;
15 < import java.util.concurrent.*;
15 > import java.util.Queue;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.LinkedTransferQueue;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 < import junit.framework.Test;
22 < import junit.framework.TestSuite;
22 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
23  
24   @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
26  
27 +    public static class Generic extends BlockingQueueTest {
28 +        protected BlockingQueue emptyCollection() {
29 +            return new LinkedTransferQueue();
30 +        }
31 +    }
32 +
33      public static void main(String[] args) {
34          junit.textui.TestRunner.run(suite());
35      }
36  
37      public static Test suite() {
38 <        return new TestSuite(LinkedTransferQueueTest.class);
39 <    }
34 <
35 <    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
36 <        assertTrue(q.isEmpty());
37 <        assertEquals(0, q.size());
38 <        assertNull(q.peek());
39 <        assertNull(q.poll());
40 <        assertNull(q.poll(0, MILLISECONDS));
41 <        assertEquals(q.toString(), "[]");
42 <        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
43 <        assertFalse(q.iterator().hasNext());
44 <        try {
45 <            q.element();
46 <            shouldThrow();
47 <        } catch (NoSuchElementException success) {
48 <        }
49 <        try {
50 <            q.iterator().next();
51 <            shouldThrow();
52 <        } catch (NoSuchElementException success) {
53 <        }
54 <        try {
55 <            q.remove();
56 <            shouldThrow();
57 <        } catch (NoSuchElementException success) {
58 <        }
38 >        return newTestSuite(LinkedTransferQueueTest.class,
39 >                            new Generic().testSuite());
40      }
41  
42      /**
# Line 75 | Line 56 | public class LinkedTransferQueueTest ext
56          try {
57              new LinkedTransferQueue(null);
58              shouldThrow();
59 <        } catch (NullPointerException success) {
79 <        }
59 >        } catch (NullPointerException success) {}
60      }
61  
62      /**
# Line 84 | Line 64 | public class LinkedTransferQueueTest ext
64       * NullPointerException
65       */
66      public void testConstructor3() {
67 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
68          try {
69 <            Integer[] ints = new Integer[SIZE];
89 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71 <        } catch (NullPointerException success) {
92 <        }
71 >        } catch (NullPointerException success) {}
72      }
73  
74      /**
# Line 97 | Line 76 | public class LinkedTransferQueueTest ext
76       * throws NullPointerException
77       */
78      public void testConstructor4() {
79 +        Integer[] ints = new Integer[SIZE];
80 +        for (int i = 0; i < SIZE-1; ++i)
81 +            ints[i] = i;
82 +        Collection<Integer> elements = Arrays.asList(ints);
83          try {
84 <            Integer[] ints = new Integer[SIZE];
102 <            for (int i = 0; i < SIZE - 1; ++i) {
103 <                ints[i] = i;
104 <            }
105 <            new LinkedTransferQueue(Arrays.asList(ints));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86 <        } catch (NullPointerException success) {
108 <        }
86 >        } catch (NullPointerException success) {}
87      }
88  
89      /**
# Line 150 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
153     * offer(null) throws NullPointerException
154     */
155    public void testOfferNull() {
156        try {
157            LinkedTransferQueue q = new LinkedTransferQueue();
158            q.offer(null);
159            shouldThrow();
160        } catch (NullPointerException success) {
161        }
162    }
163
164    /**
165     * add(null) throws NullPointerException
166     */
167    public void testAddNull() {
168        try {
169            LinkedTransferQueue q = new LinkedTransferQueue();
170            q.add(null);
171            shouldThrow();
172        } catch (NullPointerException success) {
173        }
174    }
175
176    /**
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
188    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 193 | Line 135 | public class LinkedTransferQueueTest ext
135              LinkedTransferQueue q = populatedQueue(SIZE);
136              q.addAll(q);
137              shouldThrow();
138 <        } catch (IllegalArgumentException success) {
197 <        }
198 <    }
199 <
200 <    /**
201 <     * addAll of a collection with null elements throws NullPointerException
202 <     */
203 <    public void testAddAll2() {
204 <        try {
205 <            LinkedTransferQueue q = new LinkedTransferQueue();
206 <            Integer[] ints = new Integer[SIZE];
207 <            q.addAll(Arrays.asList(ints));
208 <            shouldThrow();
209 <        } catch (NullPointerException success) {
210 <        }
138 >        } catch (IllegalArgumentException success) {}
139      }
140  
141      /**
# Line 223 | Line 151 | public class LinkedTransferQueueTest ext
151              }
152              q.addAll(Arrays.asList(ints));
153              shouldThrow();
154 <        } catch (NullPointerException success) {
227 <        }
154 >        } catch (NullPointerException success) {}
155      }
156  
157      /**
# Line 245 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
248     * put(null) throws NullPointerException
249     */
250    public void testPutNull() throws InterruptedException {
251        try {
252            LinkedTransferQueue q = new LinkedTransferQueue();
253            q.put(null);
254            shouldThrow();
255        } catch (NullPointerException success) {}
256    }
257
258    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
# Line 278 | Line 194 | public class LinkedTransferQueueTest ext
194      }
195  
196      /**
197 <     * take blocks interruptibly when empty
282 <     */
283 <    public void testTakeFromEmpty() throws InterruptedException {
284 <        final LinkedTransferQueue q = new LinkedTransferQueue();
285 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
286 <            void realRun() throws InterruptedException {
287 <                q.take();
288 <            }});
289 <        Thread.sleep(SHORT_DELAY_MS);
290 <        t.interrupt();
291 <        t.join();
292 <    }
293 <
294 <    /**
295 <     * Take removes existing elements until empty, then blocks interruptibly
197 >     * take removes existing elements until empty, then blocks interruptibly
198       */
199      public void testBlockingTake() throws InterruptedException {
200 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
201 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
202 <            void realRun() throws InterruptedException {
200 >        final BlockingQueue q = populatedQueue(SIZE);
201 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
202 >        Thread t = newStartedThread(new CheckedRunnable() {
203 >            public void realRun() throws InterruptedException {
204                  for (int i = 0; i < SIZE; ++i) {
205 <                    threadAssertEquals(i, (int) q.take());
205 >                    assertEquals(i, q.take());
206                  }
207 <                q.take();
207 >
208 >                Thread.currentThread().interrupt();
209 >                try {
210 >                    q.take();
211 >                    shouldThrow();
212 >                } catch (InterruptedException success) {}
213 >                assertFalse(Thread.interrupted());
214 >
215 >                pleaseInterrupt.countDown();
216 >                try {
217 >                    q.take();
218 >                    shouldThrow();
219 >                } catch (InterruptedException success) {}
220 >                assertFalse(Thread.interrupted());
221              }});
222 <        Thread.sleep(SMALL_DELAY_MS);
222 >
223 >        await(pleaseInterrupt);
224 >        assertThreadStaysAlive(t);
225          t.interrupt();
226 <        t.join();
309 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 322 | Line 239 | public class LinkedTransferQueueTest ext
239      }
240  
241      /**
242 <     * timed pool with zero timeout succeeds when non-empty, else times out
242 >     * timed poll with zero timeout succeeds when non-empty, else times out
243       */
244      public void testTimedPoll0() throws InterruptedException {
245          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 334 | Line 251 | public class LinkedTransferQueueTest ext
251      }
252  
253      /**
254 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
254 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
255       */
256      public void testTimedPoll() throws InterruptedException {
257          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            long t0 = System.nanoTime();
259 >            long startTime = System.nanoTime();
260              assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261 <            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
345 <            assertTrue(millisElapsed < SMALL_DELAY_MS);
261 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262          }
263 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
263 >        long startTime = System.nanoTime();
264 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
265 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266          checkEmpty(q);
267      }
268  
# Line 353 | Line 271 | public class LinkedTransferQueueTest ext
271       * returning timeout status
272       */
273      public void testInterruptedTimedPoll() throws InterruptedException {
274 <        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
275 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
276 <            void realRun() throws InterruptedException {
274 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
275 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
276 >        Thread t = newStartedThread(new CheckedRunnable() {
277 >            public void realRun() throws InterruptedException {
278                  for (int i = 0; i < SIZE; ++i) {
279                      long t0 = System.nanoTime();
280 <                    threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
281 <                                                       MILLISECONDS));
282 <                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
283 <                    assertTrue(millisElapsed < SMALL_DELAY_MS);
280 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
281 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
282 >                }
283 >                long t0 = System.nanoTime();
284 >                aboutToWait.countDown();
285 >                try {
286 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
287 >                    shouldThrow();
288 >                } catch (InterruptedException success) {
289 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
290                  }
366                q.poll(LONG_DELAY_MS, MILLISECONDS);
291              }});
292 <        Thread.sleep(SMALL_DELAY_MS);
292 >
293 >        aboutToWait.await();
294 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
295          t.interrupt();
296 <        t.join();
296 >        awaitTermination(t, MEDIUM_DELAY_MS);
297          checkEmpty(q);
298      }
299  
300      /**
301 <     * timed poll before a delayed offer fails; after offer succeeds;
302 <     * on interruption throws
301 >     * timed poll after thread interrupted throws InterruptedException
302 >     * instead of returning timeout status
303       */
304 <    public void testTimedPollWithOffer() throws InterruptedException {
305 <        final LinkedTransferQueue q = new LinkedTransferQueue();
306 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
307 <            void realRun() throws InterruptedException {
308 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
309 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
310 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
304 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
305 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
306 >        Thread t = newStartedThread(new CheckedRunnable() {
307 >            public void realRun() throws InterruptedException {
308 >                Thread.currentThread().interrupt();
309 >                for (int i = 0; i < SIZE; ++i) {
310 >                    long t0 = System.nanoTime();
311 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
312 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
313 >                }
314 >                try {
315 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
316 >                    shouldThrow();
317 >                } catch (InterruptedException success) {}
318              }});
319 <        Thread.sleep(SMALL_DELAY_MS);
320 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
321 <        t.interrupt();
389 <        t.join();
319 >
320 >        awaitTermination(t, MEDIUM_DELAY_MS);
321 >        checkEmpty(q);
322      }
323  
324      /**
# Line 416 | Line 348 | public class LinkedTransferQueueTest ext
348          try {
349              q.element();
350              shouldThrow();
351 <        } catch (NoSuchElementException success) {
420 <        }
351 >        } catch (NoSuchElementException success) {}
352          checkEmpty(q);
353      }
354  
# Line 432 | Line 363 | public class LinkedTransferQueueTest ext
363          try {
364              q.remove();
365              shouldThrow();
366 <        } catch (NoSuchElementException success) {
436 <        }
366 >        } catch (NoSuchElementException success) {}
367          checkEmpty(q);
368      }
369  
# Line 442 | Line 372 | public class LinkedTransferQueueTest ext
372       */
373      public void testRemoveElement() throws InterruptedException {
374          LinkedTransferQueue q = populatedQueue(SIZE);
375 <        for (int i = 1; i < SIZE; i += 2) {
375 >        for (int i = 1; i < SIZE; i+=2) {
376 >            assertTrue(q.contains(i));
377              assertTrue(q.remove(i));
378 +            assertFalse(q.contains(i));
379 +            assertTrue(q.contains(i-1));
380          }
381 <        for (int i = 0; i < SIZE; i += 2) {
381 >        for (int i = 0; i < SIZE; i+=2) {
382 >            assertTrue(q.contains(i));
383              assertTrue(q.remove(i));
384 <            assertFalse(q.remove(i + 1));
384 >            assertFalse(q.contains(i));
385 >            assertFalse(q.remove(i+1));
386 >            assertFalse(q.contains(i+1));
387          }
388          checkEmpty(q);
389      }
# Line 462 | Line 398 | public class LinkedTransferQueueTest ext
398          assertTrue(q.remove(one));
399          assertTrue(q.remove(two));
400          assertTrue(q.add(three));
401 <        assertTrue(q.take() == three);
401 >        assertSame(q.take(), three);
402      }
403  
404      /**
# Line 544 | Line 480 | public class LinkedTransferQueueTest ext
480      }
481  
482      /**
483 <     * toArray() contains all elements
483 >     * toArray() contains all elements in FIFO order
484       */
485 <    public void testToArray() throws InterruptedException {
485 >    public void testToArray() {
486          LinkedTransferQueue q = populatedQueue(SIZE);
487          Object[] o = q.toArray();
488          for (int i = 0; i < o.length; i++) {
489 <            assertEquals(o[i], q.take());
489 >            assertSame(o[i], q.poll());
490          }
491      }
492  
493      /**
494 <     * toArray(a) contains all elements
494 >     * toArray(a) contains all elements in FIFO order
495       */
496 <    public void testToArray2() throws InterruptedException {
496 >    public void testToArray2() {
497          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
498          Integer[] ints = new Integer[SIZE];
499 <        ints = q.toArray(ints);
499 >        Integer[] array = q.toArray(ints);
500 >        assertSame(ints, array);
501          for (int i = 0; i < ints.length; i++) {
502 <            assertEquals(ints[i], q.take());
566 <        }
567 <    }
568 <
569 <    /**
570 <     * toArray(null) throws NullPointerException
571 <     */
572 <    public void testToArray_BadArg() {
573 <        try {
574 <            LinkedTransferQueue q = populatedQueue(SIZE);
575 <            Object o[] = q.toArray(null);
576 <            shouldThrow();
577 <        } catch (NullPointerException success) {
502 >            assertSame(ints[i], q.poll());
503          }
504      }
505  
506      /**
507 <     * toArray(incompatible array type) throws CCE
507 >     * toArray(incompatible array type) throws ArrayStoreException
508       */
509      public void testToArray1_BadArg() {
510 +        LinkedTransferQueue q = populatedQueue(SIZE);
511          try {
512 <            LinkedTransferQueue q = populatedQueue(SIZE);
587 <            Object o[] = q.toArray(new String[10]);
512 >            q.toArray(new String[10]);
513              shouldThrow();
514 <        } catch (ArrayStoreException success) {
590 <        }
514 >        } catch (ArrayStoreException success) {}
515      }
516  
517      /**
# Line 617 | Line 541 | public class LinkedTransferQueueTest ext
541          it.remove();
542  
543          it = q.iterator();
544 <        assertEquals(it.next(), one);
545 <        assertEquals(it.next(), three);
544 >        assertSame(it.next(), one);
545 >        assertSame(it.next(), three);
546          assertFalse(it.hasNext());
547      }
548  
# Line 662 | Line 586 | public class LinkedTransferQueueTest ext
586          LinkedTransferQueue q = populatedQueue(SIZE);
587          String s = q.toString();
588          for (int i = 0; i < SIZE; ++i) {
589 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
589 >            assertTrue(s.contains(String.valueOf(i)));
590          }
591      }
592  
# Line 671 | Line 595 | public class LinkedTransferQueueTest ext
595       */
596      public void testOfferInExecutor() {
597          final LinkedTransferQueue q = new LinkedTransferQueue();
598 <        q.add(one);
675 <        q.add(two);
598 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
599          ExecutorService executor = Executors.newFixedThreadPool(2);
600  
601          executor.execute(new CheckedRunnable() {
602 <            void realRun() {
603 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
604 <                                         MILLISECONDS));
602 >            public void realRun() throws InterruptedException {
603 >                threadsStarted.await();
604 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
605              }});
606  
607          executor.execute(new CheckedRunnable() {
608 <            void realRun() throws InterruptedException {
609 <                Thread.sleep(SMALL_DELAY_MS);
610 <                threadAssertEquals(one, q.take());
608 >            public void realRun() throws InterruptedException {
609 >                threadsStarted.await();
610 >                assertSame(one, q.take());
611 >                checkEmpty(q);
612              }});
613  
614          joinPool(executor);
# Line 695 | Line 619 | public class LinkedTransferQueueTest ext
619       */
620      public void testPollInExecutor() {
621          final LinkedTransferQueue q = new LinkedTransferQueue();
622 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
623          ExecutorService executor = Executors.newFixedThreadPool(2);
624  
625          executor.execute(new CheckedRunnable() {
626 <            void realRun() throws InterruptedException {
627 <                threadAssertNull(q.poll());
628 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
629 <                                                MILLISECONDS));
630 <                threadAssertTrue(q.isEmpty());
626 >            public void realRun() throws InterruptedException {
627 >                assertNull(q.poll());
628 >                threadsStarted.await();
629 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
630 >                checkEmpty(q);
631              }});
632  
633          executor.execute(new CheckedRunnable() {
634 <            void realRun() throws InterruptedException {
635 <                Thread.sleep(SMALL_DELAY_MS);
634 >            public void realRun() throws InterruptedException {
635 >                threadsStarted.await();
636                  q.put(one);
637              }});
638  
# Line 718 | Line 643 | public class LinkedTransferQueueTest ext
643       * A deserialized serialized queue has same elements in same order
644       */
645      public void testSerialization() throws Exception {
646 <        LinkedTransferQueue q = populatedQueue(SIZE);
647 <
723 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
724 <        ObjectOutputStream out
725 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
726 <        out.writeObject(q);
727 <        out.close();
646 >        Queue x = populatedQueue(SIZE);
647 >        Queue y = serialClone(x);
648  
649 <        ByteArrayInputStream bin
650 <            = new ByteArrayInputStream(bout.toByteArray());
651 <        ObjectInputStream in
652 <            = new ObjectInputStream(new BufferedInputStream(bin));
653 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
654 <
655 <        assertEquals(q.size(), r.size());
736 <        while (!q.isEmpty()) {
737 <            assertEquals(q.remove(), r.remove());
738 <        }
739 <    }
740 <
741 <    /**
742 <     * drainTo(null) throws NullPointerException
743 <     */
744 <    public void testDrainToNull() {
745 <        LinkedTransferQueue q = populatedQueue(SIZE);
746 <        try {
747 <            q.drainTo(null);
748 <            shouldThrow();
749 <        } catch (NullPointerException success) {
750 <        }
751 <    }
752 <
753 <    /**
754 <     * drainTo(this) throws IllegalArgumentException
755 <     */
756 <    public void testDrainToSelf() {
757 <        LinkedTransferQueue q = populatedQueue(SIZE);
758 <        try {
759 <            q.drainTo(q);
760 <            shouldThrow();
761 <        } catch (IllegalArgumentException success) {
649 >        assertTrue(x != y);
650 >        assertEquals(x.size(), y.size());
651 >        assertEquals(x.toString(), y.toString());
652 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
653 >        while (!x.isEmpty()) {
654 >            assertFalse(y.isEmpty());
655 >            assertEquals(x.remove(), y.remove());
656          }
657 +        assertTrue(y.isEmpty());
658      }
659  
660      /**
# Line 794 | Line 689 | public class LinkedTransferQueueTest ext
689      public void testDrainToWithActivePut() throws InterruptedException {
690          final LinkedTransferQueue q = populatedQueue(SIZE);
691          Thread t = newStartedThread(new CheckedRunnable() {
692 <            void realRun() {
692 >            public void realRun() {
693                  q.put(SIZE + 1);
694              }});
695          ArrayList l = new ArrayList();
# Line 803 | Line 698 | public class LinkedTransferQueueTest ext
698          for (int i = 0; i < SIZE; ++i) {
699              assertEquals(l.get(i), i);
700          }
701 <        t.join();
701 >        awaitTermination(t, MEDIUM_DELAY_MS);
702          assertTrue(q.size() + l.size() >= SIZE);
703      }
704  
705      /**
706 <     * drainTo(null, n) throws NullPointerException
812 <     */
813 <    public void testDrainToNullN() {
814 <        LinkedTransferQueue q = populatedQueue(SIZE);
815 <        try {
816 <            q.drainTo(null, SIZE);
817 <            shouldThrow();
818 <        } catch (NullPointerException success) {
819 <        }
820 <    }
821 <
822 <    /**
823 <     * drainTo(this, n) throws IllegalArgumentException
824 <     */
825 <    public void testDrainToSelfN() {
826 <        LinkedTransferQueue q = populatedQueue(SIZE);
827 <        try {
828 <            q.drainTo(q, SIZE);
829 <            shouldThrow();
830 <        } catch (IllegalArgumentException success) {
831 <        }
832 <    }
833 <
834 <    /**
835 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
706 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
707       */
708      public void testDrainToN() {
709          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 861 | Line 732 | public class LinkedTransferQueueTest ext
732          final LinkedTransferQueue q = new LinkedTransferQueue();
733          assertEquals(q.getWaitingConsumerCount(), 0);
734          assertFalse(q.hasWaitingConsumer());
735 +        final CountDownLatch threadStarted = new CountDownLatch(1);
736  
737          Thread t = newStartedThread(new CheckedRunnable() {
738 <            void realRun() throws InterruptedException {
739 <                Thread.sleep(SMALL_DELAY_MS);
740 <                threadAssertTrue(q.hasWaitingConsumer());
741 <                threadAssertEquals(q.getWaitingConsumerCount(), 1);
742 <                threadAssertTrue(q.offer(new Object()));
871 <                threadAssertFalse(q.hasWaitingConsumer());
872 <                threadAssertEquals(q.getWaitingConsumerCount(), 0);
738 >            public void realRun() throws InterruptedException {
739 >                threadStarted.countDown();
740 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
741 >                assertEquals(q.getWaitingConsumerCount(), 0);
742 >                assertFalse(q.hasWaitingConsumer());
743              }});
744  
745 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
745 >        threadStarted.await();
746 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
747 >        assertEquals(q.getWaitingConsumerCount(), 1);
748 >        assertTrue(q.hasWaitingConsumer());
749 >
750 >        assertTrue(q.offer(one));
751          assertEquals(q.getWaitingConsumerCount(), 0);
752          assertFalse(q.hasWaitingConsumer());
753 <        t.join();
753 >
754 >        awaitTermination(t, MEDIUM_DELAY_MS);
755      }
756  
757      /**
# Line 896 | Line 772 | public class LinkedTransferQueueTest ext
772      public void testTransfer2() throws InterruptedException {
773          final LinkedTransferQueue<Integer> q
774              = new LinkedTransferQueue<Integer>();
775 +        final CountDownLatch threadStarted = new CountDownLatch(1);
776  
777          Thread t = newStartedThread(new CheckedRunnable() {
778 <            void realRun() throws InterruptedException {
779 <                q.transfer(SIZE);
780 <                threadAssertTrue(q.isEmpty());
778 >            public void realRun() throws InterruptedException {
779 >                threadStarted.countDown();
780 >                q.transfer(five);
781 >                checkEmpty(q);
782              }});
783  
784 <        Thread.sleep(SHORT_DELAY_MS);
784 >        threadStarted.await();
785 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
786          assertEquals(1, q.size());
787 <        assertEquals(SIZE, (int) q.poll());
788 <        assertTrue(q.isEmpty());
789 <        t.join();
787 >        assertSame(five, q.poll());
788 >        checkEmpty(q);
789 >        awaitTermination(t, MEDIUM_DELAY_MS);
790      }
791  
792      /**
# Line 918 | Line 797 | public class LinkedTransferQueueTest ext
797              = new LinkedTransferQueue<Integer>();
798  
799          Thread first = newStartedThread(new CheckedRunnable() {
800 <            void realRun() throws InterruptedException {
801 <                Integer i = SIZE + 1;
802 <                q.transfer(i);
803 <                threadAssertTrue(!q.contains(i));
925 <                threadAssertEquals(1, q.size());
800 >            public void realRun() throws InterruptedException {
801 >                q.transfer(four);
802 >                assertTrue(!q.contains(four));
803 >                assertEquals(1, q.size());
804              }});
805  
806          Thread interruptedThread = newStartedThread(
807              new CheckedInterruptedRunnable() {
808 <                void realRun() throws InterruptedException {
809 <                    while (q.size() == 0)
808 >                public void realRun() throws InterruptedException {
809 >                    while (q.isEmpty())
810                          Thread.yield();
811 <                    q.transfer(SIZE);
811 >                    q.transfer(five);
812                  }});
813  
814          while (q.size() < 2)
815              Thread.yield();
816          assertEquals(2, q.size());
817 <        assertEquals(SIZE + 1, (int) q.poll());
817 >        assertSame(four, q.poll());
818          first.join();
819          assertEquals(1, q.size());
820          interruptedThread.interrupt();
821          interruptedThread.join();
822 <        assertEquals(0, q.size());
945 <        assertTrue(q.isEmpty());
822 >        checkEmpty(q);
823      }
824  
825      /**
# Line 953 | Line 830 | public class LinkedTransferQueueTest ext
830          final LinkedTransferQueue q = new LinkedTransferQueue();
831  
832          Thread t = newStartedThread(new CheckedRunnable() {
833 <            void realRun() throws InterruptedException {
833 >            public void realRun() throws InterruptedException {
834                  q.transfer(four);
835 <                threadAssertFalse(q.contains(four));
836 <                threadAssertEquals(three, q.poll());
835 >                assertFalse(q.contains(four));
836 >                assertSame(three, q.poll());
837              }});
838  
839 <        Thread.sleep(SHORT_DELAY_MS);
839 >        while (q.isEmpty())
840 >            Thread.yield();
841 >        assertFalse(q.isEmpty());
842 >        assertEquals(1, q.size());
843          assertTrue(q.offer(three));
844 <        assertEquals(four, q.poll());
845 <        t.join();
844 >        assertSame(four, q.poll());
845 >        awaitTermination(t, MEDIUM_DELAY_MS);
846      }
847  
848      /**
# Line 974 | Line 854 | public class LinkedTransferQueueTest ext
854              = new LinkedTransferQueue<Integer>();
855  
856          Thread t = newStartedThread(new CheckedRunnable() {
857 <            void realRun() throws InterruptedException {
858 <                q.transfer(SIZE);
857 >            public void realRun() throws InterruptedException {
858 >                q.transfer(four);
859                  checkEmpty(q);
860              }});
861  
862 <        Thread.sleep(SHORT_DELAY_MS);
863 <        assertEquals(SIZE, (int) q.take());
862 >        while (q.isEmpty())
863 >            Thread.yield();
864 >        assertFalse(q.isEmpty());
865 >        assertEquals(1, q.size());
866 >        assertSame(four, q.take());
867          checkEmpty(q);
868 <        t.join();
868 >        awaitTermination(t, MEDIUM_DELAY_MS);
869      }
870  
871      /**
# Line 1016 | 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);
1025 <                threadAssertTrue(q.tryTransfer(hotPotato));
905 >                assertTrue(q.hasWaitingConsumer());
906 >                checkEmpty(q);
907 >                assertTrue(q.tryTransfer(hotPotato));
908              }});
909  
910 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
910 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
911          checkEmpty(q);
912 <        t.join();
912 >        awaitTermination(t, MEDIUM_DELAY_MS);
913      }
914  
915      /**
# Line 1039 | Line 921 | public class LinkedTransferQueueTest ext
921          final LinkedTransferQueue q = new LinkedTransferQueue();
922  
923          Thread t = newStartedThread(new CheckedRunnable() {
924 <            void realRun() {
924 >            public void realRun() {
925                  while (! q.hasWaitingConsumer())
926                      Thread.yield();
927 <                threadAssertTrue(q.hasWaitingConsumer());
928 <                threadAssertTrue(q.isEmpty());
929 <                threadAssertTrue(q.size() == 0);
1048 <                threadAssertTrue(q.tryTransfer(hotPotato));
927 >                assertTrue(q.hasWaitingConsumer());
928 >                checkEmpty(q);
929 >                assertTrue(q.tryTransfer(hotPotato));
930              }});
931  
932 <        assertTrue(q.take() == hotPotato);
932 >        assertSame(q.take(), hotPotato);
933          checkEmpty(q);
934 <        t.join();
934 >        awaitTermination(t, MEDIUM_DELAY_MS);
935      }
936  
937      /**
938 <     * tryTransfer waits the amount given if interrupted, and
1058 <     * throws interrupted exception
938 >     * tryTransfer blocks interruptibly if no takers
939       */
940      public void testTryTransfer5() throws InterruptedException {
941          final LinkedTransferQueue q = new LinkedTransferQueue();
942 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
943 +        assertTrue(q.isEmpty());
944  
945 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
946 <            void realRun() throws InterruptedException {
947 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
945 >        Thread t = newStartedThread(new CheckedRunnable() {
946 >            public void realRun() throws InterruptedException {
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              }});
961  
962 <        Thread.sleep(SMALL_DELAY_MS);
963 <        toInterrupt.interrupt();
964 <        toInterrupt.join();
962 >        await(pleaseInterrupt);
963 >        assertThreadStaysAlive(t);
964 >        t.interrupt();
965 >        awaitTermination(t);
966 >        checkEmpty(q);
967      }
968  
969      /**
970 <     * tryTransfer gives up after the timeout and return false
970 >     * tryTransfer gives up after the timeout and returns false
971       */
972      public void testTryTransfer6() throws InterruptedException {
973          final LinkedTransferQueue q = new LinkedTransferQueue();
974  
975          Thread t = newStartedThread(new CheckedRunnable() {
976 <            void realRun() throws InterruptedException {
977 <                threadAssertFalse
978 <                    (q.tryTransfer(new Object(),
979 <                                   SHORT_DELAY_MS, MILLISECONDS));
976 >            public void realRun() throws InterruptedException {
977 >                long t0 = System.nanoTime();
978 >                assertFalse(q.tryTransfer(new Object(),
979 >                                          timeoutMillis(), MILLISECONDS));
980 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
981 >                checkEmpty(q);
982              }});
983  
984 <        Thread.sleep(SMALL_DELAY_MS);
984 >        awaitTermination(t);
985          checkEmpty(q);
1088        t.join();
986      }
987  
988      /**
# Line 1097 | Line 994 | public class LinkedTransferQueueTest ext
994          assertTrue(q.offer(four));
995  
996          Thread t = newStartedThread(new CheckedRunnable() {
997 <            void realRun() throws InterruptedException {
998 <                threadAssertTrue(q.tryTransfer(five,
999 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1103 <                threadAssertTrue(q.isEmpty());
997 >            public void realRun() throws InterruptedException {
998 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
999 >                checkEmpty(q);
1000              }});
1001  
1002 <        Thread.sleep(SHORT_DELAY_MS);
1002 >        while (q.size() != 2)
1003 >            Thread.yield();
1004          assertEquals(2, q.size());
1005 <        assertEquals(four, q.poll());
1006 <        assertEquals(five, q.poll());
1005 >        assertSame(four, q.poll());
1006 >        assertSame(five, q.poll());
1007          checkEmpty(q);
1008 <        t.join();
1008 >        awaitTermination(t, MEDIUM_DELAY_MS);
1009      }
1010  
1011      /**
1012 <     * tryTransfer attempts to enqueue into the q and fails returning
1013 <     * false not enqueueing and the successive poll is null
1012 >     * tryTransfer attempts to enqueue into the queue and fails
1013 >     * returning false not enqueueing and the successive poll is null
1014       */
1015      public void testTryTransfer8() throws InterruptedException {
1016          final LinkedTransferQueue q = new LinkedTransferQueue();
1017          assertTrue(q.offer(four));
1018          assertEquals(1, q.size());
1019 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1019 >        long t0 = System.nanoTime();
1020 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1021 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1022          assertEquals(1, q.size());
1023 <        assertEquals(four, q.poll());
1023 >        assertSame(four, q.poll());
1024          assertNull(q.poll());
1025          checkEmpty(q);
1026      }
1027  
1028      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1029          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1030 <        assertTrue(q.isEmpty());
1030 >        checkEmpty(q);
1031          for (int i = 0; i < n; i++) {
1032              assertEquals(i, q.size());
1033              assertTrue(q.offer(i));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines