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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.21 by jsr166, Sat Nov 21 10:29:50 2009 UTC vs.
Revision 1.39 by jsr166, Tue Oct 19 00:43:49 2010 UTC

# Line 13 | Line 13 | import java.util.concurrent.*;
13  
14   public class DelayQueueTest extends JSR166TestCase {
15      public static void main(String[] args) {
16 <        junit.textui.TestRunner.run (suite());
16 >        junit.textui.TestRunner.run(suite());
17      }
18  
19      public static Test suite() {
# Line 24 | Line 24 | public class DelayQueueTest extends JSR1
24  
25      /**
26       * A delayed implementation for testing.
27 <     * Most  tests use Pseudodelays, where delays are all elapsed
27 >     * Most tests use Pseudodelays, where delays are all elapsed
28       * (so, no blocking solely for delays) but are still ordered
29       */
30      static class PDelay implements Delayed {
# Line 32 | Line 32 | public class DelayQueueTest extends JSR1
32          PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
33          public int compareTo(PDelay y) {
34              int i = pseudodelay;
35 <            int j = ((PDelay)y).pseudodelay;
35 >            int j = y.pseudodelay;
36              if (i < j) return -1;
37              if (i > j) return 1;
38              return 0;
39          }
40  
41          public int compareTo(Delayed y) {
42 <            int i = pseudodelay;
43 <            int j = ((PDelay)y).pseudodelay;
44 <            if (i < j) return -1;
45 <            if (i > j) return 1;
46 <            return 0;
42 >            return compareTo((PDelay)y);
43          }
44  
45          public boolean equals(Object other) {
46 <            return ((PDelay)other).pseudodelay == pseudodelay;
46 >            return equals((PDelay)other);
47          }
48          public boolean equals(PDelay other) {
49 <            return ((PDelay)other).pseudodelay == pseudodelay;
49 >            return other.pseudodelay == pseudodelay;
50          }
51  
52  
# Line 77 | Line 73 | public class DelayQueueTest extends JSR1
73          }
74          public int compareTo(NanoDelay y) {
75              long i = trigger;
76 <            long j = ((NanoDelay)y).trigger;
76 >            long j = y.trigger;
77              if (i < j) return -1;
78              if (i > j) return 1;
79              return 0;
80          }
81  
82          public int compareTo(Delayed y) {
83 <            long i = trigger;
88 <            long j = ((NanoDelay)y).trigger;
89 <            if (i < j) return -1;
90 <            if (i > j) return 1;
91 <            return 0;
83 >            return compareTo((NanoDelay)y);
84          }
85  
86          public boolean equals(Object other) {
87 <            return ((NanoDelay)other).trigger == trigger;
87 >            return equals((NanoDelay)other);
88          }
89          public boolean equals(NanoDelay other) {
90 <            return ((NanoDelay)other).trigger == trigger;
90 >            return other.trigger == trigger;
91          }
92  
93          public long getDelay(TimeUnit unit) {
# Line 199 | Line 191 | public class DelayQueueTest extends JSR1
191      }
192  
193      /**
194 <     * remainingCapacity does not change when elementa added or removed,
194 >     * remainingCapacity does not change when elements added or removed,
195       * but size does
196       */
197      public void testRemainingCapacity() {
# Line 292 | Line 284 | public class DelayQueueTest extends JSR1
284              shouldThrow();
285          } catch (NullPointerException success) {}
286      }
287 +
288      /**
289       * addAll of a collection with any null elements throws NPE after
290       * possibly adding some elements
# Line 375 | Line 368 | public class DelayQueueTest extends JSR1
368              public void realRun() throws InterruptedException {
369                  q.put(new PDelay(0));
370                  q.put(new PDelay(0));
371 <                threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
372 <                threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
371 >                assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
372 >                assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
373              }});
374  
375          t.start();
# Line 415 | Line 408 | public class DelayQueueTest extends JSR1
408       * Take removes existing elements until empty, then blocks interruptibly
409       */
410      public void testBlockingTake() throws InterruptedException {
411 <        Thread t = new ThreadShouldThrow(InterruptedException.class) {
411 >        final DelayQueue q = populatedQueue(SIZE);
412 >        Thread t = new Thread(new CheckedRunnable() {
413              public void realRun() throws InterruptedException {
420 –                DelayQueue q = populatedQueue(SIZE);
414                  for (int i = 0; i < SIZE; ++i) {
415 <                    threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
415 >                    assertEquals(new PDelay(i), ((PDelay)q.take()));
416                  }
417 <                q.take();
418 <            }};
417 >                try {
418 >                    q.take();
419 >                    shouldThrow();
420 >                } catch (InterruptedException success) {}
421 >            }});
422  
423          t.start();
424          Thread.sleep(SHORT_DELAY_MS);
# Line 476 | Line 472 | public class DelayQueueTest extends JSR1
472                      assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
473                  }
474                  try {
475 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
475 >                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
476                      shouldThrow();
477                  } catch (InterruptedException success) {}
478              }});
# Line 488 | Line 484 | public class DelayQueueTest extends JSR1
484      }
485  
486      /**
487 <     *  timed poll before a delayed offer fails; after offer succeeds;
488 <     *  on interruption throws
487 >     * timed poll before a delayed offer fails; after offer succeeds;
488 >     * on interruption throws
489       */
490      public void testTimedPollWithOffer() throws InterruptedException {
491          final DelayQueue q = new DelayQueue();
492 +        final PDelay pdelay = new PDelay(0);
493 +        final CheckedBarrier barrier = new CheckedBarrier(2);
494          Thread t = new Thread(new CheckedRunnable() {
495              public void realRun() throws InterruptedException {
496                  assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
497 <                q.poll(LONG_DELAY_MS, MILLISECONDS);
497 >
498 >                barrier.await();
499 >                assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
500 >
501 >                Thread.currentThread().interrupt();
502 >                try {
503 >                    q.poll(SHORT_DELAY_MS, MILLISECONDS);
504 >                    shouldThrow();
505 >                } catch (InterruptedException success) {}
506 >
507 >                barrier.await();
508                  try {
509 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
509 >                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
510                      shouldThrow();
511                  } catch (InterruptedException success) {}
512              }});
513  
514          t.start();
515 <        Thread.sleep(SMALL_DELAY_MS);
516 <        assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
515 >        barrier.await();
516 >        assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
517 >        barrier.await();
518 >        sleep(SHORT_DELAY_MS);
519          t.interrupt();
520          t.join();
521      }
# Line 518 | Line 528 | public class DelayQueueTest extends JSR1
528          DelayQueue q = populatedQueue(SIZE);
529          for (int i = 0; i < SIZE; ++i) {
530              assertEquals(new PDelay(i), ((PDelay)q.peek()));
531 <            q.poll();
531 >            assertEquals(new PDelay(i), ((PDelay)q.poll()));
532              if (q.isEmpty())
533                  assertNull(q.peek());
534              else
535 <                assertTrue(i != ((PDelay)q.peek()).intValue());
535 >                assertFalse(new PDelay(i).equals(q.peek()));
536          }
537          assertNull(q.peek());
538      }
# Line 677 | Line 687 | public class DelayQueueTest extends JSR1
687       * toArray(null) throws NPE
688       */
689      public void testToArray_BadArg() {
690 +        DelayQueue q = populatedQueue(SIZE);
691          try {
681 –            DelayQueue q = populatedQueue(SIZE);
692              Object o[] = q.toArray(null);
693              shouldThrow();
694          } catch (NullPointerException success) {}
# Line 688 | Line 698 | public class DelayQueueTest extends JSR1
698       * toArray with incompatible array type throws CCE
699       */
700      public void testToArray1_BadArg() {
701 +        DelayQueue q = populatedQueue(SIZE);
702          try {
703 <            DelayQueue q = populatedQueue(SIZE);
693 <            Object o[] = q.toArray(new String[10] );
703 >            Object o[] = q.toArray(new String[10]);
704              shouldThrow();
705          } catch (ArrayStoreException success) {}
706      }
# Line 712 | Line 722 | public class DelayQueueTest extends JSR1
722      /**
723       * iterator.remove removes current element
724       */
725 <    public void testIteratorRemove () {
725 >    public void testIteratorRemove() {
726          final DelayQueue q = new DelayQueue();
727          q.add(new PDelay(2));
728          q.add(new PDelay(1));
# Line 746 | Line 756 | public class DelayQueueTest extends JSR1
756          ExecutorService executor = Executors.newFixedThreadPool(2);
757          executor.execute(new CheckedRunnable() {
758              public void realRun() throws InterruptedException {
759 <                threadAssertNull(q.poll());
760 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
761 <                threadAssertTrue(q.isEmpty());
759 >                assertNull(q.poll());
760 >                assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
761 >                assertTrue(q.isEmpty());
762              }});
763  
764          executor.execute(new CheckedRunnable() {
# Line 758 | Line 768 | public class DelayQueueTest extends JSR1
768              }});
769  
770          joinPool(executor);
761 –
771      }
772  
773  
# Line 766 | Line 775 | public class DelayQueueTest extends JSR1
775       * Delayed actions do not occur until their delay elapses
776       */
777      public void testDelay() throws InterruptedException {
778 <        DelayQueue q = new DelayQueue();
779 <        NanoDelay[] elements = new NanoDelay[SIZE];
780 <        for (int i = 0; i < SIZE; ++i) {
772 <            elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
773 <        }
774 <        for (int i = 0; i < SIZE; ++i) {
775 <            q.add(elements[i]);
776 <        }
778 >        DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
779 >        for (int i = 0; i < SIZE; ++i)
780 >            q.add(new NanoDelay(1000000L * (SIZE - i)));
781  
782          long last = 0;
783          for (int i = 0; i < SIZE; ++i) {
784 <            NanoDelay e = (NanoDelay)(q.take());
784 >            NanoDelay e = q.take();
785              long tt = e.getTriggerTime();
786 <            assertTrue(tt <= System.nanoTime());
786 >            assertTrue(System.nanoTime() - tt >= 0);
787              if (i != 0)
788                  assertTrue(tt >= last);
789              last = tt;
790          }
791 +        assertTrue(q.isEmpty());
792      }
793  
794      /**
# Line 792 | Line 797 | public class DelayQueueTest extends JSR1
797      public void testPeekDelayed() {
798          DelayQueue q = new DelayQueue();
799          q.add(new NanoDelay(Long.MAX_VALUE));
800 <        assert(q.peek() != null);
800 >        assertNotNull(q.peek());
801      }
802  
803  
# Line 905 | Line 910 | public class DelayQueueTest extends JSR1
910      }
911  
912      /**
913 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
913 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
914       */
915      public void testDrainToN() {
916          for (int i = 0; i < SIZE + 2; ++i) {
917              DelayQueue q = populatedQueue(SIZE);
918              ArrayList l = new ArrayList();
919              q.drainTo(l, i);
920 <            int k = (i < SIZE)? i : SIZE;
920 >            int k = (i < SIZE) ? i : SIZE;
921              assertEquals(q.size(), SIZE-k);
922              assertEquals(l.size(), k);
923          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines