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.28 by jsr166, Thu Oct 28 17:57:26 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(LinkedTransferQueue q) throws InterruptedException {
44 >        assertTrue(q.isEmpty());
45 >        assertEquals(0, q.size());
46 >        assertNull(q.peek());
47 >        assertNull(q.poll());
48 >        assertNull(q.poll(0, MILLISECONDS));
49 >        assertEquals(q.toString(), "[]");
50 >        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
51 >        assertFalse(q.iterator().hasNext());
52 >        try {
53 >            q.element();
54 >            shouldThrow();
55 >        } catch (NoSuchElementException success) {}
56 >        try {
57 >            q.iterator().next();
58 >            shouldThrow();
59 >        } catch (NoSuchElementException success) {}
60 >        try {
61 >            q.remove();
62 >            shouldThrow();
63 >        } catch (NoSuchElementException success) {}
64      }
65  
66      /**
# Line 48 | Line 80 | public class LinkedTransferQueueTest ext
80          try {
81              new LinkedTransferQueue(null);
82              shouldThrow();
83 <        } catch (NullPointerException success) {
52 <        }
83 >        } catch (NullPointerException success) {}
84      }
85  
86      /**
# Line 61 | Line 92 | public class LinkedTransferQueueTest ext
92              Integer[] ints = new Integer[SIZE];
93              new LinkedTransferQueue(Arrays.asList(ints));
94              shouldThrow();
95 <        } catch (NullPointerException success) {
65 <        }
95 >        } catch (NullPointerException success) {}
96      }
97  
98      /**
# Line 77 | Line 107 | public class LinkedTransferQueueTest ext
107              }
108              new LinkedTransferQueue(Arrays.asList(ints));
109              shouldThrow();
110 <        } catch (NullPointerException success) {
81 <        }
110 >        } catch (NullPointerException success) {}
111      }
112  
113      /**
114       * Queue contains all elements of the collection it is initialized by
115       */
116      public void testConstructor5() {
117 <        try {
118 <            Integer[] ints = new Integer[SIZE];
119 <            for (int i = 0; i < SIZE; ++i) {
120 <                ints[i] = i;
121 <            }
122 <            LinkedTransferQueue q
123 <                = new LinkedTransferQueue(Arrays.asList(ints));
124 <            for (int i = 0; i < SIZE; ++i) {
125 <                assertEquals(ints[i], q.poll());
126 <            }
127 <        } finally {
117 >        Integer[] ints = new Integer[SIZE];
118 >        for (int i = 0; i < SIZE; ++i) {
119 >            ints[i] = i;
120 >        }
121 >        List intList = Arrays.asList(ints);
122 >        LinkedTransferQueue q
123 >            = new LinkedTransferQueue(intList);
124 >        assertEquals(q.size(), intList.size());
125 >        assertEquals(q.toString(), intList.toString());
126 >        assertTrue(Arrays.equals(q.toArray(),
127 >                                     intList.toArray()));
128 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
129 >                                 intList.toArray(new Object[0])));
130 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
131 >                                 intList.toArray(new Object[SIZE])));
132 >        for (int i = 0; i < SIZE; ++i) {
133 >            assertEquals(ints[i], q.poll());
134          }
135      }
136  
137      /**
138 <     * Remaining capacity never decrease nor increase on add or remove
138 >     * remainingCapacity() always returns Integer.MAX_VALUE
139       */
140      public void testRemainingCapacity() {
141          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 124 | Line 159 | public class LinkedTransferQueueTest ext
159              LinkedTransferQueue q = new LinkedTransferQueue();
160              q.offer(null);
161              shouldThrow();
162 <        } catch (NullPointerException success) {
128 <        }
162 >        } catch (NullPointerException success) {}
163      }
164  
165      /**
# Line 136 | Line 170 | public class LinkedTransferQueueTest ext
170              LinkedTransferQueue q = new LinkedTransferQueue();
171              q.add(null);
172              shouldThrow();
173 <        } catch (NullPointerException success) {
140 <        }
173 >        } catch (NullPointerException success) {}
174      }
175  
176      /**
# Line 148 | Line 181 | public class LinkedTransferQueueTest ext
181              LinkedTransferQueue q = new LinkedTransferQueue();
182              q.addAll(null);
183              shouldThrow();
184 <        } catch (NullPointerException success) {
152 <        }
184 >        } catch (NullPointerException success) {}
185      }
186  
187      /**
# Line 160 | Line 192 | public class LinkedTransferQueueTest ext
192              LinkedTransferQueue q = populatedQueue(SIZE);
193              q.addAll(q);
194              shouldThrow();
195 <        } catch (IllegalArgumentException success) {
164 <        }
195 >        } catch (IllegalArgumentException success) {}
196      }
197  
198      /**
# Line 173 | Line 204 | public class LinkedTransferQueueTest ext
204              Integer[] ints = new Integer[SIZE];
205              q.addAll(Arrays.asList(ints));
206              shouldThrow();
207 <        } catch (NullPointerException success) {
177 <        }
207 >        } catch (NullPointerException success) {}
208      }
209  
210      /**
# Line 190 | Line 220 | public class LinkedTransferQueueTest ext
220              }
221              q.addAll(Arrays.asList(ints));
222              shouldThrow();
223 <        } catch (NullPointerException success) {
194 <        }
223 >        } catch (NullPointerException success) {}
224      }
225  
226      /**
# Line 228 | Line 257 | public class LinkedTransferQueueTest ext
257      public void testPut() {
258          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
259          for (int i = 0; i < SIZE; ++i) {
260 +            assertEquals(q.size(), i);
261              q.put(i);
262              assertTrue(q.contains(i));
263          }
234        assertEquals(q.size(), SIZE);
264      }
265  
266      /**
# Line 245 | Line 274 | public class LinkedTransferQueueTest ext
274      }
275  
276      /**
277 <     * 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
277 >     * take removes existing elements until empty, then blocks interruptibly
278       */
279      public void testBlockingTake() throws InterruptedException {
280 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
281 <            void realRun() throws InterruptedException {
282 <                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
280 >        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
281 >        Thread t = new Thread(new CheckedRunnable() {
282 >            public void realRun() throws InterruptedException {
283                  for (int i = 0; i < SIZE; ++i) {
284 <                    threadAssertEquals(i, (int) q.take());
284 >                    assertEquals(i, (int) q.take());
285                  }
286 <                q.take();
286 >                try {
287 >                    q.take();
288 >                    shouldThrow();
289 >                } catch (InterruptedException success) {}
290              }});
291 +
292          t.start();
293          Thread.sleep(SHORT_DELAY_MS);
294          t.interrupt();
295          t.join();
296 +        checkEmpty(q);
297      }
298  
299      /**
300       * poll succeeds unless empty
301       */
302 <    public void testPoll() {
302 >    public void testPoll() throws InterruptedException {
303          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
304          for (int i = 0; i < SIZE; ++i) {
305              assertEquals(i, (int) q.poll());
306          }
307          assertNull(q.poll());
308 +        checkEmpty(q);
309      }
310  
311      /**
# Line 297 | Line 317 | public class LinkedTransferQueueTest ext
317              assertEquals(i, (int) q.poll(0, MILLISECONDS));
318          }
319          assertNull(q.poll(0, MILLISECONDS));
320 +        checkEmpty(q);
321      }
322  
323      /**
# Line 305 | Line 326 | public class LinkedTransferQueueTest ext
326      public void testTimedPoll() throws InterruptedException {
327          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
328          for (int i = 0; i < SIZE; ++i) {
329 <            assertEquals(i, (int) q.poll(SHORT_DELAY_MS, MILLISECONDS));
329 >            long t0 = System.nanoTime();
330 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
331 >            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
332          }
333          assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
334 +        checkEmpty(q);
335      }
336  
337      /**
# Line 315 | Line 339 | public class LinkedTransferQueueTest ext
339       * returning timeout status
340       */
341      public void testInterruptedTimedPoll() throws InterruptedException {
342 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
343 <            void realRun() throws InterruptedException {
344 <                LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
342 >        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
343 >        Thread t = newStartedThread(new CheckedRunnable() {
344 >            public void realRun() throws InterruptedException {
345                  for (int i = 0; i < SIZE; ++i) {
346 <                    threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS,
347 <                                                       MILLISECONDS));
346 >                    long t0 = System.nanoTime();
347 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
348 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
349                  }
350 <                q.poll(SHORT_DELAY_MS, MILLISECONDS);
350 >                try {
351 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
352 >                    shouldThrow();
353 >                } catch (InterruptedException success) {}
354              }});
327        t.start();
328        Thread.sleep(SHORT_DELAY_MS);
329        t.interrupt();
330        t.join();
331    }
355  
333    /**
334     * timed poll before a delayed offer fails; after offer succeeds;
335     * on interruption throws
336     */
337    public void testTimedPollWithOffer() throws InterruptedException {
338        final LinkedTransferQueue q = new LinkedTransferQueue();
339        Thread t = new Thread(new CheckedInterruptedRunnable() {
340            void realRun() throws InterruptedException {
341                threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
342                q.poll(LONG_DELAY_MS, MILLISECONDS);
343                q.poll(LONG_DELAY_MS, MILLISECONDS);
344            }});
345        t.start();
356          Thread.sleep(SMALL_DELAY_MS);
347        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
357          t.interrupt();
358          t.join();
359 +        checkEmpty(q);
360      }
361  
362      /**
363       * peek returns next element, or null if empty
364       */
365 <    public void testPeek() {
365 >    public void testPeek() throws InterruptedException {
366          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
367          for (int i = 0; i < SIZE; ++i) {
368              assertEquals(i, (int) q.peek());
# Line 361 | Line 371 | public class LinkedTransferQueueTest ext
371                         i != (int) q.peek());
372          }
373          assertNull(q.peek());
374 +        checkEmpty(q);
375      }
376  
377      /**
378       * element returns next element, or throws NoSuchElementException if empty
379       */
380 <    public void testElement() {
380 >    public void testElement() throws InterruptedException {
381          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
382          for (int i = 0; i < SIZE; ++i) {
383              assertEquals(i, (int) q.element());
# Line 375 | Line 386 | public class LinkedTransferQueueTest ext
386          try {
387              q.element();
388              shouldThrow();
389 <        } catch (NoSuchElementException success) {
390 <        }
389 >        } catch (NoSuchElementException success) {}
390 >        checkEmpty(q);
391      }
392  
393      /**
394       * remove removes next element, or throws NoSuchElementException if empty
395       */
396 <    public void testRemove() {
396 >    public void testRemove() throws InterruptedException {
397          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
398          for (int i = 0; i < SIZE; ++i) {
399              assertEquals(i, (int) q.remove());
# Line 390 | Line 401 | public class LinkedTransferQueueTest ext
401          try {
402              q.remove();
403              shouldThrow();
404 <        } catch (NoSuchElementException success) {
405 <        }
404 >        } catch (NoSuchElementException success) {}
405 >        checkEmpty(q);
406      }
407  
408      /**
409       * remove(x) removes x and returns true if present
410       */
411 <    public void testRemoveElement() {
411 >    public void testRemoveElement() throws InterruptedException {
412          LinkedTransferQueue q = populatedQueue(SIZE);
413          for (int i = 1; i < SIZE; i += 2) {
414              assertTrue(q.remove(i));
# Line 406 | Line 417 | public class LinkedTransferQueueTest ext
417              assertTrue(q.remove(i));
418              assertFalse(q.remove(i + 1));
419          }
420 <        assertTrue(q.isEmpty());
420 >        checkEmpty(q);
421      }
422  
423      /**
# Line 419 | Line 430 | public class LinkedTransferQueueTest ext
430          assertTrue(q.remove(one));
431          assertTrue(q.remove(two));
432          assertTrue(q.add(three));
433 <        assertTrue(q.take() != null);
433 >        assertSame(q.take(), three);
434      }
435  
436      /**
# Line 437 | Line 448 | public class LinkedTransferQueueTest ext
448      /**
449       * clear removes all elements
450       */
451 <    public void testClear() {
451 >    public void testClear() throws InterruptedException {
452          LinkedTransferQueue q = populatedQueue(SIZE);
453          q.clear();
454 <        assertTrue(q.isEmpty());
444 <        assertEquals(0, q.size());
454 >        checkEmpty(q);
455          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
456          q.add(one);
457          assertFalse(q.isEmpty());
458 +        assertEquals(1, q.size());
459          assertTrue(q.contains(one));
460          q.clear();
461 <        assertTrue(q.isEmpty());
461 >        checkEmpty(q);
462      }
463  
464      /**
# Line 501 | Line 512 | public class LinkedTransferQueueTest ext
512      }
513  
514      /**
515 <     * toArray contains all elements
515 >     * toArray() contains all elements
516       */
517      public void testToArray() throws InterruptedException {
518          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 527 | Line 538 | public class LinkedTransferQueueTest ext
538       * toArray(null) throws NullPointerException
539       */
540      public void testToArray_BadArg() {
541 +        LinkedTransferQueue q = populatedQueue(SIZE);
542          try {
531            LinkedTransferQueue q = populatedQueue(SIZE);
543              Object o[] = q.toArray(null);
544              shouldThrow();
545 <        } catch (NullPointerException success) {
535 <        }
545 >        } catch (NullPointerException success) {}
546      }
547  
548      /**
549 <     * toArray with incompatible array type throws CCE
549 >     * toArray(incompatible array type) throws CCE
550       */
551      public void testToArray1_BadArg() {
552 +        LinkedTransferQueue q = populatedQueue(SIZE);
553          try {
543            LinkedTransferQueue q = populatedQueue(SIZE);
554              Object o[] = q.toArray(new String[10]);
555              shouldThrow();
556 <        } catch (ArrayStoreException success) {
547 <        }
556 >        } catch (ArrayStoreException success) {}
557      }
558  
559      /**
# Line 553 | Line 562 | public class LinkedTransferQueueTest ext
562      public void testIterator() throws InterruptedException {
563          LinkedTransferQueue q = populatedQueue(SIZE);
564          Iterator it = q.iterator();
565 +        int i = 0;
566          while (it.hasNext()) {
567 <            assertEquals(it.next(), q.take());
567 >            assertEquals(it.next(), i++);
568          }
569 +        assertEquals(i, SIZE);
570      }
571  
572      /**
573 <     * iterator.remove removes current element
573 >     * iterator.remove() removes current element
574       */
575      public void testIteratorRemove() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 572 | Line 583 | public class LinkedTransferQueueTest ext
583          it.remove();
584  
585          it = q.iterator();
586 <        assertEquals(it.next(), one);
587 <        assertEquals(it.next(), three);
586 >        assertSame(it.next(), one);
587 >        assertSame(it.next(), three);
588          assertFalse(it.hasNext());
589      }
590  
# Line 631 | Line 642 | public class LinkedTransferQueueTest ext
642          ExecutorService executor = Executors.newFixedThreadPool(2);
643  
644          executor.execute(new CheckedRunnable() {
645 <            void realRun() {
646 <                threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
636 <                                         MILLISECONDS));
645 >            public void realRun() {
646 >                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
647              }});
648  
649          executor.execute(new CheckedRunnable() {
650 <            void realRun() throws InterruptedException {
650 >            public void realRun() throws InterruptedException {
651                  Thread.sleep(SMALL_DELAY_MS);
652 <                threadAssertEquals(one, q.take());
652 >                assertSame(one, q.take());
653              }});
654  
655          joinPool(executor);
656      }
657  
658      /**
659 <     * poll retrieves elements across Executor threads
659 >     * timed poll retrieves elements across Executor threads
660       */
661      public void testPollInExecutor() {
662          final LinkedTransferQueue q = new LinkedTransferQueue();
663          ExecutorService executor = Executors.newFixedThreadPool(2);
664  
665          executor.execute(new CheckedRunnable() {
666 <            void realRun() throws InterruptedException {
667 <                threadAssertNull(q.poll());
668 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
669 <                                                MILLISECONDS));
660 <                threadAssertTrue(q.isEmpty());
666 >            public void realRun() throws InterruptedException {
667 >                assertNull(q.poll());
668 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
669 >                assertTrue(q.isEmpty());
670              }});
671  
672          executor.execute(new CheckedRunnable() {
673 <            void realRun() throws InterruptedException {
673 >            public void realRun() throws InterruptedException {
674                  Thread.sleep(SMALL_DELAY_MS);
675                  q.put(one);
676              }});
# Line 701 | Line 710 | public class LinkedTransferQueueTest ext
710          try {
711              q.drainTo(null);
712              shouldThrow();
713 <        } catch (NullPointerException success) {
705 <        }
713 >        } catch (NullPointerException success) {}
714      }
715  
716      /**
# Line 713 | Line 721 | public class LinkedTransferQueueTest ext
721          try {
722              q.drainTo(q);
723              shouldThrow();
724 <        } catch (IllegalArgumentException success) {
717 <        }
724 >        } catch (IllegalArgumentException success) {}
725      }
726  
727      /**
# Line 744 | Line 751 | public class LinkedTransferQueueTest ext
751      }
752  
753      /**
754 <     * drainTo empties full queue, unblocking a waiting put.
754 >     * drainTo(c) empties full queue, unblocking a waiting put.
755       */
756      public void testDrainToWithActivePut() throws InterruptedException {
757          final LinkedTransferQueue q = populatedQueue(SIZE);
758 <        Thread t = new Thread(new CheckedRunnable() {
759 <            void realRun() {
758 >        Thread t = newStartedThread(new CheckedRunnable() {
759 >            public void realRun() {
760                  q.put(SIZE + 1);
761              }});
755        t.start();
762          ArrayList l = new ArrayList();
763          q.drainTo(l);
764          assertTrue(l.size() >= SIZE);
# Line 769 | Line 775 | public class LinkedTransferQueueTest ext
775      public void testDrainToNullN() {
776          LinkedTransferQueue q = populatedQueue(SIZE);
777          try {
778 <            q.drainTo(null, 0);
778 >            q.drainTo(null, SIZE);
779              shouldThrow();
780 <        } catch (NullPointerException success) {
775 <        }
780 >        } catch (NullPointerException success) {}
781      }
782  
783      /**
# Line 781 | Line 786 | public class LinkedTransferQueueTest ext
786      public void testDrainToSelfN() {
787          LinkedTransferQueue q = populatedQueue(SIZE);
788          try {
789 <            q.drainTo(q, 0);
789 >            q.drainTo(q, SIZE);
790              shouldThrow();
791 <        } catch (IllegalArgumentException success) {
787 <        }
791 >        } catch (IllegalArgumentException success) {}
792      }
793  
794      /**
795 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
795 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
796       */
797      public void testDrainToN() {
798          LinkedTransferQueue q = new LinkedTransferQueue();
# Line 810 | Line 814 | public class LinkedTransferQueueTest ext
814      }
815  
816      /**
817 <     * poll and take decrement the waiting consumer count
817 >     * timed poll() or take() increments the waiting consumer count;
818 >     * offer(e) decrements the waiting consumer count
819       */
820      public void testWaitingConsumer() throws InterruptedException {
821          final LinkedTransferQueue q = new LinkedTransferQueue();
822 <        final ConsumerObserver waiting = new ConsumerObserver();
823 <        new Thread(new CheckedRunnable() {
824 <            void realRun() {
825 <                threadAssertTrue(q.hasWaitingConsumer());
826 <                waiting.setWaitingConsumer(q.getWaitingConsumerCount());
827 <                threadAssertTrue(q.offer(new Object()));
828 <            }}).start();
829 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
830 <        assertTrue(q.getWaitingConsumerCount()
831 <                   < waiting.getWaitingConsumers());
822 >        assertEquals(q.getWaitingConsumerCount(), 0);
823 >        assertFalse(q.hasWaitingConsumer());
824 >
825 >        Thread t = newStartedThread(new CheckedRunnable() {
826 >            public void realRun() throws InterruptedException {
827 >                Thread.sleep(SMALL_DELAY_MS);
828 >                assertTrue(q.hasWaitingConsumer());
829 >                assertEquals(q.getWaitingConsumerCount(), 1);
830 >                assertTrue(q.offer(one));
831 >                assertFalse(q.hasWaitingConsumer());
832 >                assertEquals(q.getWaitingConsumerCount(), 0);
833 >            }});
834 >
835 >        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
836 >        assertEquals(q.getWaitingConsumerCount(), 0);
837 >        assertFalse(q.hasWaitingConsumer());
838 >        t.join();
839      }
840  
841      /**
# Line 834 | Line 846 | public class LinkedTransferQueueTest ext
846              LinkedTransferQueue q = new LinkedTransferQueue();
847              q.transfer(null);
848              shouldThrow();
849 <        } catch (NullPointerException ex) {
838 <        }
849 >        } catch (NullPointerException success) {}
850      }
851  
852      /**
# Line 846 | Line 857 | public class LinkedTransferQueueTest ext
857          final LinkedTransferQueue<Integer> q
858              = new LinkedTransferQueue<Integer>();
859  
860 <        new Thread(new CheckedRunnable() {
861 <            void realRun() throws InterruptedException {
860 >        Thread t = newStartedThread(new CheckedRunnable() {
861 >            public void realRun() throws InterruptedException {
862                  q.transfer(SIZE);
863 <                threadAssertTrue(q.isEmpty());
864 <            }}).start();
863 >                assertTrue(q.isEmpty());
864 >            }});
865  
866          Thread.sleep(SHORT_DELAY_MS);
867          assertEquals(1, q.size());
868          assertEquals(SIZE, (int) q.poll());
869          assertTrue(q.isEmpty());
870 +        t.join();
871      }
872  
873      /**
# Line 865 | Line 877 | public class LinkedTransferQueueTest ext
877          final LinkedTransferQueue<Integer> q
878              = new LinkedTransferQueue<Integer>();
879  
880 <        Thread first = new Thread(new CheckedRunnable() {
881 <            void realRun() throws InterruptedException {
880 >        Thread first = newStartedThread(new CheckedRunnable() {
881 >            public void realRun() throws InterruptedException {
882                  Integer i = SIZE + 1;
883                  q.transfer(i);
884 <                threadAssertTrue(!q.contains(i));
885 <                threadAssertEquals(1, q.size());
884 >                assertTrue(!q.contains(i));
885 >                assertEquals(1, q.size());
886              }});
875        first.start();
887  
888 <        Thread interruptedThread = new Thread(new CheckedInterruptedRunnable() {
889 <            void realRun() throws InterruptedException {
890 <                while (q.size() == 0)
891 <                    Thread.yield();
892 <                q.transfer(SIZE);
893 <            }});
894 <        interruptedThread.start();
888 >        Thread interruptedThread = newStartedThread(
889 >            new CheckedInterruptedRunnable() {
890 >                public void realRun() throws InterruptedException {
891 >                    while (q.size() == 0)
892 >                        Thread.yield();
893 >                    q.transfer(SIZE);
894 >                }});
895  
896          while (q.size() < 2)
897              Thread.yield();
# Line 900 | Line 911 | public class LinkedTransferQueueTest ext
911       */
912      public void testTransfer4() throws InterruptedException {
913          final LinkedTransferQueue q = new LinkedTransferQueue();
914 <        new Thread(new CheckedRunnable() {
915 <            void realRun() throws InterruptedException {
914 >
915 >        Thread t = newStartedThread(new CheckedRunnable() {
916 >            public void realRun() throws InterruptedException {
917                  q.transfer(four);
918 <                threadAssertFalse(q.contains(four));
919 <                threadAssertEquals(three, q.poll());
920 <            }}).start();
921 <        Thread.sleep(MEDIUM_DELAY_MS);
918 >                assertFalse(q.contains(four));
919 >                assertSame(three, q.poll());
920 >            }});
921 >
922 >        Thread.sleep(SHORT_DELAY_MS);
923          assertTrue(q.offer(three));
924 <        assertEquals(four, q.poll());
924 >        assertSame(four, q.poll());
925 >        t.join();
926      }
927  
928      /**
# Line 919 | Line 933 | public class LinkedTransferQueueTest ext
933          final LinkedTransferQueue<Integer> q
934              = new LinkedTransferQueue<Integer>();
935  
936 <        new Thread(new CheckedRunnable() {
937 <            void realRun() throws InterruptedException {
936 >        Thread t = newStartedThread(new CheckedRunnable() {
937 >            public void realRun() throws InterruptedException {
938                  q.transfer(SIZE);
939 <                threadAssertTrue(q.isEmpty());
940 <            }}).start();
939 >                checkEmpty(q);
940 >            }});
941  
942          Thread.sleep(SHORT_DELAY_MS);
943          assertEquals(SIZE, (int) q.take());
944 <        assertTrue(q.isEmpty());
944 >        checkEmpty(q);
945 >        t.join();
946      }
947  
948      /**
# Line 937 | Line 952 | public class LinkedTransferQueueTest ext
952          try {
953              final LinkedTransferQueue q = new LinkedTransferQueue();
954              q.tryTransfer(null);
955 <            this.shouldThrow();
956 <        } catch (NullPointerException ex) {
942 <        }
955 >            shouldThrow();
956 >        } catch (NullPointerException success) {}
957      }
958  
959      /**
960       * tryTransfer returns false and does not enqueue if there are no
961       * consumers waiting to poll or take.
962       */
963 <    public void testTryTransfer2() {
963 >    public void testTryTransfer2() throws InterruptedException {
964          final LinkedTransferQueue q = new LinkedTransferQueue();
965          assertFalse(q.tryTransfer(new Object()));
966          assertFalse(q.hasWaitingConsumer());
967 <        assertTrue(q.isEmpty());
954 <        assertEquals(0, q.size());
967 >        checkEmpty(q);
968      }
969  
970      /**
# Line 961 | Line 974 | public class LinkedTransferQueueTest ext
974      public void testTryTransfer3() throws InterruptedException {
975          final Object hotPotato = new Object();
976          final LinkedTransferQueue q = new LinkedTransferQueue();
977 <        new Thread(new CheckedRunnable() {
978 <            void realRun() {
977 >
978 >        Thread t = newStartedThread(new CheckedRunnable() {
979 >            public void realRun() {
980                  while (! q.hasWaitingConsumer())
981                      Thread.yield();
982 <                threadAssertTrue(q.hasWaitingConsumer());
983 <                threadAssertTrue(q.isEmpty());
984 <                threadAssertTrue(q.size() == 0);
985 <                threadAssertTrue(q.tryTransfer(hotPotato));
986 <            }}).start();
987 <        assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) == hotPotato);
988 <        assertTrue(q.isEmpty());
982 >                assertTrue(q.hasWaitingConsumer());
983 >                assertTrue(q.isEmpty());
984 >                assertEquals(q.size(), 0);
985 >                assertTrue(q.tryTransfer(hotPotato));
986 >            }});
987 >
988 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
989 >        checkEmpty(q);
990 >        t.join();
991      }
992  
993      /**
# Line 981 | Line 997 | public class LinkedTransferQueueTest ext
997      public void testTryTransfer4() throws InterruptedException {
998          final Object hotPotato = new Object();
999          final LinkedTransferQueue q = new LinkedTransferQueue();
1000 <        new Thread(new CheckedRunnable() {
1001 <            void realRun() {
1000 >
1001 >        Thread t = newStartedThread(new CheckedRunnable() {
1002 >            public void realRun() {
1003                  while (! q.hasWaitingConsumer())
1004                      Thread.yield();
1005 <                threadAssertTrue(q.hasWaitingConsumer());
1006 <                threadAssertTrue(q.isEmpty());
1007 <                threadAssertTrue(q.size() == 0);
1008 <                threadAssertTrue(q.tryTransfer(hotPotato));
1009 <            }}).start();
1010 <        assertTrue(q.take() == hotPotato);
1011 <        assertTrue(q.isEmpty());
1005 >                assertTrue(q.hasWaitingConsumer());
1006 >                assertTrue(q.isEmpty());
1007 >                assertEquals(q.size(), 0);
1008 >                assertTrue(q.tryTransfer(hotPotato));
1009 >            }});
1010 >
1011 >        assertSame(q.take(), hotPotato);
1012 >        checkEmpty(q);
1013 >        t.join();
1014      }
1015  
1016      /**
# Line 1000 | Line 1019 | public class LinkedTransferQueueTest ext
1019       */
1020      public void testTryTransfer5() throws InterruptedException {
1021          final LinkedTransferQueue q = new LinkedTransferQueue();
1022 <        Thread toInterrupt = new Thread(new CheckedInterruptedRunnable() {
1023 <            void realRun() throws InterruptedException {
1022 >
1023 >        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
1024 >            public void realRun() throws InterruptedException {
1025                  q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1026              }});
1027 <        toInterrupt.start();
1027 >
1028          Thread.sleep(SMALL_DELAY_MS);
1029          toInterrupt.interrupt();
1030 +        toInterrupt.join();
1031      }
1032  
1033      /**
# Line 1014 | Line 1035 | public class LinkedTransferQueueTest ext
1035       */
1036      public void testTryTransfer6() throws InterruptedException {
1037          final LinkedTransferQueue q = new LinkedTransferQueue();
1038 <        new Thread(new CheckedRunnable() {
1039 <            void realRun() throws InterruptedException {
1040 <                threadAssertFalse
1041 <                    (q.tryTransfer(new Object(),
1042 <                                   SHORT_DELAY_MS, MILLISECONDS));
1043 <            }}).start();
1044 <        Thread.sleep(LONG_DELAY_MS);
1045 <        assertTrue(q.isEmpty());
1038 >
1039 >        Thread t = newStartedThread(new CheckedRunnable() {
1040 >            public void realRun() throws InterruptedException {
1041 >                long t0 = System.nanoTime();
1042 >                assertFalse(q.tryTransfer(new Object(),
1043 >                                          SHORT_DELAY_MS, MILLISECONDS));
1044 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
1045 >            }});
1046 >
1047 >        checkEmpty(q);
1048 >        awaitTermination(t, MEDIUM_DELAY_MS);
1049 >        checkEmpty(q);
1050      }
1051  
1052      /**
# Line 1031 | Line 1056 | public class LinkedTransferQueueTest ext
1056      public void testTryTransfer7() throws InterruptedException {
1057          final LinkedTransferQueue q = new LinkedTransferQueue();
1058          assertTrue(q.offer(four));
1059 <        new Thread(new CheckedRunnable() {
1060 <            void realRun() throws InterruptedException {
1061 <                threadAssertTrue(q.tryTransfer(five,
1062 <                                               LONG_DELAY_MS, MILLISECONDS));
1063 <                threadAssertTrue(q.isEmpty());
1064 <            }}).start();
1059 >
1060 >        Thread t = newStartedThread(new CheckedRunnable() {
1061 >            public void realRun() throws InterruptedException {
1062 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1063 >                assertTrue(q.isEmpty());
1064 >            }});
1065 >
1066          Thread.sleep(SHORT_DELAY_MS);
1067          assertEquals(2, q.size());
1068 <        assertEquals(four, q.poll());
1069 <        assertEquals(five, q.poll());
1070 <        assertTrue(q.isEmpty());
1068 >        assertSame(four, q.poll());
1069 >        assertSame(five, q.poll());
1070 >        checkEmpty(q);
1071 >        t.join();
1072      }
1073  
1074      /**
# Line 1054 | Line 1081 | public class LinkedTransferQueueTest ext
1081          assertEquals(1, q.size());
1082          assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1083          assertEquals(1, q.size());
1084 <        assertEquals(four, q.poll());
1058 <        threadAssertTrue(q.isEmpty());
1084 >        assertSame(four, q.poll());
1085          assertNull(q.poll());
1086 +        checkEmpty(q);
1087      }
1088  
1089      private LinkedTransferQueue<Integer> populatedQueue(int n) {
# Line 1070 | Line 1097 | public class LinkedTransferQueueTest ext
1097          assertFalse(q.isEmpty());
1098          return q;
1099      }
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    }
1100   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines