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.7 by jsr166, Mon Aug 3 19:07:51 2009 UTC vs.
Revision 1.41 by jsr166, Thu Nov 18 18:49:44 2010 UTC

# Line 13 | Line 13 | import java.io.ObjectInputStream;
13   import java.io.ObjectOutputStream;
14   import java.util.ArrayList;
15   import java.util.Arrays;
16 import java.util.ConcurrentModificationException;
16   import java.util.Iterator;
17 + import java.util.List;
18   import java.util.NoSuchElementException;
19   import java.util.concurrent.*;
20   import static java.util.concurrent.TimeUnit.MILLISECONDS;
21 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
22   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);
39 >        return newTestSuite(LinkedTransferQueueTest.class,
40 >                            new Generic().testSuite());
41 >    }
42 >
43 >    void checkEmpty(BlockingQueue q) {
44 >        try {
45 >            assertTrue(q.isEmpty());
46 >            assertEquals(0, q.size());
47 >            assertNull(q.peek());
48 >            assertNull(q.poll());
49 >            assertNull(q.poll(0, MILLISECONDS));
50 >            assertEquals(q.toString(), "[]");
51 >            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
52 >            assertFalse(q.iterator().hasNext());
53 >            try {
54 >                q.element();
55 >                shouldThrow();
56 >            } catch (NoSuchElementException success) {}
57 >            try {
58 >                q.iterator().next();
59 >                shouldThrow();
60 >            } catch (NoSuchElementException success) {}
61 >            try {
62 >                q.remove();
63 >                shouldThrow();
64 >            } catch (NoSuchElementException success) {}
65 >        } catch (InterruptedException ie) {
66 >            threadUnexpectedException(ie);
67 >        }
68      }
69  
70      /**
# Line 48 | Line 84 | public class LinkedTransferQueueTest ext
84          try {
85              new LinkedTransferQueue(null);
86              shouldThrow();
87 <        } catch (NullPointerException success) {
52 <        }
87 >        } catch (NullPointerException success) {}
88      }
89  
90      /**
# Line 61 | Line 96 | public class LinkedTransferQueueTest ext
96              Integer[] ints = new Integer[SIZE];
97              new LinkedTransferQueue(Arrays.asList(ints));
98              shouldThrow();
99 <        } catch (NullPointerException success) {
65 <        }
99 >        } catch (NullPointerException success) {}
100      }
101  
102      /**
# Line 77 | Line 111 | public class LinkedTransferQueueTest ext
111              }
112              new LinkedTransferQueue(Arrays.asList(ints));
113              shouldThrow();
114 <        } catch (NullPointerException success) {
81 <        }
114 >        } catch (NullPointerException success) {}
115      }
116  
117      /**
118       * Queue contains all elements of the collection it is initialized by
119       */
120      public void testConstructor5() {
121 <        try {
122 <            Integer[] ints = new Integer[SIZE];
123 <            for (int i = 0; i < SIZE; ++i) {
124 <                ints[i] = i;
125 <            }
126 <            LinkedTransferQueue q
127 <                = new LinkedTransferQueue(Arrays.asList(ints));
128 <            for (int i = 0; i < SIZE; ++i) {
129 <                assertEquals(ints[i], q.poll());
130 <            }
131 <        } finally {
121 >        Integer[] ints = new Integer[SIZE];
122 >        for (int i = 0; i < SIZE; ++i) {
123 >            ints[i] = i;
124 >        }
125 >        List intList = Arrays.asList(ints);
126 >        LinkedTransferQueue q
127 >            = new LinkedTransferQueue(intList);
128 >        assertEquals(q.size(), intList.size());
129 >        assertEquals(q.toString(), intList.toString());
130 >        assertTrue(Arrays.equals(q.toArray(),
131 >                                     intList.toArray()));
132 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
133 >                                 intList.toArray(new Object[0])));
134 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
135 >                                 intList.toArray(new Object[SIZE])));
136 >        for (int i = 0; i < SIZE; ++i) {
137 >            assertEquals(ints[i], q.poll());
138          }
139      }
140  
141      /**
142 <     * Remaining capacity never decrease nor increase on add or remove
142 >     * remainingCapacity() always returns Integer.MAX_VALUE
143       */
144      public void testRemainingCapacity() {
145          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 124 | Line 163 | public class LinkedTransferQueueTest ext
163              LinkedTransferQueue q = new LinkedTransferQueue();
164              q.offer(null);
165              shouldThrow();
166 <        } catch (NullPointerException success) {
128 <        }
166 >        } catch (NullPointerException success) {}
167      }
168  
169      /**
# Line 136 | Line 174 | public class LinkedTransferQueueTest ext
174              LinkedTransferQueue q = new LinkedTransferQueue();
175              q.add(null);
176              shouldThrow();
177 <        } catch (NullPointerException success) {
140 <        }
177 >        } catch (NullPointerException success) {}
178      }
179  
180      /**
# Line 148 | Line 185 | public class LinkedTransferQueueTest ext
185              LinkedTransferQueue q = new LinkedTransferQueue();
186              q.addAll(null);
187              shouldThrow();
188 <        } catch (NullPointerException success) {
152 <        }
188 >        } catch (NullPointerException success) {}
189      }
190  
191      /**
# Line 160 | Line 196 | public class LinkedTransferQueueTest ext
196              LinkedTransferQueue q = populatedQueue(SIZE);
197              q.addAll(q);
198              shouldThrow();
199 <        } catch (IllegalArgumentException success) {
164 <        }
199 >        } catch (IllegalArgumentException success) {}
200      }
201  
202      /**
# Line 173 | Line 208 | public class LinkedTransferQueueTest ext
208              Integer[] ints = new Integer[SIZE];
209              q.addAll(Arrays.asList(ints));
210              shouldThrow();
211 <        } catch (NullPointerException success) {
177 <        }
211 >        } catch (NullPointerException success) {}
212      }
213  
214      /**
# Line 190 | Line 224 | public class LinkedTransferQueueTest ext
224              }
225              q.addAll(Arrays.asList(ints));
226              shouldThrow();
227 <        } catch (NullPointerException success) {
194 <        }
227 >        } catch (NullPointerException success) {}
228      }
229  
230      /**
# Line 228 | Line 261 | public class LinkedTransferQueueTest ext
261      public void testPut() {
262          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
263          for (int i = 0; i < SIZE; ++i) {
264 +            assertEquals(q.size(), i);
265              q.put(i);
266              assertTrue(q.contains(i));
267          }
234        assertEquals(q.size(), SIZE);
268      }
269  
270      /**
# Line 245 | Line 278 | public class LinkedTransferQueueTest ext
278      }
279  
280      /**
281 <     * take blocks interruptibly when empty
249 <     */
250 <    public void testTakeFromEmpty() throws InterruptedException {
251 <        final LinkedTransferQueue q = new LinkedTransferQueue();
252 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
253 <            void realRun() throws InterruptedException {
254 <                q.take();
255 <            }});
256 <        t.start();
257 <        Thread.sleep(SHORT_DELAY_MS);
258 <        t.interrupt();
259 <        t.join();
260 <    }
261 <
262 <    /**
263 <     * Take removes existing elements until empty, then blocks interruptibly
281 >     * take removes existing elements until empty, then blocks interruptibly
282       */
283      public void testBlockingTake() throws InterruptedException {
284 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
285 <            void realRun() throws InterruptedException {
286 <                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
284 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
285 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
286 >        Thread t = newStartedThread(new CheckedRunnable() {
287 >            public void realRun() throws InterruptedException {
288                  for (int i = 0; i < SIZE; ++i) {
289 <                    threadAssertEquals(i, (int) q.take());
289 >                    assertEquals(i, (int) q.take());
290                  }
291 <                q.take();
291 >                aboutToWait.countDown();
292 >                try {
293 >                    q.take();
294 >                    shouldThrow();
295 >                } catch (InterruptedException success) {}
296              }});
297 <        t.start();
298 <        Thread.sleep(SHORT_DELAY_MS);
297 >
298 >        aboutToWait.await();
299 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
300          t.interrupt();
301 <        t.join();
301 >        awaitTermination(t, MEDIUM_DELAY_MS);
302 >        checkEmpty(q);
303      }
304  
305      /**
306       * poll succeeds unless empty
307       */
308 <    public void testPoll() {
308 >    public void testPoll() throws InterruptedException {
309          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
310          for (int i = 0; i < SIZE; ++i) {
311              assertEquals(i, (int) q.poll());
312          }
313          assertNull(q.poll());
314 +        checkEmpty(q);
315      }
316  
317      /**
318 <     * timed pool with zero timeout succeeds when non-empty, else times out
318 >     * timed poll with zero timeout succeeds when non-empty, else times out
319       */
320      public void testTimedPoll0() throws InterruptedException {
321          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 297 | Line 323 | public class LinkedTransferQueueTest ext
323              assertEquals(i, (int) q.poll(0, MILLISECONDS));
324          }
325          assertNull(q.poll(0, MILLISECONDS));
326 +        checkEmpty(q);
327      }
328  
329      /**
330 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
330 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
331       */
332      public void testTimedPoll() throws InterruptedException {
333          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
334          for (int i = 0; i < SIZE; ++i) {
335 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
335 >            long t0 = System.nanoTime();
336 >            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
337 >            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
338          }
339 +        long t0 = System.nanoTime();
340          assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
341 +        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
342 +        checkEmpty(q);
343      }
344  
345      /**
# Line 315 | Line 347 | public class LinkedTransferQueueTest ext
347       * returning timeout status
348       */
349      public void testInterruptedTimedPoll() throws InterruptedException {
350 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
351 <            void realRun() throws InterruptedException {
352 <                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
350 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
351 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
352 >        Thread t = newStartedThread(new CheckedRunnable() {
353 >            public void realRun() throws InterruptedException {
354                  for (int i = 0; i < SIZE; ++i) {
355 <                    threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS,
356 <                                                       MILLISECONDS));
355 >                    long t0 = System.nanoTime();
356 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
357 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
358 >                }
359 >                long t0 = System.nanoTime();
360 >                aboutToWait.countDown();
361 >                try {
362 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
363 >                    shouldThrow();
364 >                } catch (InterruptedException success) {
365 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
366                  }
325                q.poll(SHORT_DELAY_MS, MILLISECONDS);
367              }});
368 <        t.start();
369 <        Thread.sleep(SHORT_DELAY_MS);
368 >
369 >        aboutToWait.await();
370 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
371          t.interrupt();
372 <        t.join();
372 >        awaitTermination(t, MEDIUM_DELAY_MS);
373 >        checkEmpty(q);
374      }
375  
376      /**
377 <     * timed poll before a delayed offer fails; after offer succeeds;
378 <     * on interruption throws
377 >     * timed poll after thread interrupted throws InterruptedException
378 >     * instead of returning timeout status
379       */
380 <    public void testTimedPollWithOffer() throws InterruptedException {
381 <        final LinkedTransferQueue q = new LinkedTransferQueue();
382 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
383 <            void realRun() throws InterruptedException {
384 <                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
385 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
386 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
380 >    public void testTimedPollAfterInterrupt() throws InterruptedException {
381 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
382 >        Thread t = newStartedThread(new CheckedRunnable() {
383 >            public void realRun() throws InterruptedException {
384 >                Thread.currentThread().interrupt();
385 >                for (int i = 0; i < SIZE; ++i) {
386 >                    long t0 = System.nanoTime();
387 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
388 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
389 >                }
390 >                try {
391 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
392 >                    shouldThrow();
393 >                } catch (InterruptedException success) {}
394              }});
395 <        t.start();
396 <        Thread.sleep(SMALL_DELAY_MS);
397 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
348 <        t.interrupt();
349 <        t.join();
395 >
396 >        awaitTermination(t, MEDIUM_DELAY_MS);
397 >        checkEmpty(q);
398      }
399  
400      /**
401       * peek returns next element, or null if empty
402       */
403 <    public void testPeek() {
403 >    public void testPeek() throws InterruptedException {
404          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
405          for (int i = 0; i < SIZE; ++i) {
406              assertEquals(i, (int) q.peek());
# Line 361 | Line 409 | public class LinkedTransferQueueTest ext
409                         i != (int) q.peek());
410          }
411          assertNull(q.peek());
412 +        checkEmpty(q);
413      }
414  
415      /**
416       * element returns next element, or throws NoSuchElementException if empty
417       */
418 <    public void testElement() {
418 >    public void testElement() throws InterruptedException {
419          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
420          for (int i = 0; i < SIZE; ++i) {
421              assertEquals(i, (int) q.element());
# Line 375 | Line 424 | public class LinkedTransferQueueTest ext
424          try {
425              q.element();
426              shouldThrow();
427 <        } catch (NoSuchElementException success) {
428 <        }
427 >        } catch (NoSuchElementException success) {}
428 >        checkEmpty(q);
429      }
430  
431      /**
432       * remove removes next element, or throws NoSuchElementException if empty
433       */
434 <    public void testRemove() {
434 >    public void testRemove() throws InterruptedException {
435          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
436          for (int i = 0; i < SIZE; ++i) {
437              assertEquals(i, (int) q.remove());
# Line 390 | Line 439 | public class LinkedTransferQueueTest ext
439          try {
440              q.remove();
441              shouldThrow();
442 <        } catch (NoSuchElementException success) {
443 <        }
442 >        } catch (NoSuchElementException success) {}
443 >        checkEmpty(q);
444      }
445  
446      /**
447       * remove(x) removes x and returns true if present
448       */
449 <    public void testRemoveElement() {
449 >    public void testRemoveElement() throws InterruptedException {
450          LinkedTransferQueue q = populatedQueue(SIZE);
451          for (int i = 1; i < SIZE; i += 2) {
452              assertTrue(q.remove(i));
# Line 406 | Line 455 | public class LinkedTransferQueueTest ext
455              assertTrue(q.remove(i));
456              assertFalse(q.remove(i + 1));
457          }
458 <        assertTrue(q.isEmpty());
458 >        checkEmpty(q);
459      }
460  
461      /**
# Line 419 | Line 468 | public class LinkedTransferQueueTest ext
468          assertTrue(q.remove(one));
469          assertTrue(q.remove(two));
470          assertTrue(q.add(three));
471 <        assertTrue(q.take() != null);
471 >        assertSame(q.take(), three);
472      }
473  
474      /**
# Line 437 | Line 486 | public class LinkedTransferQueueTest ext
486      /**
487       * clear removes all elements
488       */
489 <    public void testClear() {
489 >    public void testClear() throws InterruptedException {
490          LinkedTransferQueue q = populatedQueue(SIZE);
491          q.clear();
492 <        assertTrue(q.isEmpty());
444 <        assertEquals(0, q.size());
492 >        checkEmpty(q);
493          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
494          q.add(one);
495          assertFalse(q.isEmpty());
496 +        assertEquals(1, q.size());
497          assertTrue(q.contains(one));
498          q.clear();
499 <        assertTrue(q.isEmpty());
499 >        checkEmpty(q);
500      }
501  
502      /**
# Line 501 | Line 550 | public class LinkedTransferQueueTest ext
550      }
551  
552      /**
553 <     * toArray contains all elements
553 >     * toArray() contains all elements in FIFO order
554       */
555 <    public void testToArray() throws InterruptedException {
555 >    public void testToArray() {
556          LinkedTransferQueue q = populatedQueue(SIZE);
557          Object[] o = q.toArray();
558          for (int i = 0; i < o.length; i++) {
559 <            assertEquals(o[i], q.take());
559 >            assertSame(o[i], q.poll());
560          }
561      }
562  
563      /**
564 <     * toArray(a) contains all elements
564 >     * toArray(a) contains all elements in FIFO order
565       */
566 <    public void testToArray2() throws InterruptedException {
566 >    public void testToArray2() {
567          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
568          Integer[] ints = new Integer[SIZE];
569 <        ints = q.toArray(ints);
569 >        Integer[] array = q.toArray(ints);
570 >        assertSame(ints, array);
571          for (int i = 0; i < ints.length; i++) {
572 <            assertEquals(ints[i], q.take());
572 >            assertSame(ints[i], q.poll());
573          }
574      }
575  
576      /**
577       * toArray(null) throws NullPointerException
578       */
579 <    public void testToArray_BadArg() {
579 >    public void testToArray_NullArg() {
580 >        LinkedTransferQueue q = populatedQueue(SIZE);
581          try {
582 <            LinkedTransferQueue q = populatedQueue(SIZE);
532 <            Object o[] = q.toArray(null);
582 >            q.toArray(null);
583              shouldThrow();
584 <        } catch (NullPointerException success) {
535 <        }
584 >        } catch (NullPointerException success) {}
585      }
586  
587      /**
588 <     * toArray with incompatible array type throws CCE
588 >     * toArray(incompatible array type) throws ArrayStoreException
589       */
590      public void testToArray1_BadArg() {
591 +        LinkedTransferQueue q = populatedQueue(SIZE);
592          try {
593 <            LinkedTransferQueue q = populatedQueue(SIZE);
544 <            Object o[] = q.toArray(new String[10]);
593 >            q.toArray(new String[10]);
594              shouldThrow();
595 <        } catch (ArrayStoreException success) {
547 <        }
595 >        } catch (ArrayStoreException success) {}
596      }
597  
598      /**
# Line 553 | Line 601 | public class LinkedTransferQueueTest ext
601      public void testIterator() throws InterruptedException {
602          LinkedTransferQueue q = populatedQueue(SIZE);
603          Iterator it = q.iterator();
604 +        int i = 0;
605          while (it.hasNext()) {
606 <            assertEquals(it.next(), q.take());
606 >            assertEquals(it.next(), i++);
607          }
608 +        assertEquals(i, SIZE);
609      }
610  
611      /**
612 <     * iterator.remove removes current element
612 >     * iterator.remove() removes current element
613       */
614      public void testIteratorRemove() {
615          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 572 | Line 622 | public class LinkedTransferQueueTest ext
622          it.remove();
623  
624          it = q.iterator();
625 <        assertEquals(it.next(), one);
626 <        assertEquals(it.next(), three);
625 >        assertSame(it.next(), one);
626 >        assertSame(it.next(), three);
627          assertFalse(it.hasNext());
628      }
629  
# Line 626 | Line 676 | public class LinkedTransferQueueTest ext
676       */
677      public void testOfferInExecutor() {
678          final LinkedTransferQueue q = new LinkedTransferQueue();
679 <        q.add(one);
630 <        q.add(two);
679 >        final CountDownLatch threadsStarted = new CountDownLatch(2);
680          ExecutorService executor = Executors.newFixedThreadPool(2);
681  
682          executor.execute(new CheckedRunnable() {
683 <            void realRun() {
684 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
685 <                                         MILLISECONDS));
683 >            public void realRun() throws InterruptedException {
684 >                threadsStarted.countDown();
685 >                threadsStarted.await();
686 >                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
687              }});
688  
689          executor.execute(new CheckedRunnable() {
690 <            void realRun() throws InterruptedException {
691 <                Thread.sleep(SMALL_DELAY_MS);
692 <                threadAssertEquals(one, q.take());
690 >            public void realRun() throws InterruptedException {
691 >                threadsStarted.countDown();
692 >                threadsStarted.await();
693 >                assertSame(one, q.take());
694 >                checkEmpty(q);
695              }});
696  
697          joinPool(executor);
698      }
699  
700      /**
701 <     * poll retrieves elements across Executor threads
701 >     * timed poll retrieves elements across Executor threads
702       */
703      public void testPollInExecutor() {
704          final LinkedTransferQueue q = new LinkedTransferQueue();
705 +        final CountDownLatch threadsStarted = new CountDownLatch(2);
706          ExecutorService executor = Executors.newFixedThreadPool(2);
707  
708          executor.execute(new CheckedRunnable() {
709 <            void realRun() throws InterruptedException {
710 <                threadAssertNull(q.poll());
711 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
712 <                                                MILLISECONDS));
713 <                threadAssertTrue(q.isEmpty());
709 >            public void realRun() throws InterruptedException {
710 >                assertNull(q.poll());
711 >                threadsStarted.countDown();
712 >                threadsStarted.await();
713 >                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
714 >                checkEmpty(q);
715              }});
716  
717          executor.execute(new CheckedRunnable() {
718 <            void realRun() throws InterruptedException {
719 <                Thread.sleep(SMALL_DELAY_MS);
718 >            public void realRun() throws InterruptedException {
719 >                threadsStarted.countDown();
720 >                threadsStarted.await();
721                  q.put(one);
722              }});
723  
# Line 688 | Line 743 | public class LinkedTransferQueueTest ext
743          LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
744  
745          assertEquals(q.size(), r.size());
746 +        assertEquals(q.toString(), r.toString());
747 +        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
748          while (!q.isEmpty()) {
749              assertEquals(q.remove(), r.remove());
750          }
# Line 701 | Line 758 | public class LinkedTransferQueueTest ext
758          try {
759              q.drainTo(null);
760              shouldThrow();
761 <        } catch (NullPointerException success) {
705 <        }
761 >        } catch (NullPointerException success) {}
762      }
763  
764      /**
# Line 713 | Line 769 | public class LinkedTransferQueueTest ext
769          try {
770              q.drainTo(q);
771              shouldThrow();
772 <        } catch (IllegalArgumentException success) {
717 <        }
772 >        } catch (IllegalArgumentException success) {}
773      }
774  
775      /**
# Line 744 | Line 799 | public class LinkedTransferQueueTest ext
799      }
800  
801      /**
802 <     * drainTo empties full queue, unblocking a waiting put.
802 >     * drainTo(c) empties full queue, unblocking a waiting put.
803       */
804      public void testDrainToWithActivePut() throws InterruptedException {
805          final LinkedTransferQueue q = populatedQueue(SIZE);
806 <        Thread t = new Thread(new CheckedRunnable() {
807 <            void realRun() {
806 >        Thread t = newStartedThread(new CheckedRunnable() {
807 >            public void realRun() {
808                  q.put(SIZE + 1);
809              }});
755        t.start();
810          ArrayList l = new ArrayList();
811          q.drainTo(l);
812          assertTrue(l.size() >= SIZE);
813          for (int i = 0; i < SIZE; ++i) {
814              assertEquals(l.get(i), i);
815          }
816 <        t.join();
816 >        awaitTermination(t, MEDIUM_DELAY_MS);
817          assertTrue(q.size() + l.size() >= SIZE);
818      }
819  
# Line 769 | Line 823 | public class LinkedTransferQueueTest ext
823      public void testDrainToNullN() {
824          LinkedTransferQueue q = populatedQueue(SIZE);
825          try {
826 <            q.drainTo(null, 0);
826 >            q.drainTo(null, SIZE);
827              shouldThrow();
828 <        } catch (NullPointerException success) {
775 <        }
828 >        } catch (NullPointerException success) {}
829      }
830  
831      /**
# Line 781 | Line 834 | public class LinkedTransferQueueTest ext
834      public void testDrainToSelfN() {
835          LinkedTransferQueue q = populatedQueue(SIZE);
836          try {
837 <            q.drainTo(q, 0);
837 >            q.drainTo(q, SIZE);
838              shouldThrow();
839 <        } catch (IllegalArgumentException success) {
787 <        }
839 >        } catch (IllegalArgumentException success) {}
840      }
841  
842      /**
843 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
843 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
844       */
845      public void testDrainToN() {
846          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 810 | Line 862 | public class LinkedTransferQueueTest ext
862      }
863  
864      /**
865 <     * poll and take decrement the waiting consumer count
865 >     * timed poll() or take() increments the waiting consumer count;
866 >     * offer(e) decrements the waiting consumer count
867       */
868      public void testWaitingConsumer() throws InterruptedException {
869          final LinkedTransferQueue q = new LinkedTransferQueue();
870 <        final ConsumerObserver waiting = new ConsumerObserver();
871 <        new Thread(new CheckedRunnable() {
872 <            void realRun() {
873 <                threadAssertTrue(q.hasWaitingConsumer());
874 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
875 <                threadAssertTrue(q.offer(new Object()));
876 <            }}).start();
877 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
878 <        assertTrue(q.getWaitingConsumerCount()
879 <                   < waiting.getWaitingConsumers());
870 >        assertEquals(q.getWaitingConsumerCount(), 0);
871 >        assertFalse(q.hasWaitingConsumer());
872 >        final CountDownLatch threadStarted = new CountDownLatch(1);
873 >
874 >        Thread t = newStartedThread(new CheckedRunnable() {
875 >            public void realRun() throws InterruptedException {
876 >                threadStarted.countDown();
877 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
878 >                assertEquals(q.getWaitingConsumerCount(), 0);
879 >                assertFalse(q.hasWaitingConsumer());
880 >            }});
881 >
882 >        threadStarted.await();
883 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
884 >        assertEquals(q.getWaitingConsumerCount(), 1);
885 >        assertTrue(q.hasWaitingConsumer());
886 >
887 >        assertTrue(q.offer(one));
888 >        assertEquals(q.getWaitingConsumerCount(), 0);
889 >        assertFalse(q.hasWaitingConsumer());
890 >
891 >        awaitTermination(t, MEDIUM_DELAY_MS);
892      }
893  
894      /**
# Line 834 | Line 899 | public class LinkedTransferQueueTest ext
899              LinkedTransferQueue q = new LinkedTransferQueue();
900              q.transfer(null);
901              shouldThrow();
902 <        } catch (NullPointerException ex) {
838 <        }
902 >        } catch (NullPointerException success) {}
903      }
904  
905      /**
# Line 845 | Line 909 | public class LinkedTransferQueueTest ext
909      public void testTransfer2() throws InterruptedException {
910          final LinkedTransferQueue<Integer> q
911              = new LinkedTransferQueue<Integer>();
912 +        final CountDownLatch threadStarted = new CountDownLatch(1);
913  
914 <        new Thread(new CheckedRunnable() {
915 <            void realRun() throws InterruptedException {
916 <                q.transfer(SIZE);
917 <                threadAssertTrue(q.isEmpty());
918 <            }}).start();
914 >        Thread t = newStartedThread(new CheckedRunnable() {
915 >            public void realRun() throws InterruptedException {
916 >                threadStarted.countDown();
917 >                q.transfer(five);
918 >                checkEmpty(q);
919 >            }});
920  
921 <        Thread.sleep(SHORT_DELAY_MS);
921 >        threadStarted.await();
922 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
923          assertEquals(1, q.size());
924 <        assertEquals(SIZE, (int) q.poll());
925 <        assertTrue(q.isEmpty());
924 >        assertSame(five, q.poll());
925 >        checkEmpty(q);
926 >        awaitTermination(t, MEDIUM_DELAY_MS);
927      }
928  
929      /**
# Line 865 | Line 933 | public class LinkedTransferQueueTest ext
933          final LinkedTransferQueue<Integer> q
934              = new LinkedTransferQueue<Integer>();
935  
936 <        Thread first = new Thread(new CheckedRunnable() {
937 <            void realRun() throws InterruptedException {
938 <                Integer i = SIZE + 1;
939 <                q.transfer(i);
940 <                threadAssertTrue(!q.contains(i));
873 <                threadAssertEquals(1, q.size());
936 >        Thread first = newStartedThread(new CheckedRunnable() {
937 >            public void realRun() throws InterruptedException {
938 >                q.transfer(four);
939 >                assertTrue(!q.contains(four));
940 >                assertEquals(1, q.size());
941              }});
875        first.start();
942  
943 <        Thread interruptedThread = new Thread(new CheckedInterruptedRunnable() {
944 <            void realRun() throws InterruptedException {
945 <                while (q.size() == 0)
946 <                    Thread.yield();
947 <                q.transfer(SIZE);
948 <            }});
949 <        interruptedThread.start();
943 >        Thread interruptedThread = newStartedThread(
944 >            new CheckedInterruptedRunnable() {
945 >                public void realRun() throws InterruptedException {
946 >                    while (q.isEmpty())
947 >                        Thread.yield();
948 >                    q.transfer(five);
949 >                }});
950  
951          while (q.size() < 2)
952              Thread.yield();
953          assertEquals(2, q.size());
954 <        assertEquals(SIZE + 1, (int) q.poll());
954 >        assertSame(four, q.poll());
955          first.join();
956          assertEquals(1, q.size());
957          interruptedThread.interrupt();
958          interruptedThread.join();
959 <        assertEquals(0, q.size());
894 <        assertTrue(q.isEmpty());
959 >        checkEmpty(q);
960      }
961  
962      /**
# Line 900 | Line 965 | public class LinkedTransferQueueTest ext
965       */
966      public void testTransfer4() throws InterruptedException {
967          final LinkedTransferQueue q = new LinkedTransferQueue();
968 <        new Thread(new CheckedRunnable() {
969 <            void realRun() throws InterruptedException {
968 >
969 >        Thread t = newStartedThread(new CheckedRunnable() {
970 >            public void realRun() throws InterruptedException {
971                  q.transfer(four);
972 <                threadAssertFalse(q.contains(four));
973 <                threadAssertEquals(three, q.poll());
974 <            }}).start();
975 <        Thread.sleep(MEDIUM_DELAY_MS);
972 >                assertFalse(q.contains(four));
973 >                assertSame(three, q.poll());
974 >            }});
975 >
976 >        while (q.isEmpty())
977 >            Thread.yield();
978 >        assertFalse(q.isEmpty());
979 >        assertEquals(1, q.size());
980          assertTrue(q.offer(three));
981 <        assertEquals(four, q.poll());
981 >        assertSame(four, q.poll());
982 >        awaitTermination(t, MEDIUM_DELAY_MS);
983      }
984  
985      /**
# Line 919 | Line 990 | public class LinkedTransferQueueTest ext
990          final LinkedTransferQueue<Integer> q
991              = new LinkedTransferQueue<Integer>();
992  
993 <        new Thread(new CheckedRunnable() {
994 <            void realRun() throws InterruptedException {
995 <                q.transfer(SIZE);
996 <                threadAssertTrue(q.isEmpty());
997 <            }}).start();
993 >        Thread t = newStartedThread(new CheckedRunnable() {
994 >            public void realRun() throws InterruptedException {
995 >                q.transfer(four);
996 >                checkEmpty(q);
997 >            }});
998  
999 <        Thread.sleep(SHORT_DELAY_MS);
1000 <        assertEquals(SIZE, (int) q.take());
1001 <        assertTrue(q.isEmpty());
999 >        while (q.isEmpty())
1000 >            Thread.yield();
1001 >        assertFalse(q.isEmpty());
1002 >        assertEquals(1, q.size());
1003 >        assertSame(four, q.take());
1004 >        checkEmpty(q);
1005 >        awaitTermination(t, MEDIUM_DELAY_MS);
1006      }
1007  
1008      /**
# Line 937 | Line 1012 | public class LinkedTransferQueueTest ext
1012          try {
1013              final LinkedTransferQueue q = new LinkedTransferQueue();
1014              q.tryTransfer(null);
1015 <            this.shouldThrow();
1016 <        } catch (NullPointerException ex) {
942 <        }
1015 >            shouldThrow();
1016 >        } catch (NullPointerException success) {}
1017      }
1018  
1019      /**
1020       * tryTransfer returns false and does not enqueue if there are no
1021       * consumers waiting to poll or take.
1022       */
1023 <    public void testTryTransfer2() {
1023 >    public void testTryTransfer2() throws InterruptedException {
1024          final LinkedTransferQueue q = new LinkedTransferQueue();
1025          assertFalse(q.tryTransfer(new Object()));
1026          assertFalse(q.hasWaitingConsumer());
1027 <        assertTrue(q.isEmpty());
954 <        assertEquals(0, q.size());
1027 >        checkEmpty(q);
1028      }
1029  
1030      /**
# Line 961 | Line 1034 | public class LinkedTransferQueueTest ext
1034      public void testTryTransfer3() throws InterruptedException {
1035          final Object hotPotato = new Object();
1036          final LinkedTransferQueue q = new LinkedTransferQueue();
1037 <        new Thread(new CheckedRunnable() {
1038 <            void realRun() {
1037 >
1038 >        Thread t = newStartedThread(new CheckedRunnable() {
1039 >            public void realRun() {
1040                  while (! q.hasWaitingConsumer())
1041                      Thread.yield();
1042 <                threadAssertTrue(q.hasWaitingConsumer());
1043 <                threadAssertTrue(q.isEmpty());
1044 <                threadAssertTrue(q.size() == 0);
1045 <                threadAssertTrue(q.tryTransfer(hotPotato));
1046 <            }}).start();
1047 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) == hotPotato);
1048 <        assertTrue(q.isEmpty());
1042 >                assertTrue(q.hasWaitingConsumer());
1043 >                checkEmpty(q);
1044 >                assertTrue(q.tryTransfer(hotPotato));
1045 >            }});
1046 >
1047 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1048 >        checkEmpty(q);
1049 >        awaitTermination(t, MEDIUM_DELAY_MS);
1050      }
1051  
1052      /**
# Line 981 | Line 1056 | public class LinkedTransferQueueTest ext
1056      public void testTryTransfer4() throws InterruptedException {
1057          final Object hotPotato = new Object();
1058          final LinkedTransferQueue q = new LinkedTransferQueue();
1059 <        new Thread(new CheckedRunnable() {
1060 <            void realRun() {
1059 >
1060 >        Thread t = newStartedThread(new CheckedRunnable() {
1061 >            public void realRun() {
1062                  while (! q.hasWaitingConsumer())
1063                      Thread.yield();
1064 <                threadAssertTrue(q.hasWaitingConsumer());
1065 <                threadAssertTrue(q.isEmpty());
1066 <                threadAssertTrue(q.size() == 0);
1067 <                threadAssertTrue(q.tryTransfer(hotPotato));
1068 <            }}).start();
1069 <        assertTrue(q.take() == hotPotato);
1070 <        assertTrue(q.isEmpty());
1064 >                assertTrue(q.hasWaitingConsumer());
1065 >                checkEmpty(q);
1066 >                assertTrue(q.tryTransfer(hotPotato));
1067 >            }});
1068 >
1069 >        assertSame(q.take(), hotPotato);
1070 >        checkEmpty(q);
1071 >        awaitTermination(t, MEDIUM_DELAY_MS);
1072      }
1073  
1074      /**
1075 <     * tryTransfer waits the amount given if interrupted, and
1076 <     * throws interrupted exception
1075 >     * tryTransfer waits the amount given, and throws
1076 >     * InterruptedException when interrupted.
1077       */
1078      public void testTryTransfer5() throws InterruptedException {
1079          final LinkedTransferQueue q = new LinkedTransferQueue();
1080 <        Thread toInterrupt = new Thread(new CheckedInterruptedRunnable() {
1081 <            void realRun() throws InterruptedException {
1082 <                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1080 >        final CountDownLatch threadStarted = new CountDownLatch(1);
1081 >        assertTrue(q.isEmpty());
1082 >
1083 >        Thread t = newStartedThread(new CheckedRunnable() {
1084 >            public void realRun() throws InterruptedException {
1085 >                long t0 = System.nanoTime();
1086 >                threadStarted.countDown();
1087 >                try {
1088 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1089 >                    shouldThrow();
1090 >                } catch (InterruptedException success) {}
1091 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1092 >                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
1093              }});
1094 <        toInterrupt.start();
1095 <        Thread.sleep(SMALL_DELAY_MS);
1096 <        toInterrupt.interrupt();
1094 >
1095 >        threadStarted.await();
1096 >        while (q.isEmpty())
1097 >            Thread.yield();
1098 >        Thread.sleep(SHORT_DELAY_MS);
1099 >        t.interrupt();
1100 >        awaitTermination(t, MEDIUM_DELAY_MS);
1101 >        checkEmpty(q);
1102      }
1103  
1104      /**
1105 <     * tryTransfer gives up after the timeout and return false
1105 >     * tryTransfer gives up after the timeout and returns false
1106       */
1107      public void testTryTransfer6() throws InterruptedException {
1108          final LinkedTransferQueue q = new LinkedTransferQueue();
1109 <        new Thread(new CheckedRunnable() {
1110 <            void realRun() throws InterruptedException {
1111 <                threadAssertFalse
1112 <                    (q.tryTransfer(new Object(),
1113 <                                   SHORT_DELAY_MS, MILLISECONDS));
1114 <            }}).start();
1115 <        Thread.sleep(LONG_DELAY_MS);
1116 <        assertTrue(q.isEmpty());
1109 >
1110 >        Thread t = newStartedThread(new CheckedRunnable() {
1111 >            public void realRun() throws InterruptedException {
1112 >                long t0 = System.nanoTime();
1113 >                assertFalse(q.tryTransfer(new Object(),
1114 >                                          SHORT_DELAY_MS, MILLISECONDS));
1115 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1116 >                checkEmpty(q);
1117 >            }});
1118 >
1119 >        awaitTermination(t, MEDIUM_DELAY_MS);
1120 >        checkEmpty(q);
1121      }
1122  
1123      /**
# Line 1031 | Line 1127 | public class LinkedTransferQueueTest ext
1127      public void testTryTransfer7() throws InterruptedException {
1128          final LinkedTransferQueue q = new LinkedTransferQueue();
1129          assertTrue(q.offer(four));
1130 <        new Thread(new CheckedRunnable() {
1131 <            void realRun() throws InterruptedException {
1132 <                threadAssertTrue(q.tryTransfer(five,
1133 <                                               LONG_DELAY_MS, MILLISECONDS));
1134 <                threadAssertTrue(q.isEmpty());
1135 <            }}).start();
1136 <        Thread.sleep(SHORT_DELAY_MS);
1130 >
1131 >        Thread t = newStartedThread(new CheckedRunnable() {
1132 >            public void realRun() throws InterruptedException {
1133 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1134 >                checkEmpty(q);
1135 >            }});
1136 >
1137 >        while (q.size() != 2)
1138 >            Thread.yield();
1139          assertEquals(2, q.size());
1140 <        assertEquals(four, q.poll());
1141 <        assertEquals(five, q.poll());
1142 <        assertTrue(q.isEmpty());
1140 >        assertSame(four, q.poll());
1141 >        assertSame(five, q.poll());
1142 >        checkEmpty(q);
1143 >        awaitTermination(t, MEDIUM_DELAY_MS);
1144      }
1145  
1146      /**
1147 <     * tryTransfer attempts to enqueue into the q and fails returning
1148 <     * false not enqueueing and the successive poll is null
1147 >     * tryTransfer attempts to enqueue into the queue and fails
1148 >     * returning false not enqueueing and the successive poll is null
1149       */
1150      public void testTryTransfer8() throws InterruptedException {
1151          final LinkedTransferQueue q = new LinkedTransferQueue();
1152          assertTrue(q.offer(four));
1153          assertEquals(1, q.size());
1154 +        long t0 = System.nanoTime();
1155          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1156 +        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1157          assertEquals(1, q.size());
1158 <        assertEquals(four, q.poll());
1058 <        threadAssertTrue(q.isEmpty());
1158 >        assertSame(four, q.poll());
1159          assertNull(q.poll());
1160 +        checkEmpty(q);
1161      }
1162  
1163      private LinkedTransferQueue<Integer> populatedQueue(int n) {
1164          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
1165 <        assertTrue(q.isEmpty());
1165 >        checkEmpty(q);
1166          for (int i = 0; i < n; i++) {
1167              assertEquals(i, q.size());
1168              assertTrue(q.offer(i));
# Line 1070 | Line 1171 | public class LinkedTransferQueueTest ext
1171          assertFalse(q.isEmpty());
1172          return q;
1173      }
1073
1074    private static class ConsumerObserver {
1075
1076        private int waitingConsumers;
1077
1078        private ConsumerObserver() {
1079        }
1080
1081        private void setWaitingConsumer(int i) {
1082            this.waitingConsumers = i;
1083        }
1084
1085        private int getWaitingConsumers() {
1086            return waitingConsumers;
1087        }
1088    }
1174   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines