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.43 by jsr166, Mon Nov 27 23:06:53 2017 UTC vs.
Revision 1.45 by jsr166, Wed Jun 13 18:36:31 2018 UTC

# Line 16 | Line 16 | import java.util.concurrent.ThreadLocalR
16   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer;
17   import java.util.concurrent.locks.AbstractQueuedLongSynchronizer.ConditionObject;
18  
19 – import junit.framework.AssertionFailedError;
19   import junit.framework.Test;
20   import junit.framework.TestSuite;
21  
# Line 141 | Line 140 | public class AbstractQueuedLongSynchroni
140          long startTime = System.nanoTime();
141          while (!sync.isQueued(t)) {
142              if (millisElapsedSince(startTime) > LONG_DELAY_MS)
143 <                throw new AssertionFailedError("timed out");
143 >                throw new AssertionError("timed out");
144              Thread.yield();
145          }
146          assertTrue(t.isAlive());
# Line 225 | Line 224 | public class AbstractQueuedLongSynchroni
224              assertTrue(c.await(timeoutMillis, MILLISECONDS));
225              break;
226          case awaitNanos:
227 <            long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
228 <            long nanosRemaining = c.awaitNanos(nanosTimeout);
227 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
228 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
229              assertTrue(nanosRemaining > 0);
230              break;
231          case awaitUntil:
# Line 253 | Line 252 | public class AbstractQueuedLongSynchroni
252                  break;
253              case awaitNanos:
254                  startTime = System.nanoTime();
255 <                long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
256 <                long nanosRemaining = c.awaitNanos(nanosTimeout);
255 >                long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
256 >                long nanosRemaining = c.awaitNanos(timeoutNanos);
257                  assertTrue(nanosRemaining <= 0);
258                  assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
259                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis);

Diff Legend

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