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.6 by dl, Sun Aug 2 12:31:24 2009 UTC vs.
Revision 1.24 by jsr166, Tue Dec 1 09:56:28 2009 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 junit.framework.Test;
22   import junit.framework.TestSuite;
23  
24 + @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
26  
27      public static void main(String[] args) {
# Line 30 | Line 32 | public class LinkedTransferQueueTest ext
32          return new TestSuite(LinkedTransferQueueTest.class);
33      }
34  
35 +    void checkEmpty(LinkedTransferQueue q) throws InterruptedException {
36 +        assertTrue(q.isEmpty());
37 +        assertEquals(0, q.size());
38 +        assertNull(q.peek());
39 +        assertNull(q.poll());
40 +        assertNull(q.poll(0, MILLISECONDS));
41 +        assertEquals(q.toString(), "[]");
42 +        assertTrue(Arrays.equals(q.toArray(), new Object[0]));
43 +        assertFalse(q.iterator().hasNext());
44 +        try {
45 +            q.element();
46 +            shouldThrow();
47 +        } catch (NoSuchElementException success) {}
48 +        try {
49 +            q.iterator().next();
50 +            shouldThrow();
51 +        } catch (NoSuchElementException success) {}
52 +        try {
53 +            q.remove();
54 +            shouldThrow();
55 +        } catch (NoSuchElementException success) {}
56 +    }
57 +
58      /**
59 <     * Constructor builds new queue with size being zero and empty being true
59 >     * Constructor builds new queue with size being zero and empty
60 >     * being true
61       */
62      public void testConstructor1() {
63          assertEquals(0, new LinkedTransferQueue().size());
# Line 39 | Line 65 | public class LinkedTransferQueueTest ext
65      }
66  
67      /**
68 <     * Initializing constructor with null collection throws NullPointerException
68 >     * Initializing constructor with null collection throws
69 >     * NullPointerException
70       */
71      public void testConstructor2() {
72          try {
73              new LinkedTransferQueue(null);
74              shouldThrow();
75 <        } catch (NullPointerException success) {
49 <        }
75 >        } catch (NullPointerException success) {}
76      }
77  
78      /**
79 <     * Initializing from Collection of null elements throws NullPointerException
79 >     * Initializing from Collection of null elements throws
80 >     * NullPointerException
81       */
82      public void testConstructor3() {
83          try {
84              Integer[] ints = new Integer[SIZE];
85 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
85 >            new LinkedTransferQueue(Arrays.asList(ints));
86              shouldThrow();
87 <        } catch (NullPointerException success) {
61 <        }
87 >        } catch (NullPointerException success) {}
88      }
89  
90      /**
# Line 71 | Line 97 | public class LinkedTransferQueueTest ext
97              for (int i = 0; i < SIZE - 1; ++i) {
98                  ints[i] = i;
99              }
100 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
100 >            new LinkedTransferQueue(Arrays.asList(ints));
101              shouldThrow();
102 <        } catch (NullPointerException success) {
77 <        }
102 >        } catch (NullPointerException success) {}
103      }
104  
105      /**
106       * Queue contains all elements of the collection it is initialized by
107       */
108      public void testConstructor5() {
109 <        try {
110 <            Integer[] ints = new Integer[SIZE];
111 <            for (int i = 0; i < SIZE; ++i) {
112 <                ints[i] = i;
113 <            }
114 <            LinkedTransferQueue q = new LinkedTransferQueue(Arrays.asList(ints));
115 <            for (int i = 0; i < SIZE; ++i) {
116 <                assertEquals(ints[i], q.poll());
117 <            }
118 <        } finally {
109 >        Integer[] ints = new Integer[SIZE];
110 >        for (int i = 0; i < SIZE; ++i) {
111 >            ints[i] = i;
112 >        }
113 >        List intList = Arrays.asList(ints);
114 >        LinkedTransferQueue q
115 >            = new LinkedTransferQueue(intList);
116 >        assertEquals(q.size(), intList.size());
117 >        assertEquals(q.toString(), intList.toString());
118 >        assertTrue(Arrays.equals(q.toArray(),
119 >                                     intList.toArray()));
120 >        assertTrue(Arrays.equals(q.toArray(new Object[0]),
121 >                                 intList.toArray(new Object[0])));
122 >        assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
123 >                                 intList.toArray(new Object[SIZE])));
124 >        for (int i = 0; i < SIZE; ++i) {
125 >            assertEquals(ints[i], q.poll());
126          }
127      }
128  
129      /**
130 <     * Remaining capacity never decrease nor increase on add or remove
130 >     * remainingCapacity() always returns Integer.MAX_VALUE
131       */
132      public void testRemainingCapacity() {
133          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
# Line 119 | Line 151 | public class LinkedTransferQueueTest ext
151              LinkedTransferQueue q = new LinkedTransferQueue();
152              q.offer(null);
153              shouldThrow();
154 <        } catch (NullPointerException success) {
123 <        }
154 >        } catch (NullPointerException success) {}
155      }
156  
157      /**
# Line 131 | Line 162 | public class LinkedTransferQueueTest ext
162              LinkedTransferQueue q = new LinkedTransferQueue();
163              q.add(null);
164              shouldThrow();
165 <        } catch (NullPointerException success) {
135 <        }
165 >        } catch (NullPointerException success) {}
166      }
167  
168      /**
# Line 143 | Line 173 | public class LinkedTransferQueueTest ext
173              LinkedTransferQueue q = new LinkedTransferQueue();
174              q.addAll(null);
175              shouldThrow();
176 <        } catch (NullPointerException success) {
147 <        }
176 >        } catch (NullPointerException success) {}
177      }
178  
179      /**
# Line 155 | Line 184 | public class LinkedTransferQueueTest ext
184              LinkedTransferQueue q = populatedQueue(SIZE);
185              q.addAll(q);
186              shouldThrow();
187 <        } catch (IllegalArgumentException success) {
159 <        }
187 >        } catch (IllegalArgumentException success) {}
188      }
189  
190      /**
# Line 168 | Line 196 | public class LinkedTransferQueueTest ext
196              Integer[] ints = new Integer[SIZE];
197              q.addAll(Arrays.asList(ints));
198              shouldThrow();
199 <        } catch (NullPointerException success) {
172 <        }
199 >        } catch (NullPointerException success) {}
200      }
201  
202      /**
203 <     * addAll of a collection with any null elements throws NullPointerException after
204 <     * possibly adding some elements
203 >     * addAll of a collection with any null elements throws
204 >     * NullPointerException after possibly adding some elements
205       */
206      public void testAddAll3() {
207          try {
# Line 185 | Line 212 | public class LinkedTransferQueueTest ext
212              }
213              q.addAll(Arrays.asList(ints));
214              shouldThrow();
215 <        } catch (NullPointerException success) {
189 <        }
215 >        } catch (NullPointerException success) {}
216      }
217  
218      /**
# Line 223 | Line 249 | public class LinkedTransferQueueTest ext
249      public void testPut() {
250          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
251          for (int i = 0; i < SIZE; ++i) {
252 +            assertEquals(q.size(), i);
253              q.put(i);
254              assertTrue(q.contains(i));
255          }
229        assertEquals(q.size(), SIZE);
256      }
257  
258      /**
# Line 244 | Line 270 | public class LinkedTransferQueueTest ext
270       */
271      public void testTakeFromEmpty() throws InterruptedException {
272          final LinkedTransferQueue q = new LinkedTransferQueue();
273 <        Thread t = new Thread(new Runnable() {
274 <            public void run() {
275 <                try {
250 <                    q.take();
251 <                    threadShouldThrow();
252 <                } catch (InterruptedException success) {
253 <                } catch (Throwable ex) {
254 <                    threadUnexpectedException(ex);
255 <                }
273 >        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
274 >            public void realRun() throws InterruptedException {
275 >                q.take();
276              }});
257        t.start();
277          Thread.sleep(SHORT_DELAY_MS);
278          t.interrupt();
279          t.join();
# Line 264 | Line 283 | public class LinkedTransferQueueTest ext
283       * Take removes existing elements until empty, then blocks interruptibly
284       */
285      public void testBlockingTake() throws InterruptedException {
286 <        Thread t = new Thread(new Runnable() {
287 <            public void run() {
286 >        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
287 >        Thread t = new Thread(new CheckedRunnable() {
288 >            public void realRun() throws InterruptedException {
289 >                for (int i = 0; i < SIZE; ++i) {
290 >                    assertEquals(i, (int) q.take());
291 >                }
292                  try {
270                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
271                    for (int i = 0; i < SIZE; ++i) {
272                        threadAssertEquals(i, (int) q.take());
273                    }
293                      q.take();
294 <                    threadShouldThrow();
295 <                } catch (InterruptedException success) {
277 <                } catch (Throwable ex) {
278 <                    threadUnexpectedException(ex);
279 <                }
294 >                    shouldThrow();
295 >                } catch (InterruptedException success) {}
296              }});
297 +
298          t.start();
299          Thread.sleep(SHORT_DELAY_MS);
300          t.interrupt();
301          t.join();
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      /**
# Line 301 | Line 320 | public class LinkedTransferQueueTest ext
320      public void testTimedPoll0() throws InterruptedException {
321          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
322          for (int i = 0; i < SIZE; ++i) {
323 <            assertEquals(i, (int) q.poll(0, TimeUnit.MILLISECONDS));
323 >            assertEquals(i, (int) q.poll(0, MILLISECONDS));
324          }
325 <        assertNull(q.poll(0, TimeUnit.MILLISECONDS));
325 >        assertNull(q.poll(0, MILLISECONDS));
326 >        checkEmpty(q);
327      }
328  
329      /**
# Line 312 | Line 332 | public class LinkedTransferQueueTest ext
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, TimeUnit.MILLISECONDS));
335 >            long t0 = System.nanoTime();
336 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
337 >            long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
338 >            assertTrue(millisElapsed < SMALL_DELAY_MS);
339          }
340 <        assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
340 >        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
341 >        checkEmpty(q);
342      }
343  
344      /**
# Line 322 | Line 346 | public class LinkedTransferQueueTest ext
346       * returning timeout status
347       */
348      public void testInterruptedTimedPoll() throws InterruptedException {
349 <        Thread t = new Thread(new Runnable() {
350 <            public void run() {
351 <                try {
352 <                    LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
353 <                    for (int i = 0; i < SIZE; ++i) {
354 <                        threadAssertEquals(i, (int) q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
355 <                    }
356 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
333 <                } catch (InterruptedException success) {
334 <                } catch (Throwable ex) {
335 <                    threadUnexpectedException(ex);
349 >        final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
350 >        Thread t = newStartedThread(new CheckedRunnable() {
351 >            public void realRun() throws InterruptedException {
352 >                for (int i = 0; i < SIZE; ++i) {
353 >                    long t0 = System.nanoTime();
354 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
355 >                    long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
356 >                    assertTrue(millisElapsed < SMALL_DELAY_MS);
357                  }
358 +                try {
359 +                    q.poll(LONG_DELAY_MS, MILLISECONDS);
360 +                    shouldThrow();
361 +                } catch (InterruptedException success) {}
362              }});
363 <        t.start();
364 <        Thread.sleep(SHORT_DELAY_MS);
363 >
364 >        Thread.sleep(SMALL_DELAY_MS);
365          t.interrupt();
366          t.join();
367 +        checkEmpty(q);
368      }
369  
370      /**
# Line 347 | Line 373 | public class LinkedTransferQueueTest ext
373       */
374      public void testTimedPollWithOffer() throws InterruptedException {
375          final LinkedTransferQueue q = new LinkedTransferQueue();
376 <        Thread t = new Thread(new Runnable() {
377 <            public void run() {
376 >        Thread t = new Thread(new CheckedRunnable() {
377 >            public void realRun() throws InterruptedException {
378 >                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
379 >                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
380                  try {
381 <                    threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
382 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
383 <                    q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
356 <                    threadShouldThrow();
357 <                } catch (InterruptedException success) {
358 <                } catch (Throwable ex) {
359 <                    threadUnexpectedException(ex);
360 <                }
381 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
382 >                    shouldThrow();
383 >                } catch (InterruptedException success) {}
384              }});
385 +
386          t.start();
387          Thread.sleep(SMALL_DELAY_MS);
388 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
388 >        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
389          t.interrupt();
390          t.join();
391      }
# Line 369 | Line 393 | public class LinkedTransferQueueTest ext
393      /**
394       * peek returns next element, or null if empty
395       */
396 <    public void testPeek() {
396 >    public void testPeek() throws InterruptedException {
397          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
398          for (int i = 0; i < SIZE; ++i) {
399              assertEquals(i, (int) q.peek());
# Line 378 | Line 402 | public class LinkedTransferQueueTest ext
402                         i != (int) q.peek());
403          }
404          assertNull(q.peek());
405 +        checkEmpty(q);
406      }
407  
408      /**
409       * element returns next element, or throws NoSuchElementException if empty
410       */
411 <    public void testElement() {
411 >    public void testElement() throws InterruptedException {
412          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
413          for (int i = 0; i < SIZE; ++i) {
414              assertEquals(i, (int) q.element());
# Line 392 | Line 417 | public class LinkedTransferQueueTest ext
417          try {
418              q.element();
419              shouldThrow();
420 <        } catch (NoSuchElementException success) {
421 <        }
420 >        } catch (NoSuchElementException success) {}
421 >        checkEmpty(q);
422      }
423  
424      /**
425       * remove removes next element, or throws NoSuchElementException if empty
426       */
427 <    public void testRemove() {
427 >    public void testRemove() throws InterruptedException {
428          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
429          for (int i = 0; i < SIZE; ++i) {
430              assertEquals(i, (int) q.remove());
# Line 407 | Line 432 | public class LinkedTransferQueueTest ext
432          try {
433              q.remove();
434              shouldThrow();
435 <        } catch (NoSuchElementException success) {
436 <        }
435 >        } catch (NoSuchElementException success) {}
436 >        checkEmpty(q);
437      }
438  
439      /**
440       * remove(x) removes x and returns true if present
441       */
442 <    public void testRemoveElement() {
442 >    public void testRemoveElement() throws InterruptedException {
443          LinkedTransferQueue q = populatedQueue(SIZE);
444          for (int i = 1; i < SIZE; i += 2) {
445              assertTrue(q.remove(i));
# Line 423 | Line 448 | public class LinkedTransferQueueTest ext
448              assertTrue(q.remove(i));
449              assertFalse(q.remove(i + 1));
450          }
451 <        assertTrue(q.isEmpty());
451 >        checkEmpty(q);
452      }
453  
454      /**
# Line 436 | Line 461 | public class LinkedTransferQueueTest ext
461          assertTrue(q.remove(one));
462          assertTrue(q.remove(two));
463          assertTrue(q.add(three));
464 <        assertTrue(q.take() != null);
464 >        assertSame(q.take(), three);
465      }
466  
467      /**
# Line 454 | Line 479 | public class LinkedTransferQueueTest ext
479      /**
480       * clear removes all elements
481       */
482 <    public void testClear() {
482 >    public void testClear() throws InterruptedException {
483          LinkedTransferQueue q = populatedQueue(SIZE);
484          q.clear();
485 <        assertTrue(q.isEmpty());
461 <        assertEquals(0, q.size());
485 >        checkEmpty(q);
486          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
487          q.add(one);
488          assertFalse(q.isEmpty());
489 +        assertEquals(1, q.size());
490          assertTrue(q.contains(one));
491          q.clear();
492 <        assertTrue(q.isEmpty());
492 >        checkEmpty(q);
493      }
494  
495      /**
# Line 482 | Line 507 | public class LinkedTransferQueueTest ext
507      }
508  
509      /**
510 <     * retainAll(c) retains only those elements of c and reports true if changed
510 >     * retainAll(c) retains only those elements of c and reports true
511 >     * if changed
512       */
513      public void testRetainAll() {
514          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 501 | Line 527 | public class LinkedTransferQueueTest ext
527      }
528  
529      /**
530 <     * removeAll(c) removes only those elements of c and reports true if changed
530 >     * removeAll(c) removes only those elements of c and reports true
531 >     * if changed
532       */
533      public void testRemoveAll() {
534          for (int i = 1; i < SIZE; ++i) {
# Line 516 | Line 543 | public class LinkedTransferQueueTest ext
543      }
544  
545      /**
546 <     * toArray contains all elements
546 >     * toArray() contains all elements
547       */
548      public void testToArray() throws InterruptedException {
549          LinkedTransferQueue q = populatedQueue(SIZE);
# Line 542 | Line 569 | public class LinkedTransferQueueTest ext
569       * toArray(null) throws NullPointerException
570       */
571      public void testToArray_BadArg() {
572 +        LinkedTransferQueue q = populatedQueue(SIZE);
573          try {
546            LinkedTransferQueue q = populatedQueue(SIZE);
574              Object o[] = q.toArray(null);
575              shouldThrow();
576 <        } catch (NullPointerException success) {
550 <        }
576 >        } catch (NullPointerException success) {}
577      }
578  
579      /**
580 <     * toArray with incompatible array type throws CCE
580 >     * toArray(incompatible array type) throws CCE
581       */
582      public void testToArray1_BadArg() {
583 +        LinkedTransferQueue q = populatedQueue(SIZE);
584          try {
558            LinkedTransferQueue q = populatedQueue(SIZE);
585              Object o[] = q.toArray(new String[10]);
586              shouldThrow();
587 <        } catch (ArrayStoreException success) {
562 <        }
587 >        } catch (ArrayStoreException success) {}
588      }
589  
590      /**
# Line 568 | Line 593 | public class LinkedTransferQueueTest ext
593      public void testIterator() throws InterruptedException {
594          LinkedTransferQueue q = populatedQueue(SIZE);
595          Iterator it = q.iterator();
596 +        int i = 0;
597          while (it.hasNext()) {
598 <            assertEquals(it.next(), q.take());
598 >            assertEquals(it.next(), i++);
599          }
600 +        assertEquals(i, SIZE);
601      }
602  
603      /**
604 <     * iterator.remove removes current element
604 >     * iterator.remove() removes current element
605       */
606      public void testIteratorRemove() {
607          final LinkedTransferQueue q = new LinkedTransferQueue();
# Line 587 | Line 614 | public class LinkedTransferQueueTest ext
614          it.remove();
615  
616          it = q.iterator();
617 <        assertEquals(it.next(), one);
618 <        assertEquals(it.next(), three);
617 >        assertSame(it.next(), one);
618 >        assertSame(it.next(), three);
619          assertFalse(it.hasNext());
620      }
621  
# Line 596 | Line 623 | public class LinkedTransferQueueTest ext
623       * iterator ordering is FIFO
624       */
625      public void testIteratorOrdering() {
626 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
626 >        final LinkedTransferQueue<Integer> q
627 >            = new LinkedTransferQueue<Integer>();
628          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
629          q.add(one);
630          q.add(two);
# Line 643 | Line 671 | public class LinkedTransferQueueTest ext
671          q.add(one);
672          q.add(two);
673          ExecutorService executor = Executors.newFixedThreadPool(2);
674 <        executor.execute(new Runnable() {
675 <            public void run() {
676 <                try {
677 <                    threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
650 <                } catch (Throwable ex) {
651 <                    threadUnexpectedException(ex);
652 <                }
674 >
675 >        executor.execute(new CheckedRunnable() {
676 >            public void realRun() {
677 >                assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
678              }});
679  
680 <        executor.execute(new Runnable() {
681 <            public void run() {
682 <                try {
683 <                    Thread.sleep(SMALL_DELAY_MS);
659 <                    threadAssertEquals(one, q.take());
660 <                } catch (Throwable ex) {
661 <                    threadUnexpectedException(ex);
662 <                }
680 >        executor.execute(new CheckedRunnable() {
681 >            public void realRun() throws InterruptedException {
682 >                Thread.sleep(SMALL_DELAY_MS);
683 >                assertSame(one, q.take());
684              }});
685  
686          joinPool(executor);
687      }
688  
689      /**
690 <     * poll retrieves elements across Executor threads
690 >     * timed poll retrieves elements across Executor threads
691       */
692      public void testPollInExecutor() {
693          final LinkedTransferQueue q = new LinkedTransferQueue();
694          ExecutorService executor = Executors.newFixedThreadPool(2);
695 <        executor.execute(new Runnable() {
696 <            public void run() {
697 <                try {
698 <                    threadAssertNull(q.poll());
699 <                    threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
700 <                    threadAssertTrue(q.isEmpty());
680 <                } catch (Throwable  ex) {
681 <                    threadUnexpectedException(ex);
682 <                }
695 >
696 >        executor.execute(new CheckedRunnable() {
697 >            public void realRun() throws InterruptedException {
698 >                assertNull(q.poll());
699 >                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
700 >                assertTrue(q.isEmpty());
701              }});
702  
703 <        executor.execute(new Runnable() {
704 <            public void run() {
705 <                try {
706 <                    Thread.sleep(SMALL_DELAY_MS);
689 <                    q.put(one);
690 <                } catch (Throwable ex) {
691 <                    threadUnexpectedException(ex);
692 <                }
703 >        executor.execute(new CheckedRunnable() {
704 >            public void realRun() throws InterruptedException {
705 >                Thread.sleep(SMALL_DELAY_MS);
706 >                q.put(one);
707              }});
708  
709          joinPool(executor);
# Line 702 | Line 716 | public class LinkedTransferQueueTest ext
716          LinkedTransferQueue q = populatedQueue(SIZE);
717  
718          ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
719 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
719 >        ObjectOutputStream out
720 >            = new ObjectOutputStream(new BufferedOutputStream(bout));
721          out.writeObject(q);
722          out.close();
723  
724 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
725 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
724 >        ByteArrayInputStream bin
725 >            = new ByteArrayInputStream(bout.toByteArray());
726 >        ObjectInputStream in
727 >            = new ObjectInputStream(new BufferedInputStream(bin));
728          LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
729  
730          assertEquals(q.size(), r.size());
# Line 724 | Line 741 | public class LinkedTransferQueueTest ext
741          try {
742              q.drainTo(null);
743              shouldThrow();
744 <        } catch (NullPointerException success) {
728 <        }
744 >        } catch (NullPointerException success) {}
745      }
746  
747      /**
# Line 736 | Line 752 | public class LinkedTransferQueueTest ext
752          try {
753              q.drainTo(q);
754              shouldThrow();
755 <        } catch (IllegalArgumentException success) {
740 <        }
755 >        } catch (IllegalArgumentException success) {}
756      }
757  
758      /**
# Line 767 | Line 782 | public class LinkedTransferQueueTest ext
782      }
783  
784      /**
785 <     * drainTo empties full queue, unblocking a waiting put.
785 >     * drainTo(c) empties full queue, unblocking a waiting put.
786       */
787      public void testDrainToWithActivePut() throws InterruptedException {
788          final LinkedTransferQueue q = populatedQueue(SIZE);
789 <        Thread t = new Thread(new Runnable() {
790 <            public void run() {
791 <                try {
777 <                    q.put(SIZE + 1);
778 <                } catch (Throwable ex) {
779 <                    threadUnexpectedException(ex);
780 <                }
789 >        Thread t = newStartedThread(new CheckedRunnable() {
790 >            public void realRun() {
791 >                q.put(SIZE + 1);
792              }});
782        t.start();
793          ArrayList l = new ArrayList();
794          q.drainTo(l);
795          assertTrue(l.size() >= SIZE);
# Line 796 | Line 806 | public class LinkedTransferQueueTest ext
806      public void testDrainToNullN() {
807          LinkedTransferQueue q = populatedQueue(SIZE);
808          try {
809 <            q.drainTo(null, 0);
809 >            q.drainTo(null, SIZE);
810              shouldThrow();
811 <        } catch (NullPointerException success) {
802 <        }
811 >        } catch (NullPointerException success) {}
812      }
813  
814      /**
# Line 808 | Line 817 | public class LinkedTransferQueueTest ext
817      public void testDrainToSelfN() {
818          LinkedTransferQueue q = populatedQueue(SIZE);
819          try {
820 <            q.drainTo(q, 0);
820 >            q.drainTo(q, SIZE);
821              shouldThrow();
822 <        } catch (IllegalArgumentException success) {
814 <        }
822 >        } catch (IllegalArgumentException success) {}
823      }
824  
825      /**
# Line 837 | Line 845 | public class LinkedTransferQueueTest ext
845      }
846  
847      /**
848 <     * poll and take decrement the waiting consumer count
848 >     * timed poll() or take() increments the waiting consumer count;
849 >     * offer(e) decrements the waiting consumer count
850       */
851      public void testWaitingConsumer() throws InterruptedException {
852          final LinkedTransferQueue q = new LinkedTransferQueue();
853 <        final ConsumerObserver waiting = new ConsumerObserver();
854 <        new Thread(new Runnable() {
855 <            public void run() {
856 <                try {
857 <                    threadAssertTrue(q.hasWaitingConsumer());
858 <                    waiting.setWaitingConsumer(q.getWaitingConsumerCount());
859 <                    threadAssertTrue(q.offer(new Object()));
860 <                } catch (Throwable ex) {
861 <                    threadUnexpectedException(ex);
862 <                }
863 <            }}).start();
864 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) != null);
865 <        assertTrue(q.getWaitingConsumerCount() < waiting.getWaitingConsumers());
853 >        assertEquals(q.getWaitingConsumerCount(), 0);
854 >        assertFalse(q.hasWaitingConsumer());
855 >
856 >        Thread t = newStartedThread(new CheckedRunnable() {
857 >            public void realRun() throws InterruptedException {
858 >                Thread.sleep(SMALL_DELAY_MS);
859 >                assertTrue(q.hasWaitingConsumer());
860 >                assertEquals(q.getWaitingConsumerCount(), 1);
861 >                assertTrue(q.offer(one));
862 >                assertFalse(q.hasWaitingConsumer());
863 >                assertEquals(q.getWaitingConsumerCount(), 0);
864 >            }});
865 >
866 >        assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
867 >        assertEquals(q.getWaitingConsumerCount(), 0);
868 >        assertFalse(q.hasWaitingConsumer());
869 >        t.join();
870      }
871  
872      /**
# Line 864 | Line 877 | public class LinkedTransferQueueTest ext
877              LinkedTransferQueue q = new LinkedTransferQueue();
878              q.transfer(null);
879              shouldThrow();
880 <        } catch (NullPointerException ex) {
868 <        }
880 >        } catch (NullPointerException success) {}
881      }
882  
883      /**
# Line 873 | Line 885 | public class LinkedTransferQueueTest ext
885       * is returned by this associated poll.
886       */
887      public void testTransfer2() throws InterruptedException {
888 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
888 >        final LinkedTransferQueue<Integer> q
889 >            = new LinkedTransferQueue<Integer>();
890  
891 <        new Thread(new Runnable() {
892 <            public void run() {
893 <                try {
894 <                    q.transfer(SIZE);
895 <                    threadAssertTrue(q.isEmpty());
883 <                } catch (Throwable ex) {
884 <                    threadUnexpectedException(ex);
885 <                }
886 <            }}).start();
891 >        Thread t = newStartedThread(new CheckedRunnable() {
892 >            public void realRun() throws InterruptedException {
893 >                q.transfer(SIZE);
894 >                assertTrue(q.isEmpty());
895 >            }});
896  
897          Thread.sleep(SHORT_DELAY_MS);
898          assertEquals(1, q.size());
899          assertEquals(SIZE, (int) q.poll());
900          assertTrue(q.isEmpty());
901 +        t.join();
902      }
903  
904      /**
905       * transfer waits until a poll occurs, and then transfers in fifo order
906       */
907      public void testTransfer3() throws InterruptedException {
908 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
908 >        final LinkedTransferQueue<Integer> q
909 >            = new LinkedTransferQueue<Integer>();
910  
911 <        Thread first =
912 <            new Thread(new Runnable() {
913 <                public void run() {
914 <                    try {
915 <                        Integer i = SIZE + 1;
916 <                        q.transfer(i);
917 <                        threadAssertTrue(!q.contains(i));
907 <                        threadAssertEquals(1, q.size());
908 <                    } catch (Throwable ex) {
909 <                        threadUnexpectedException(ex);
910 <                    }
911 <                }});
912 <        first.start();
911 >        Thread first = newStartedThread(new CheckedRunnable() {
912 >            public void realRun() throws InterruptedException {
913 >                Integer i = SIZE + 1;
914 >                q.transfer(i);
915 >                assertTrue(!q.contains(i));
916 >                assertEquals(1, q.size());
917 >            }});
918  
919 <        Thread interruptedThread =
920 <            new Thread(new Runnable() {
921 <                public void run() {
922 <                    try {
923 <                        while (q.size() == 0)
924 <                            Thread.yield();
920 <                        q.transfer(SIZE);
921 <                        threadShouldThrow();
922 <                    } catch (InterruptedException success) {
923 <                    } catch (Throwable ex) {
924 <                        threadUnexpectedException(ex);
925 <                    }
919 >        Thread interruptedThread = newStartedThread(
920 >            new CheckedInterruptedRunnable() {
921 >                public void realRun() throws InterruptedException {
922 >                    while (q.size() == 0)
923 >                        Thread.yield();
924 >                    q.transfer(SIZE);
925                  }});
927        interruptedThread.start();
926  
927          while (q.size() < 2)
928              Thread.yield();
# Line 944 | Line 942 | public class LinkedTransferQueueTest ext
942       */
943      public void testTransfer4() throws InterruptedException {
944          final LinkedTransferQueue q = new LinkedTransferQueue();
945 <        new Thread(new Runnable() {
946 <            public void run() {
947 <                try {
948 <                    q.transfer(four);
949 <                    threadAssertFalse(q.contains(four));
950 <                    threadAssertEquals(three, q.poll());
951 <                } catch (Throwable ex) {
952 <                    threadUnexpectedException(ex);
953 <                }
956 <            }}).start();
957 <        Thread.sleep(MEDIUM_DELAY_MS);
945 >
946 >        Thread t = newStartedThread(new CheckedRunnable() {
947 >            public void realRun() throws InterruptedException {
948 >                q.transfer(four);
949 >                assertFalse(q.contains(four));
950 >                assertSame(three, q.poll());
951 >            }});
952 >
953 >        Thread.sleep(SHORT_DELAY_MS);
954          assertTrue(q.offer(three));
955 <        assertEquals(four, q.poll());
955 >        assertSame(four, q.poll());
956 >        t.join();
957      }
958  
959      /**
# Line 964 | Line 961 | public class LinkedTransferQueueTest ext
961       * is returned by this associated take.
962       */
963      public void testTransfer5() throws InterruptedException {
964 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
964 >        final LinkedTransferQueue<Integer> q
965 >            = new LinkedTransferQueue<Integer>();
966  
967 <        new Thread(new Runnable() {
968 <            public void run() {
969 <                try {
970 <                    q.transfer(SIZE);
971 <                    threadAssertTrue(q.isEmpty());
974 <                } catch (Throwable ex) {
975 <                    threadUnexpectedException(ex);
976 <                }
977 <            }}).start();
967 >        Thread t = newStartedThread(new CheckedRunnable() {
968 >            public void realRun() throws InterruptedException {
969 >                q.transfer(SIZE);
970 >                checkEmpty(q);
971 >            }});
972  
973          Thread.sleep(SHORT_DELAY_MS);
974          assertEquals(SIZE, (int) q.take());
975 <        assertTrue(q.isEmpty());
975 >        checkEmpty(q);
976 >        t.join();
977      }
978  
979      /**
# Line 988 | Line 983 | public class LinkedTransferQueueTest ext
983          try {
984              final LinkedTransferQueue q = new LinkedTransferQueue();
985              q.tryTransfer(null);
986 <            this.shouldThrow();
987 <        } catch (NullPointerException ex) {
993 <        }
986 >            shouldThrow();
987 >        } catch (NullPointerException success) {}
988      }
989  
990      /**
991       * tryTransfer returns false and does not enqueue if there are no
992       * consumers waiting to poll or take.
993       */
994 <    public void testTryTransfer2() {
994 >    public void testTryTransfer2() throws InterruptedException {
995          final LinkedTransferQueue q = new LinkedTransferQueue();
996          assertFalse(q.tryTransfer(new Object()));
997          assertFalse(q.hasWaitingConsumer());
998 <        assertTrue(q.isEmpty());
1005 <        assertEquals(0, q.size());
998 >        checkEmpty(q);
999      }
1000  
1001      /**
# Line 1012 | Line 1005 | public class LinkedTransferQueueTest ext
1005      public void testTryTransfer3() throws InterruptedException {
1006          final Object hotPotato = new Object();
1007          final LinkedTransferQueue q = new LinkedTransferQueue();
1008 <        new Thread(new Runnable() {
1009 <            public void run() {
1010 <                try {
1011 <                    while (! q.hasWaitingConsumer())
1012 <                        Thread.yield();
1013 <                    threadAssertTrue(q.hasWaitingConsumer());
1014 <                    threadAssertTrue(q.isEmpty());
1015 <                    threadAssertTrue(q.size() == 0);
1016 <                    threadAssertTrue(q.tryTransfer(hotPotato));
1017 <                } catch (Throwable ex) {
1018 <                    threadUnexpectedException(ex);
1019 <                }
1020 <            }}).start();
1021 <        assertTrue(q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS) == hotPotato);
1029 <        assertTrue(q.isEmpty());
1008 >
1009 >        Thread t = newStartedThread(new CheckedRunnable() {
1010 >            public void realRun() {
1011 >                while (! q.hasWaitingConsumer())
1012 >                    Thread.yield();
1013 >                assertTrue(q.hasWaitingConsumer());
1014 >                assertTrue(q.isEmpty());
1015 >                assertEquals(q.size(), 0);
1016 >                assertTrue(q.tryTransfer(hotPotato));
1017 >            }});
1018 >
1019 >        assertSame(hotPotato, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
1020 >        checkEmpty(q);
1021 >        t.join();
1022      }
1023  
1024      /**
# Line 1036 | Line 1028 | public class LinkedTransferQueueTest ext
1028      public void testTryTransfer4() throws InterruptedException {
1029          final Object hotPotato = new Object();
1030          final LinkedTransferQueue q = new LinkedTransferQueue();
1031 <        new Thread(new Runnable() {
1032 <            public void run() {
1033 <                try {
1034 <                    while (! q.hasWaitingConsumer())
1035 <                        Thread.yield();
1036 <                    threadAssertTrue(q.hasWaitingConsumer());
1037 <                    threadAssertTrue(q.isEmpty());
1038 <                    threadAssertTrue(q.size() == 0);
1039 <                    threadAssertTrue(q.tryTransfer(hotPotato));
1040 <                } catch (Throwable ex) {
1041 <                    threadUnexpectedException(ex);
1042 <                }
1043 <            }}).start();
1044 <        assertTrue(q.take() == hotPotato);
1053 <        assertTrue(q.isEmpty());
1031 >
1032 >        Thread t = newStartedThread(new CheckedRunnable() {
1033 >            public void realRun() {
1034 >                while (! q.hasWaitingConsumer())
1035 >                    Thread.yield();
1036 >                assertTrue(q.hasWaitingConsumer());
1037 >                assertTrue(q.isEmpty());
1038 >                assertEquals(q.size(), 0);
1039 >                assertTrue(q.tryTransfer(hotPotato));
1040 >            }});
1041 >
1042 >        assertSame(q.take(), hotPotato);
1043 >        checkEmpty(q);
1044 >        t.join();
1045      }
1046  
1047      /**
# Line 1059 | Line 1050 | public class LinkedTransferQueueTest ext
1050       */
1051      public void testTryTransfer5() throws InterruptedException {
1052          final LinkedTransferQueue q = new LinkedTransferQueue();
1053 <        Thread toInterrupt = new Thread(new Runnable() {
1054 <            public void run() {
1055 <                try {
1056 <                    q.tryTransfer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
1066 <                    threadShouldThrow();
1067 <                } catch (InterruptedException success) {
1068 <                } catch (Throwable ex) {
1069 <                    threadUnexpectedException(ex);
1070 <                }
1053 >
1054 >        Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
1055 >            public void realRun() throws InterruptedException {
1056 >                q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1057              }});
1058 <        toInterrupt.start();
1058 >
1059          Thread.sleep(SMALL_DELAY_MS);
1060          toInterrupt.interrupt();
1061 +        toInterrupt.join();
1062      }
1063  
1064      /**
# Line 1079 | Line 1066 | public class LinkedTransferQueueTest ext
1066       */
1067      public void testTryTransfer6() throws InterruptedException {
1068          final LinkedTransferQueue q = new LinkedTransferQueue();
1069 <        new Thread(new Runnable() {
1070 <            public void run() {
1071 <                try {
1072 <                    threadAssertFalse(q.tryTransfer(new Object(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1073 <                } catch (Throwable ex) {
1074 <                    threadUnexpectedException(ex);
1075 <                }
1076 <            }}).start();
1077 <        Thread.sleep(LONG_DELAY_MS);
1078 <        assertTrue(q.isEmpty());
1069 >
1070 >        Thread t = newStartedThread(new CheckedRunnable() {
1071 >            public void realRun() throws InterruptedException {
1072 >                assertFalse(q.tryTransfer(new Object(),
1073 >                                          SHORT_DELAY_MS, MILLISECONDS));
1074 >            }});
1075 >
1076 >        Thread.sleep(SMALL_DELAY_MS);
1077 >        checkEmpty(q);
1078 >        t.join();
1079      }
1080  
1081      /**
# Line 1098 | Line 1085 | public class LinkedTransferQueueTest ext
1085      public void testTryTransfer7() throws InterruptedException {
1086          final LinkedTransferQueue q = new LinkedTransferQueue();
1087          assertTrue(q.offer(four));
1088 <        new Thread(new Runnable() {
1089 <            public void run() {
1090 <                try {
1091 <                    threadAssertTrue(q.tryTransfer(five, LONG_DELAY_MS, TimeUnit.MILLISECONDS));
1092 <                    threadAssertTrue(q.isEmpty());
1093 <                } catch (Throwable ex) {
1094 <                    threadUnexpectedException(ex);
1108 <                }
1109 <            }}).start();
1088 >
1089 >        Thread t = newStartedThread(new CheckedRunnable() {
1090 >            public void realRun() throws InterruptedException {
1091 >                assertTrue(q.tryTransfer(five, MEDIUM_DELAY_MS, MILLISECONDS));
1092 >                assertTrue(q.isEmpty());
1093 >            }});
1094 >
1095          Thread.sleep(SHORT_DELAY_MS);
1096          assertEquals(2, q.size());
1097 <        assertEquals(four, q.poll());
1098 <        assertEquals(five, q.poll());
1099 <        assertTrue(q.isEmpty());
1097 >        assertSame(four, q.poll());
1098 >        assertSame(five, q.poll());
1099 >        checkEmpty(q);
1100 >        t.join();
1101      }
1102  
1103      /**
# Line 1122 | Line 1108 | public class LinkedTransferQueueTest ext
1108          final LinkedTransferQueue q = new LinkedTransferQueue();
1109          assertTrue(q.offer(four));
1110          assertEquals(1, q.size());
1111 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
1111 >        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1112          assertEquals(1, q.size());
1113 <        assertEquals(four, q.poll());
1128 <        threadAssertTrue(q.isEmpty());
1113 >        assertSame(four, q.poll());
1114          assertNull(q.poll());
1115 +        checkEmpty(q);
1116      }
1117  
1118      private LinkedTransferQueue<Integer> populatedQueue(int n) {
# Line 1140 | Line 1126 | public class LinkedTransferQueueTest ext
1126          assertFalse(q.isEmpty());
1127          return q;
1128      }
1143
1144    private static class ConsumerObserver {
1145
1146        private int waitingConsumers;
1147
1148        private ConsumerObserver() {
1149        }
1150
1151        private void setWaitingConsumer(int i) {
1152            this.waitingConsumers = i;
1153        }
1154
1155        private int getWaitingConsumers() {
1156            return waitingConsumers;
1157        }
1158    }
1129   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines