ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ArrayBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.28 by jsr166, Tue Dec 1 09:56:28 2009 UTC vs.
Revision 1.46 by jsr166, Sat May 21 06:24:33 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
# Line 14 | Line 14 | import static java.util.concurrent.TimeU
14   import java.io.*;
15  
16   public class ArrayBlockingQueueTest extends JSR166TestCase {
17 +
18 +    public static class Fair extends BlockingQueueTest {
19 +        protected BlockingQueue emptyCollection() {
20 +            return new ArrayBlockingQueue(20, true);
21 +        }
22 +    }
23 +
24 +    public static class NonFair extends BlockingQueueTest {
25 +        protected BlockingQueue emptyCollection() {
26 +            return new ArrayBlockingQueue(20, false);
27 +        }
28 +    }
29 +
30      public static void main(String[] args) {
31 <        junit.textui.TestRunner.run (suite());
31 >        junit.textui.TestRunner.run(suite());
32      }
33 +
34      public static Test suite() {
35 <        return new TestSuite(ArrayBlockingQueueTest.class);
35 >        return newTestSuite(ArrayBlockingQueueTest.class,
36 >                            new Fair().testSuite(),
37 >                            new NonFair().testSuite());
38      }
39  
40      /**
41       * Create a queue of given size containing consecutive
42       * Integers 0 ... n.
43       */
44 <    private ArrayBlockingQueue populatedQueue(int n) {
45 <        ArrayBlockingQueue q = new ArrayBlockingQueue(n);
44 >    private ArrayBlockingQueue<Integer> populatedQueue(int n) {
45 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
46          assertTrue(q.isEmpty());
47          for (int i = 0; i < n; i++)
48              assertTrue(q.offer(new Integer(i)));
# Line 145 | Line 161 | public class ArrayBlockingQueueTest exte
161      }
162  
163      /**
164 <     *  offer(null) throws NPE
164 >     * offer(null) throws NPE
165       */
166      public void testOfferNull() {
167          try {
# Line 156 | Line 172 | public class ArrayBlockingQueueTest exte
172      }
173  
174      /**
175 <     *  add(null) throws NPE
175 >     * add(null) throws NPE
176       */
177      public void testAddNull() {
178          try {
# Line 191 | Line 207 | public class ArrayBlockingQueueTest exte
207      }
208  
209      /**
210 <     *  addAll(null) throws NPE
210 >     * addAll(null) throws NPE
211       */
212      public void testAddAll1() {
213          try {
# Line 214 | Line 230 | public class ArrayBlockingQueueTest exte
230  
231  
232      /**
233 <     *  addAll of a collection with null elements throws NPE
233 >     * addAll of a collection with null elements throws NPE
234       */
235      public void testAddAll2() {
236          try {
# Line 224 | Line 240 | public class ArrayBlockingQueueTest exte
240              shouldThrow();
241          } catch (NullPointerException success) {}
242      }
243 +
244      /**
245       * addAll of a collection with any null elements throws NPE after
246       * possibly adding some elements
# Line 238 | Line 255 | public class ArrayBlockingQueueTest exte
255              shouldThrow();
256          } catch (NullPointerException success) {}
257      }
258 +
259      /**
260       * addAll throws ISE if not enough room
261       */
# Line 251 | Line 269 | public class ArrayBlockingQueueTest exte
269              shouldThrow();
270          } catch (IllegalStateException success) {}
271      }
272 +
273      /**
274       * Queue contains all elements, in traversal order, of successful addAll
275       */
# Line 267 | Line 286 | public class ArrayBlockingQueueTest exte
286      }
287  
288      /**
289 <     *  put(null) throws NPE
289 >     * put(null) throws NPE
290       */
291      public void testPutNull() throws InterruptedException {
292          try {
# Line 275 | Line 294 | public class ArrayBlockingQueueTest exte
294              q.put(null);
295              shouldThrow();
296          } catch (NullPointerException success) {}
297 <     }
297 >    }
298  
299      /**
300       * all elements successfully put are contained
# Line 308 | Line 327 | public class ArrayBlockingQueueTest exte
327              }});
328  
329          t.start();
330 <        Thread.sleep(SHORT_DELAY_MS);
330 >        delay(SHORT_DELAY_MS);
331          t.interrupt();
332          t.join();
333          assertEquals(SIZE, q.size());
# Line 332 | Line 351 | public class ArrayBlockingQueueTest exte
351              }});
352  
353          t.start();
354 <        Thread.sleep(SHORT_DELAY_MS);
354 >        delay(SHORT_DELAY_MS);
355          assertEquals(q.remainingCapacity(), 0);
356          assertEquals(0, q.take());
357 <        Thread.sleep(SHORT_DELAY_MS);
357 >        delay(SHORT_DELAY_MS);
358          t.interrupt();
359          t.join();
360          assertEquals(q.remainingCapacity(), 0);
# Line 346 | Line 365 | public class ArrayBlockingQueueTest exte
365       */
366      public void testTimedOffer() throws InterruptedException {
367          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
368 <        Thread t = new Thread(new CheckedRunnable() {
368 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
369 >        Thread t = newStartedThread(new CheckedRunnable() {
370              public void realRun() throws InterruptedException {
371                  q.put(new Object());
372                  q.put(new Object());
373 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
373 >                long startTime = System.nanoTime();
374 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
375 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
376 >                pleaseInterrupt.countDown();
377                  try {
378 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
378 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
379                      shouldThrow();
380                  } catch (InterruptedException success) {}
381              }});
382  
383 <        t.start();
361 <        Thread.sleep(SHORT_DELAY_MS);
383 >        await(pleaseInterrupt);
384          t.interrupt();
385 <        t.join();
385 >        awaitTermination(t);
386      }
387  
388      /**
# Line 374 | Line 396 | public class ArrayBlockingQueueTest exte
396      }
397  
398      /**
377     * take blocks interruptibly when empty
378     */
379    public void testTakeFromEmpty() throws InterruptedException {
380        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
381        Thread t = new ThreadShouldThrow(InterruptedException.class) {
382            public void realRun() throws InterruptedException {
383                q.take();
384            }};
385
386        t.start();
387        Thread.sleep(SHORT_DELAY_MS);
388        t.interrupt();
389        t.join();
390    }
391
392    /**
399       * Take removes existing elements until empty, then blocks interruptibly
400       */
401      public void testBlockingTake() throws InterruptedException {
# Line 406 | Line 412 | public class ArrayBlockingQueueTest exte
412              }});
413  
414          t.start();
415 <        Thread.sleep(SHORT_DELAY_MS);
415 >        delay(SHORT_DELAY_MS);
416          t.interrupt();
417          t.join();
418      }
# Line 424 | Line 430 | public class ArrayBlockingQueueTest exte
430      }
431  
432      /**
433 <     * timed pool with zero timeout succeeds when non-empty, else times out
433 >     * timed poll with zero timeout succeeds when non-empty, else times out
434       */
435      public void testTimedPoll0() throws InterruptedException {
436          ArrayBlockingQueue q = populatedQueue(SIZE);
# Line 435 | Line 441 | public class ArrayBlockingQueueTest exte
441      }
442  
443      /**
444 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
444 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
445       */
446      public void testTimedPoll() throws InterruptedException {
447          ArrayBlockingQueue q = populatedQueue(SIZE);
# Line 450 | Line 456 | public class ArrayBlockingQueueTest exte
456       * returning timeout status
457       */
458      public void testInterruptedTimedPoll() throws InterruptedException {
459 <        Thread t = new Thread(new CheckedRunnable() {
459 >        final BlockingQueue<Integer> q = populatedQueue(SIZE);
460 >        final CountDownLatch aboutToWait = new CountDownLatch(1);
461 >        Thread t = newStartedThread(new CheckedRunnable() {
462              public void realRun() throws InterruptedException {
455                ArrayBlockingQueue q = populatedQueue(SIZE);
463                  for (int i = 0; i < SIZE; ++i) {
464 <                    assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));;
464 >                    long t0 = System.nanoTime();
465 >                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
466 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
467                  }
468 +                long t0 = System.nanoTime();
469 +                aboutToWait.countDown();
470                  try {
471 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
471 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
472                      shouldThrow();
473 <                } catch (InterruptedException success) {}
474 <            }});
475 <
465 <        t.start();
466 <        Thread.sleep(SHORT_DELAY_MS);
467 <        t.interrupt();
468 <        t.join();
469 <    }
470 <
471 <    /**
472 <     *  timed poll before a delayed offer fails; after offer succeeds;
473 <     *  on interruption throws
474 <     */
475 <    public void testTimedPollWithOffer() throws InterruptedException {
476 <        final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
477 <        Thread t = new Thread(new CheckedRunnable() {
478 <            public void realRun() throws InterruptedException {
479 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
480 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
481 <                try {
482 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
483 <                    shouldThrow();
484 <                } catch (InterruptedException success) {}
473 >                } catch (InterruptedException success) {
474 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
475 >                }
476              }});
477  
478 <        t.start();
479 <        Thread.sleep(SMALL_DELAY_MS);
489 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
478 >        aboutToWait.await();
479 >        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
480          t.interrupt();
481 <        t.join();
481 >        awaitTermination(t, MEDIUM_DELAY_MS);
482 >        checkEmpty(q);
483      }
484  
494
485      /**
486       * peek returns next element, or null if empty
487       */
# Line 628 | Line 618 | public class ArrayBlockingQueueTest exte
618      }
619  
620      /**
621 <     *  toArray contains all elements
621 >     * toArray contains all elements in FIFO order
622       */
623 <    public void testToArray() throws InterruptedException {
623 >    public void testToArray() {
624          ArrayBlockingQueue q = populatedQueue(SIZE);
625          Object[] o = q.toArray();
626          for (int i = 0; i < o.length; i++)
627 <            assertEquals(o[i], q.take());
627 >            assertSame(o[i], q.poll());
628      }
629  
630      /**
631 <     * toArray(a) contains all elements
631 >     * toArray(a) contains all elements in FIFO order
632       */
633 <    public void testToArray2() throws InterruptedException {
634 <        ArrayBlockingQueue q = populatedQueue(SIZE);
633 >    public void testToArray2() {
634 >        ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
635          Integer[] ints = new Integer[SIZE];
636 <        ints = (Integer[])q.toArray(ints);
636 >        Integer[] array = q.toArray(ints);
637 >        assertSame(ints, array);
638          for (int i = 0; i < ints.length; i++)
639 <            assertEquals(ints[i], q.take());
639 >            assertSame(ints[i], q.poll());
640      }
641  
642      /**
643 <     * toArray(null) throws NPE
643 >     * toArray(null) throws NullPointerException
644       */
645 <    public void testToArray_BadArg() {
645 >    public void testToArray_NullArg() {
646          ArrayBlockingQueue q = populatedQueue(SIZE);
647          try {
648 <            Object o[] = q.toArray(null);
648 >            q.toArray(null);
649              shouldThrow();
650          } catch (NullPointerException success) {}
651      }
652  
653      /**
654 <     * toArray with incompatible array type throws CCE
654 >     * toArray(incompatible array type) throws ArrayStoreException
655       */
656      public void testToArray1_BadArg() {
657          ArrayBlockingQueue q = populatedQueue(SIZE);
658          try {
659 <            Object o[] = q.toArray(new String[10]);
659 >            q.toArray(new String[10]);
660              shouldThrow();
661          } catch (ArrayStoreException success) {}
662      }
# Line 685 | Line 676 | public class ArrayBlockingQueueTest exte
676      /**
677       * iterator.remove removes current element
678       */
679 <    public void testIteratorRemove () {
679 >    public void testIteratorRemove() {
680          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
681          q.add(two);
682          q.add(one);
# Line 722 | Line 713 | public class ArrayBlockingQueueTest exte
713      /**
714       * Modifications do not cause iterators to fail
715       */
716 <    public void testWeaklyConsistentIteration () {
716 >    public void testWeaklyConsistentIteration() {
717          final ArrayBlockingQueue q = new ArrayBlockingQueue(3);
718          q.add(one);
719          q.add(two);
# Line 764 | Line 755 | public class ArrayBlockingQueueTest exte
755  
756          executor.execute(new CheckedRunnable() {
757              public void realRun() throws InterruptedException {
758 <                Thread.sleep(SMALL_DELAY_MS);
758 >                delay(SMALL_DELAY_MS);
759                  assertSame(one, q.take());
760              }});
761  
# Line 786 | Line 777 | public class ArrayBlockingQueueTest exte
777  
778          executor.execute(new CheckedRunnable() {
779              public void realRun() throws InterruptedException {
780 <                Thread.sleep(SMALL_DELAY_MS);
780 >                delay(SMALL_DELAY_MS);
781                  q.put(one);
782              }});
783  
# Line 901 | Line 892 | public class ArrayBlockingQueueTest exte
892      }
893  
894      /**
895 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
895 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
896       */
897      public void testDrainToN() {
898          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
# Line 910 | Line 901 | public class ArrayBlockingQueueTest exte
901                  assertTrue(q.offer(new Integer(j)));
902              ArrayList l = new ArrayList();
903              q.drainTo(l, i);
904 <            int k = (i < SIZE)? i : SIZE;
904 >            int k = (i < SIZE) ? i : SIZE;
905              assertEquals(l.size(), k);
906              assertEquals(q.size(), SIZE-k);
907              for (int j = 0; j < k; ++j)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines