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.22 by jsr166, Sat Nov 21 19:11:53 2009 UTC vs.
Revision 1.34 by dl, Wed Sep 29 12:33:48 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 493 | Line 489 | public class DelayQueueTest extends JSR1
489       */
490      public void testTimedPollWithOffer() throws InterruptedException {
491          final DelayQueue q = new DelayQueue();
492 +        final PDelay pdelay = new PDelay(0);
493          Thread t = new Thread(new CheckedRunnable() {
494              public void realRun() throws InterruptedException {
498 –                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
499 –                q.poll(LONG_DELAY_MS, MILLISECONDS);
495                  try {
496 +                    assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
497 +                    assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
498                      q.poll(LONG_DELAY_MS, MILLISECONDS);
499                      shouldThrow();
500                  } catch (InterruptedException success) {}
# Line 505 | Line 502 | public class DelayQueueTest extends JSR1
502  
503          t.start();
504          Thread.sleep(SMALL_DELAY_MS);
505 <        assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS));
505 >        assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
506          t.interrupt();
507          t.join();
508      }
# Line 518 | Line 515 | public class DelayQueueTest extends JSR1
515          DelayQueue q = populatedQueue(SIZE);
516          for (int i = 0; i < SIZE; ++i) {
517              assertEquals(new PDelay(i), ((PDelay)q.peek()));
518 <            q.poll();
518 >            assertEquals(new PDelay(i), ((PDelay)q.poll()));
519              if (q.isEmpty())
520                  assertNull(q.peek());
521              else
522 <                assertTrue(i != ((PDelay)q.peek()).intValue());
522 >                assertFalse(new PDelay(i).equals(q.peek()));
523          }
524          assertNull(q.peek());
525      }
# Line 677 | Line 674 | public class DelayQueueTest extends JSR1
674       * toArray(null) throws NPE
675       */
676      public void testToArray_BadArg() {
677 +        DelayQueue q = populatedQueue(SIZE);
678          try {
681 –            DelayQueue q = populatedQueue(SIZE);
679              Object o[] = q.toArray(null);
680              shouldThrow();
681          } catch (NullPointerException success) {}
# Line 688 | Line 685 | public class DelayQueueTest extends JSR1
685       * toArray with incompatible array type throws CCE
686       */
687      public void testToArray1_BadArg() {
688 +        DelayQueue q = populatedQueue(SIZE);
689          try {
690 <            DelayQueue q = populatedQueue(SIZE);
693 <            Object o[] = q.toArray(new String[10] );
690 >            Object o[] = q.toArray(new String[10]);
691              shouldThrow();
692          } catch (ArrayStoreException success) {}
693      }
# Line 712 | Line 709 | public class DelayQueueTest extends JSR1
709      /**
710       * iterator.remove removes current element
711       */
712 <    public void testIteratorRemove () {
712 >    public void testIteratorRemove() {
713          final DelayQueue q = new DelayQueue();
714          q.add(new PDelay(2));
715          q.add(new PDelay(1));
# Line 746 | Line 743 | public class DelayQueueTest extends JSR1
743          ExecutorService executor = Executors.newFixedThreadPool(2);
744          executor.execute(new CheckedRunnable() {
745              public void realRun() throws InterruptedException {
746 <                threadAssertNull(q.poll());
747 <                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
748 <                threadAssertTrue(q.isEmpty());
746 >                assertNull(q.poll());
747 >                assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
748 >                assertTrue(q.isEmpty());
749              }});
750  
751          executor.execute(new CheckedRunnable() {
# Line 758 | Line 755 | public class DelayQueueTest extends JSR1
755              }});
756  
757          joinPool(executor);
761 –
758      }
759  
760  
# Line 792 | Line 788 | public class DelayQueueTest extends JSR1
788      public void testPeekDelayed() {
789          DelayQueue q = new DelayQueue();
790          q.add(new NanoDelay(Long.MAX_VALUE));
791 <        assert(q.peek() != null);
791 >        assertNotNull(q.peek());
792      }
793  
794  

Diff Legend

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