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.26 by jsr166, Sun Nov 22 18:57:17 2009 UTC vs.
Revision 1.37 by jsr166, Mon Oct 11 04:35:20 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 491 | 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 <                assertSame(pdelay, 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);
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 716 | 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 750 | 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 762 | Line 768 | public class DelayQueueTest extends JSR1
768              }});
769  
770          joinPool(executor);
765 –
771      }
772  
773  
# Line 770 | 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) {
776 <            elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
777 <        }
778 <        for (int i = 0; i < SIZE; ++i) {
779 <            q.add(elements[i]);
780 <        }
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 796 | 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  

Diff Legend

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