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.79 by jsr166, Mon Oct 17 01:54:51 2016 UTC vs.
Revision 1.80 by jsr166, Tue Jan 3 07:29:30 2017 UTC

# Line 52 | Line 52 | public class DelayQueueTest extends JSR1
52      }
53  
54      /**
55 <     * A delayed implementation for testing.
56 <     * Most tests use Pseudodelays, where delays are all elapsed
55 >     * A fake Delayed implementation for testing.
56 >     * Most tests use PDelays, where delays are all elapsed
57       * (so, no blocking solely for delays) but are still ordered
58       */
59      static class PDelay implements Delayed {
60 <        int pseudodelay;
61 <        PDelay(int i) { pseudodelay = i; }
62 <        public int compareTo(PDelay other) {
63 <            int a = this.pseudodelay;
64 <            int b = other.pseudodelay;
65 <            return (a < b) ? -1 : (a > b) ? 1 : 0;
66 <        }
60 >        final int pseudodelay;
61 >        PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62          public int compareTo(Delayed y) {
63 <            return compareTo((PDelay)y);
63 >            return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64          }
65          public boolean equals(Object other) {
66              return (other instanceof PDelay) &&
# Line 85 | Line 80 | public class DelayQueueTest extends JSR1
80       * Delayed implementation that actually delays
81       */
82      static class NanoDelay implements Delayed {
83 <        long trigger;
83 >        final long trigger;
84          NanoDelay(long i) {
85              trigger = System.nanoTime() + i;
86          }
92        public int compareTo(NanoDelay y) {
93            long i = trigger;
94            long j = y.trigger;
95            if (i < j) return -1;
96            if (i > j) return 1;
97            return 0;
98        }
87  
88          public int compareTo(Delayed y) {
89 <            return compareTo((NanoDelay)y);
89 >            return Long.compare(trigger, ((NanoDelay)y).trigger);
90          }
91  
92          public boolean equals(Object other) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines