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.26 by jsr166, Fri Jan 18 04:23:28 2013 UTC vs.
Revision 1.32 by jsr166, Sun Feb 22 04:34:44 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 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 1187 | Line 1196 | public class AbstractQueuedLongSynchroni
1196       */
1197      public void testTryAcquireSharedNanos_Timeout() {
1198          final BooleanLatch l = new BooleanLatch();
1199 +        final BooleanLatch observedQueued = new BooleanLatch();
1200          Thread t = newStartedThread(new CheckedRunnable() {
1201              public void realRun() throws InterruptedException {
1202                  assertFalse(l.isSignalled());
1203 <                long startTime = System.nanoTime();
1204 <                long nanos = MILLISECONDS.toNanos(timeoutMillis());
1205 <                assertFalse(l.tryAcquireSharedNanos(0, nanos));
1206 <                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1203 >                for (long millis = timeoutMillis();
1204 >                     !observedQueued.isSignalled();
1205 >                     millis *= 2) {
1206 >                    long nanos = MILLISECONDS.toNanos(millis);
1207 >                    long startTime = System.nanoTime();
1208 >                    assertFalse(l.tryAcquireSharedNanos(0, nanos));
1209 >                    assertTrue(millisElapsedSince(startTime) >= millis);
1210 >                }
1211                  assertFalse(l.isSignalled());
1212              }});
1213  
1214          waitForQueuedThread(l, t);
1215 +        observedQueued.releaseShared(0);
1216          assertFalse(l.isSignalled());
1217          awaitTermination(t);
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