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.51 by jsr166, Sat Nov 26 05:42:14 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.ConcurrentModificationException;
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;
23 < 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 <    }
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 <        }
38 >        return newTestSuite(LinkedTransferQueueTest.class,
39 >                            new Generic().testSuite());
40      }
41  
42      /**
# Line 76 | Line 56 | public class LinkedTransferQueueTest ext
56          try {
57              new LinkedTransferQueue(null);
58              shouldThrow();
59 <        } catch (NullPointerException success) {
80 <        }
59 >        } catch (NullPointerException success) {}
60      }
61  
62      /**
# Line 85 | 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];
90 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71 <        } catch (NullPointerException success) {
93 <        }
71 >        } catch (NullPointerException success) {}
72      }
73  
74      /**
# Line 98 | 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];
103 <            for (int i = 0; i < SIZE - 1; ++i) {
104 <                ints[i] = i;
105 <            }
106 <            new LinkedTransferQueue(Arrays.asList(ints));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86 <        } catch (NullPointerException success) {
109 <        }
86 >        } catch (NullPointerException success) {}
87      }
88  
89      /**
# Line 151 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
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    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 194 | Line 135 | public class LinkedTransferQueueTest ext
135              LinkedTransferQueue q = populatedQueue(SIZE);
136              q.addAll(q);
137              shouldThrow();
138 <        } 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 <        }
138 >        } catch (IllegalArgumentException success) {}
139      }
140  
141      /**
# Line 224 | Line 151 | public class LinkedTransferQueueTest ext
151              }
152              q.addAll(Arrays.asList(ints));
153              shouldThrow();
154 <        } catch (NullPointerException success) {
228 <        }
154 >        } catch (NullPointerException success) {}
155      }
156  
157      /**
# Line 246 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
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    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
178          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
179          for (int i = 0; i < SIZE; ++i) {
180 <            assertEquals(q.size(), i);
180 >            assertEquals(i, q.size());
181              q.put(i);
182              assertTrue(q.contains(i));
183          }
# Line 279 | Line 194 | public class LinkedTransferQueueTest ext
194      }
195  
196      /**
197 <     * 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
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();
310 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 323 | 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 335 | 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);
346 <            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 354 | 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                  }
367                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();
390 <        t.join();
319 >
320 >        awaitTermination(t, MEDIUM_DELAY_MS);
321 >        checkEmpty(q);
322      }
323  
324      /**
# Line 417 | Line 348 | public class LinkedTransferQueueTest ext
348          try {
349              q.element();
350              shouldThrow();
351 <        } catch (NoSuchElementException success) {
421 <        }
351 >        } catch (NoSuchElementException success) {}
352          checkEmpty(q);
353      }
354  
# Line 433 | Line 363 | public class LinkedTransferQueueTest ext
363          try {
364              q.remove();
365              shouldThrow();
366 <        } 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 <        }
366 >        } catch (NoSuchElementException success) {}
367          checkEmpty(q);
368      }
369  
# Line 463 | Line 377 | public class LinkedTransferQueueTest ext
377          assertTrue(q.remove(one));
378          assertTrue(q.remove(two));
379          assertTrue(q.add(three));
380 <        assertTrue(q.take() == three);
380 >        assertSame(q.take(), three);
381      }
382  
383      /**
# Line 545 | Line 459 | public class LinkedTransferQueueTest ext
459      }
460  
461      /**
462 <     * toArray contains all elements
462 >     * toArray() contains all elements in FIFO order
463       */
464 <    public void testToArray() throws InterruptedException {
464 >    public void testToArray() {
465          LinkedTransferQueue q = populatedQueue(SIZE);
466          Object[] o = q.toArray();
467          for (int i = 0; i < o.length; i++) {
468 <            assertEquals(o[i], q.take());
468 >            assertSame(o[i], q.poll());
469          }
470      }
471  
472      /**
473 <     * toArray(a) contains all elements
473 >     * toArray(a) contains all elements in FIFO order
474       */
475 <    public void testToArray2() throws InterruptedException {
475 >    public void testToArray2() {
476          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
477          Integer[] ints = new Integer[SIZE];
478 <        ints = q.toArray(ints);
478 >        Integer[] array = q.toArray(ints);
479 >        assertSame(ints, array);
480          for (int i = 0; i < ints.length; i++) {
481 <            assertEquals(ints[i], q.take());
481 >            assertSame(ints[i], q.poll());
482          }
483      }
484  
485      /**
486 <     * 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
486 >     * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
489 +        LinkedTransferQueue q = populatedQueue(SIZE);
490          try {
491 <            LinkedTransferQueue q = populatedQueue(SIZE);
588 <            Object o[] = q.toArray(new String[10]);
491 >            q.toArray(new String[10]);
492              shouldThrow();
493 <        } catch (ArrayStoreException success) {
591 <        }
493 >        } catch (ArrayStoreException success) {}
494      }
495  
496      /**
# Line 618 | Line 520 | public class LinkedTransferQueueTest ext
520          it.remove();
521  
522          it = q.iterator();
523 <        assertEquals(it.next(), one);
524 <        assertEquals(it.next(), three);
523 >        assertSame(it.next(), one);
524 >        assertSame(it.next(), three);
525          assertFalse(it.hasNext());
526      }
527  
# Line 663 | Line 565 | public class LinkedTransferQueueTest ext
565          LinkedTransferQueue q = populatedQueue(SIZE);
566          String s = q.toString();
567          for (int i = 0; i < SIZE; ++i) {
568 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
568 >            assertTrue(s.contains(String.valueOf(i)));
569          }
570      }
571  
# Line 672 | Line 574 | public class LinkedTransferQueueTest ext
574       */
575      public void testOfferInExecutor() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
577 <        q.add(one);
676 <        q.add(two);
577 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
578          ExecutorService executor = Executors.newFixedThreadPool(2);
579  
580          executor.execute(new CheckedRunnable() {
581 <            void realRun() {
582 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
583 <                                         MILLISECONDS));
581 >            public void realRun() throws InterruptedException {
582 >                threadsStarted.await();
583 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584              }});
585  
586          executor.execute(new CheckedRunnable() {
587 <            void realRun() throws InterruptedException {
588 <                Thread.sleep(SMALL_DELAY_MS);
589 <                threadAssertEquals(one, q.take());
587 >            public void realRun() throws InterruptedException {
588 >                threadsStarted.await();
589 >                assertSame(one, q.take());
590 >                checkEmpty(q);
591              }});
592  
593          joinPool(executor);
594      }
595  
596      /**
597 <     * poll retrieves elements across Executor threads
597 >     * timed poll retrieves elements across Executor threads
598       */
599      public void testPollInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602          ExecutorService executor = Executors.newFixedThreadPool(2);
603  
604          executor.execute(new CheckedRunnable() {
605 <            void realRun() throws InterruptedException {
606 <                threadAssertNull(q.poll());
607 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
608 <                                                MILLISECONDS));
609 <                threadAssertTrue(q.isEmpty());
605 >            public void realRun() throws InterruptedException {
606 >                assertNull(q.poll());
607 >                threadsStarted.await();
608 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609 >                checkEmpty(q);
610              }});
611  
612          executor.execute(new CheckedRunnable() {
613 <            void realRun() throws InterruptedException {
614 <                Thread.sleep(SMALL_DELAY_MS);
613 >            public void realRun() throws InterruptedException {
614 >                threadsStarted.await();
615                  q.put(one);
616              }});
617  
# Line 719 | Line 622 | public class LinkedTransferQueueTest ext
622       * A deserialized serialized queue has same elements in same order
623       */
624      public void testSerialization() throws Exception {
625 <        LinkedTransferQueue q = populatedQueue(SIZE);
626 <
724 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
725 <        ObjectOutputStream out
726 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
727 <        out.writeObject(q);
728 <        out.close();
625 >        Queue x = populatedQueue(SIZE);
626 >        Queue y = serialClone(x);
627  
628 <        ByteArrayInputStream bin
629 <            = new ByteArrayInputStream(bout.toByteArray());
630 <        ObjectInputStream in
631 <            = new ObjectInputStream(new BufferedInputStream(bin));
632 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
633 <
634 <        assertEquals(q.size(), r.size());
737 <        while (!q.isEmpty()) {
738 <            assertEquals(q.remove(), r.remove());
739 <        }
740 <    }
741 <
742 <    /**
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) {
628 >        assertTrue(x != y);
629 >        assertEquals(x.size(), y.size());
630 >        assertEquals(x.toString(), y.toString());
631 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
632 >        while (!x.isEmpty()) {
633 >            assertFalse(y.isEmpty());
634 >            assertEquals(x.remove(), y.remove());
635          }
636 +        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 770 | Line 643 | public class LinkedTransferQueueTest ext
643          LinkedTransferQueue q = populatedQueue(SIZE);
644          ArrayList l = new ArrayList();
645          q.drainTo(l);
646 <        assertEquals(q.size(), 0);
647 <        assertEquals(l.size(), SIZE);
646 >        assertEquals(0, q.size());
647 >        assertEquals(SIZE, l.size());
648          for (int i = 0; i < SIZE; ++i) {
649 <            assertEquals(l.get(i), i);
649 >            assertEquals(i, l.get(i));
650          }
651          q.add(zero);
652          q.add(one);
# Line 782 | Line 655 | public class LinkedTransferQueueTest ext
655          assertTrue(q.contains(one));
656          l.clear();
657          q.drainTo(l);
658 <        assertEquals(q.size(), 0);
659 <        assertEquals(l.size(), 2);
658 >        assertEquals(0, q.size());
659 >        assertEquals(2, l.size());
660          for (int i = 0; i < 2; ++i) {
661 <            assertEquals(l.get(i), i);
661 >            assertEquals(i, l.get(i));
662          }
663      }
664  
665      /**
666 <     * drainTo empties full queue, unblocking a waiting put.
666 >     * drainTo(c) empties full queue, unblocking a waiting put.
667       */
668      public void testDrainToWithActivePut() throws InterruptedException {
669          final LinkedTransferQueue q = populatedQueue(SIZE);
670          Thread t = newStartedThread(new CheckedRunnable() {
671 <            void realRun() {
671 >            public void realRun() {
672                  q.put(SIZE + 1);
673              }});
674          ArrayList l = new ArrayList();
675          q.drainTo(l);
676          assertTrue(l.size() >= SIZE);
677 <        for (int i = 0; i < SIZE; ++i) {
678 <            assertEquals(l.get(i), i);
679 <        }
807 <        t.join();
677 >        for (int i = 0; i < SIZE; ++i)
678 >            assertEquals(i, l.get(i));
679 >        awaitTermination(t, MEDIUM_DELAY_MS);
680          assertTrue(q.size() + l.size() >= SIZE);
681      }
682  
683      /**
684 <     * 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
684 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
685       */
686      public void testDrainToN() {
687          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 844 | Line 692 | public class LinkedTransferQueueTest ext
692              ArrayList l = new ArrayList();
693              q.drainTo(l, i);
694              int k = (i < SIZE) ? i : SIZE;
695 <            assertEquals(l.size(), k);
696 <            assertEquals(q.size(), SIZE - k);
697 <            for (int j = 0; j < k; ++j) {
698 <                assertEquals(l.get(j), j);
851 <            }
695 >            assertEquals(k, l.size());
696 >            assertEquals(SIZE - k, q.size());
697 >            for (int j = 0; j < k; ++j)
698 >                assertEquals(j, l.get(j));
699              while (q.poll() != null)
700                  ;
701          }
702      }
703  
704      /**
705 <     * poll and take decrement the waiting consumer count
705 >     * timed poll() or take() increments the waiting consumer count;
706 >     * offer(e) decrements the waiting consumer count
707       */
708      public void testWaitingConsumer() throws InterruptedException {
709          final LinkedTransferQueue q = new LinkedTransferQueue();
710 <        final ConsumerObserver waiting = new ConsumerObserver();
710 >        assertEquals(0, q.getWaitingConsumerCount());
711 >        assertFalse(q.hasWaitingConsumer());
712 >        final CountDownLatch threadStarted = new CountDownLatch(1);
713  
714          Thread t = newStartedThread(new CheckedRunnable() {
715 <            void realRun() throws InterruptedException {
716 <                Thread.sleep(SMALL_DELAY_MS);
717 <                threadAssertTrue(q.hasWaitingConsumer());
718 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
719 <                threadAssertTrue(q.offer(new Object()));
715 >            public void realRun() throws InterruptedException {
716 >                threadStarted.countDown();
717 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
718 >                assertEquals(0, q.getWaitingConsumerCount());
719 >                assertFalse(q.hasWaitingConsumer());
720              }});
721  
722 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
723 <        assertTrue(q.getWaitingConsumerCount()
724 <                   < waiting.getWaitingConsumers());
725 <        t.join();
722 >        threadStarted.await();
723 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
724 >        assertEquals(1, q.getWaitingConsumerCount());
725 >        assertTrue(q.hasWaitingConsumer());
726 >
727 >        assertTrue(q.offer(one));
728 >        assertEquals(0, q.getWaitingConsumerCount());
729 >        assertFalse(q.hasWaitingConsumer());
730 >
731 >        awaitTermination(t, MEDIUM_DELAY_MS);
732      }
733  
734      /**
# Line 883 | Line 739 | public class LinkedTransferQueueTest ext
739              LinkedTransferQueue q = new LinkedTransferQueue();
740              q.transfer(null);
741              shouldThrow();
742 <        } catch (NullPointerException ex) {
887 <        }
742 >        } catch (NullPointerException success) {}
743      }
744  
745      /**
# Line 894 | Line 749 | public class LinkedTransferQueueTest ext
749      public void testTransfer2() throws InterruptedException {
750          final LinkedTransferQueue<Integer> q
751              = new LinkedTransferQueue<Integer>();
752 +        final CountDownLatch threadStarted = new CountDownLatch(1);
753  
754          Thread t = newStartedThread(new CheckedRunnable() {
755 <            void realRun() throws InterruptedException {
756 <                q.transfer(SIZE);
757 <                threadAssertTrue(q.isEmpty());
755 >            public void realRun() throws InterruptedException {
756 >                threadStarted.countDown();
757 >                q.transfer(five);
758 >                checkEmpty(q);
759              }});
760  
761 <        Thread.sleep(SHORT_DELAY_MS);
761 >        threadStarted.await();
762 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
763          assertEquals(1, q.size());
764 <        assertEquals(SIZE, (int) q.poll());
765 <        assertTrue(q.isEmpty());
766 <        t.join();
764 >        assertSame(five, q.poll());
765 >        checkEmpty(q);
766 >        awaitTermination(t, MEDIUM_DELAY_MS);
767      }
768  
769      /**
# Line 916 | Line 774 | public class LinkedTransferQueueTest ext
774              = new LinkedTransferQueue<Integer>();
775  
776          Thread first = newStartedThread(new CheckedRunnable() {
777 <            void realRun() throws InterruptedException {
778 <                Integer i = SIZE + 1;
779 <                q.transfer(i);
780 <                threadAssertTrue(!q.contains(i));
923 <                threadAssertEquals(1, q.size());
777 >            public void realRun() throws InterruptedException {
778 >                q.transfer(four);
779 >                assertTrue(!q.contains(four));
780 >                assertEquals(1, q.size());
781              }});
782  
783          Thread interruptedThread = newStartedThread(
784              new CheckedInterruptedRunnable() {
785 <                void realRun() throws InterruptedException {
786 <                    while (q.size() == 0)
785 >                public void realRun() throws InterruptedException {
786 >                    while (q.isEmpty())
787                          Thread.yield();
788 <                    q.transfer(SIZE);
788 >                    q.transfer(five);
789                  }});
790  
791          while (q.size() < 2)
792              Thread.yield();
793          assertEquals(2, q.size());
794 <        assertEquals(SIZE + 1, (int) q.poll());
794 >        assertSame(four, q.poll());
795          first.join();
796          assertEquals(1, q.size());
797          interruptedThread.interrupt();
798          interruptedThread.join();
799 <        assertEquals(0, q.size());
943 <        assertTrue(q.isEmpty());
799 >        checkEmpty(q);
800      }
801  
802      /**
# Line 951 | Line 807 | public class LinkedTransferQueueTest ext
807          final LinkedTransferQueue q = new LinkedTransferQueue();
808  
809          Thread t = newStartedThread(new CheckedRunnable() {
810 <            void realRun() throws InterruptedException {
810 >            public void realRun() throws InterruptedException {
811                  q.transfer(four);
812 <                threadAssertFalse(q.contains(four));
813 <                threadAssertEquals(three, q.poll());
812 >                assertFalse(q.contains(four));
813 >                assertSame(three, q.poll());
814              }});
815  
816 <        Thread.sleep(SHORT_DELAY_MS);
816 >        while (q.isEmpty())
817 >            Thread.yield();
818 >        assertFalse(q.isEmpty());
819 >        assertEquals(1, q.size());
820          assertTrue(q.offer(three));
821 <        assertEquals(four, q.poll());
822 <        t.join();
821 >        assertSame(four, q.poll());
822 >        awaitTermination(t, MEDIUM_DELAY_MS);
823      }
824  
825      /**
# Line 972 | Line 831 | public class LinkedTransferQueueTest ext
831              = new LinkedTransferQueue<Integer>();
832  
833          Thread t = newStartedThread(new CheckedRunnable() {
834 <            void realRun() throws InterruptedException {
835 <                q.transfer(SIZE);
834 >            public void realRun() throws InterruptedException {
835 >                q.transfer(four);
836                  checkEmpty(q);
837              }});
838  
839 <        Thread.sleep(SHORT_DELAY_MS);
840 <        assertEquals(SIZE, (int) q.take());
839 >        while (q.isEmpty())
840 >            Thread.yield();
841 >        assertFalse(q.isEmpty());
842 >        assertEquals(1, q.size());
843 >        assertSame(four, q.take());
844          checkEmpty(q);
845 <        t.join();
845 >        awaitTermination(t, MEDIUM_DELAY_MS);
846      }
847  
848      /**
# Line 991 | Line 853 | public class LinkedTransferQueueTest ext
853              final LinkedTransferQueue q = new LinkedTransferQueue();
854              q.tryTransfer(null);
855              shouldThrow();
856 <        } catch (NullPointerException ex) {
995 <        }
856 >        } catch (NullPointerException success) {}
857      }
858  
859      /**
# Line 1015 | Line 876 | public class LinkedTransferQueueTest ext
876          final LinkedTransferQueue q = new LinkedTransferQueue();
877  
878          Thread t = newStartedThread(new CheckedRunnable() {
879 <            void realRun() {
879 >            public void realRun() {
880                  while (! q.hasWaitingConsumer())
881                      Thread.yield();
882 <                threadAssertTrue(q.hasWaitingConsumer());
883 <                threadAssertTrue(q.isEmpty());
884 <                threadAssertTrue(q.size() == 0);
1024 <                threadAssertTrue(q.tryTransfer(hotPotato));
882 >                assertTrue(q.hasWaitingConsumer());
883 >                checkEmpty(q);
884 >                assertTrue(q.tryTransfer(hotPotato));
885              }});
886  
887 <        assertTrue(q.poll(MEDIUM_DELAY_MS, MILLISECONDS) == hotPotato);
887 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
888          checkEmpty(q);
889 <        t.join();
889 >        awaitTermination(t, MEDIUM_DELAY_MS);
890      }
891  
892      /**
# Line 1038 | Line 898 | public class LinkedTransferQueueTest ext
898          final LinkedTransferQueue q = new LinkedTransferQueue();
899  
900          Thread t = newStartedThread(new CheckedRunnable() {
901 <            void realRun() {
901 >            public void realRun() {
902                  while (! q.hasWaitingConsumer())
903                      Thread.yield();
904 <                threadAssertTrue(q.hasWaitingConsumer());
905 <                threadAssertTrue(q.isEmpty());
906 <                threadAssertTrue(q.size() == 0);
1047 <                threadAssertTrue(q.tryTransfer(hotPotato));
904 >                assertTrue(q.hasWaitingConsumer());
905 >                checkEmpty(q);
906 >                assertTrue(q.tryTransfer(hotPotato));
907              }});
908  
909 <        assertTrue(q.take() == hotPotato);
909 >        assertSame(q.take(), hotPotato);
910          checkEmpty(q);
911 <        t.join();
911 >        awaitTermination(t, MEDIUM_DELAY_MS);
912      }
913  
914      /**
915 <     * tryTransfer waits the amount given if interrupted, and
1057 <     * throws interrupted exception
915 >     * tryTransfer blocks interruptibly if no takers
916       */
917      public void testTryTransfer5() throws InterruptedException {
918          final LinkedTransferQueue q = new LinkedTransferQueue();
919 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
920 +        assertTrue(q.isEmpty());
921  
922 <        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
923 <            void realRun() throws InterruptedException {
924 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
922 >        Thread t = newStartedThread(new CheckedRunnable() {
923 >            public void realRun() throws InterruptedException {
924 >                Thread.currentThread().interrupt();
925 >                try {
926 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
927 >                    shouldThrow();
928 >                } catch (InterruptedException success) {}
929 >                assertFalse(Thread.interrupted());
930 >
931 >                pleaseInterrupt.countDown();
932 >                try {
933 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
934 >                    shouldThrow();
935 >                } catch (InterruptedException success) {}
936 >                assertFalse(Thread.interrupted());
937              }});
938  
939 <        Thread.sleep(SMALL_DELAY_MS);
940 <        toInterrupt.interrupt();
941 <        toInterrupt.join();
939 >        await(pleaseInterrupt);
940 >        assertThreadStaysAlive(t);
941 >        t.interrupt();
942 >        awaitTermination(t);
943 >        checkEmpty(q);
944      }
945  
946      /**
947 <     * tryTransfer gives up after the timeout and return false
947 >     * tryTransfer gives up after the timeout and returns false
948       */
949      public void testTryTransfer6() throws InterruptedException {
950          final LinkedTransferQueue q = new LinkedTransferQueue();
951  
952          Thread t = newStartedThread(new CheckedRunnable() {
953 <            void realRun() throws InterruptedException {
954 <                threadAssertFalse
955 <                    (q.tryTransfer(new Object(),
956 <                                   SHORT_DELAY_MS, MILLISECONDS));
953 >            public void realRun() throws InterruptedException {
954 >                long t0 = System.nanoTime();
955 >                assertFalse(q.tryTransfer(new Object(),
956 >                                          timeoutMillis(), MILLISECONDS));
957 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
958 >                checkEmpty(q);
959              }});
960  
961 <        Thread.sleep(SMALL_DELAY_MS);
961 >        awaitTermination(t);
962          checkEmpty(q);
1087        t.join();
963      }
964  
965      /**
# Line 1096 | Line 971 | public class LinkedTransferQueueTest ext
971          assertTrue(q.offer(four));
972  
973          Thread t = newStartedThread(new CheckedRunnable() {
974 <            void realRun() throws InterruptedException {
975 <                threadAssertTrue(q.tryTransfer(five,
976 <                                               MEDIUM_DELAY_MS, MILLISECONDS));
1102 <                threadAssertTrue(q.isEmpty());
974 >            public void realRun() throws InterruptedException {
975 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
976 >                checkEmpty(q);
977              }});
978  
979 <        Thread.sleep(SHORT_DELAY_MS);
979 >        while (q.size() != 2)
980 >            Thread.yield();
981          assertEquals(2, q.size());
982 <        assertEquals(four, q.poll());
983 <        assertEquals(five, q.poll());
982 >        assertSame(four, q.poll());
983 >        assertSame(five, q.poll());
984          checkEmpty(q);
985 <        t.join();
985 >        awaitTermination(t, MEDIUM_DELAY_MS);
986      }
987  
988      /**
989 <     * tryTransfer attempts to enqueue into the q and fails returning
990 <     * false not enqueueing and the successive poll is null
989 >     * tryTransfer attempts to enqueue into the queue and fails
990 >     * returning false not enqueueing and the successive poll is null
991       */
992      public void testTryTransfer8() throws InterruptedException {
993          final LinkedTransferQueue q = new LinkedTransferQueue();
994          assertTrue(q.offer(four));
995          assertEquals(1, q.size());
996 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
996 >        long t0 = System.nanoTime();
997 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
998 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
999          assertEquals(1, q.size());
1000 <        assertEquals(four, q.poll());
1124 <        checkEmpty(q);
1000 >        assertSame(four, q.poll());
1001          assertNull(q.poll());
1002 +        checkEmpty(q);
1003      }
1004  
1005      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1006          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1007 <        assertTrue(q.isEmpty());
1007 >        checkEmpty(q);
1008          for (int i = 0; i < n; i++) {
1009              assertEquals(i, q.size());
1010              assertTrue(q.offer(i));
# Line 1136 | Line 1013 | public class LinkedTransferQueueTest ext
1013          assertFalse(q.isEmpty());
1014          return q;
1015      }
1139
1140    private static class ConsumerObserver {
1141
1142        private int waitingConsumers;
1143
1144        private ConsumerObserver() {
1145        }
1146
1147        private void setWaitingConsumer(int i) {
1148            this.waitingConsumers = i;
1149        }
1150
1151        private int getWaitingConsumers() {
1152            return waitingConsumers;
1153        }
1154    }
1016   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines