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

Comparing jsr166/src/test/tck/AbstractQueuedLongSynchronizerTest.java (file contents):
Revision 1.27 by jsr166, Thu May 2 18:01:09 2013 UTC vs.
Revision 1.33 by jsr166, Tue Apr 21 04:48:11 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 – import junit.framework.*;
10 – import java.util.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 +
12 + import java.util.Arrays;
13 + import java.util.Collection;
14 + import java.util.HashSet;
15   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer;
16   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject;
17  
18 + import junit.framework.AssertionFailedError;
19 + import junit.framework.Test;
20 + import junit.framework.TestSuite;
21 +
22   public class AbstractQueuedLongSynchronizerTest extends JSR166TestCase {
23      public static void main(String[] args) {
24          junit.textui.TestRunner.run(suite());
# Line 87 | Line 94 | public class AbstractQueuedLongSynchroni
94          }
95  
96          public boolean tryReleaseShared(long ignore) {
97 <            setState(1 << 62);
97 >            setState(1L << 62);
98              return true;
99          }
100      }
# Line 195 | Line 202 | public class AbstractQueuedLongSynchroni
202                       new HashSet<Thread>(Arrays.asList(threads)));
203      }
204  
205 <    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
205 >    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
206  
207      /**
208       * Awaits condition using the specified AwaitMethod.
# Line 218 | Line 225 | public class AbstractQueuedLongSynchroni
225          case awaitUntil:
226              assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
227              break;
228 +        default:
229 +            throw new AssertionError();
230          }
231      }
232  
# Line 1188 | Line 1197 | public class AbstractQueuedLongSynchroni
1197      public void testTryAcquireSharedNanos_Timeout() {
1198          final BooleanLatch l = new BooleanLatch();
1199          final BooleanLatch observedQueued = new BooleanLatch();
1191 –        final long timeoutMillis = timeoutMillis();
1200          Thread t = newStartedThread(new CheckedRunnable() {
1201              public void realRun() throws InterruptedException {
1202                  assertFalse(l.isSignalled());
# Line 1210 | Line 1218 | public class AbstractQueuedLongSynchroni
1218          assertFalse(l.isSignalled());
1219      }
1220  
1221 +    /**
1222 +     * awaitNanos/timed await with 0 wait times out immediately
1223 +     */
1224 +    public void testAwait_Zero() throws InterruptedException {
1225 +        final Mutex sync = new Mutex();
1226 +        final ConditionObject c = sync.newCondition();
1227 +        sync.acquire();
1228 +        assertTrue(c.awaitNanos(0L) <= 0);
1229 +        assertFalse(c.await(0L, NANOSECONDS));
1230 +        sync.release();
1231 +    }
1232 +
1233 +    /**
1234 +     * awaitNanos/timed await with maximum negative wait times does not underflow
1235 +     */
1236 +    public void testAwait_NegativeInfinity() throws InterruptedException {
1237 +        final Mutex sync = new Mutex();
1238 +        final ConditionObject c = sync.newCondition();
1239 +        sync.acquire();
1240 +        assertTrue(c.awaitNanos(Long.MIN_VALUE) <= 0);
1241 +        assertFalse(c.await(Long.MIN_VALUE, NANOSECONDS));
1242 +        sync.release();
1243 +    }
1244 +
1245   }

Diff Legend

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