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.44 by jsr166, Tue Jan 23 20:44:11 2018 UTC vs.
Revision 1.48 by jsr166, Tue Aug 13 23:05:18 2019 UTC

# Line 12 | Line 12 | import static java.util.concurrent.TimeU
12   import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.HashSet;
15 – import java.util.concurrent.ThreadLocalRandom;
15   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer;
16   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject;
17  
# Line 224 | Line 223 | public class AbstractQueuedLongSynchroni
223              assertTrue(c.await(timeoutMillis, MILLISECONDS));
224              break;
225          case awaitNanos:
226 <            long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
227 <            long nanosRemaining = c.awaitNanos(nanosTimeout);
226 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
227 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
228              assertTrue(nanosRemaining > 0);
229              break;
230          case awaitUntil:
# Line 252 | Line 251 | public class AbstractQueuedLongSynchroni
251                  break;
252              case awaitNanos:
253                  startTime = System.nanoTime();
254 <                long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
255 <                long nanosRemaining = c.awaitNanos(nanosTimeout);
254 >                long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
255 >                long nanosRemaining = c.awaitNanos(timeoutNanos);
256                  assertTrue(nanosRemaining <= 0);
257                  assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
258                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
# Line 1265 | Line 1264 | public class AbstractQueuedLongSynchroni
1264  
1265          // A synchronizer only offering a choice of failure modes
1266          class Sync extends AbstractQueuedLongSynchronizer {
1267 <            boolean pleaseThrow;
1267 >            volatile boolean pleaseThrow;
1268              @Override protected boolean tryAcquire(long ignored) {
1269                  if (pleaseThrow) throw ex;
1270                  return false;
# Line 1287 | Line 1286 | public class AbstractQueuedLongSynchroni
1286          final Thread thread = newStartedThread(new CheckedRunnable() {
1287              public void realRun() {
1288                  try {
1289 <                    if (ThreadLocalRandom.current().nextBoolean())
1289 >                    if (randomBoolean())
1290                          s.acquire(1);
1291                      else
1292                          s.acquireShared(1);

Diff Legend

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