| 239 |
|
*/ |
| 240 |
|
void assertAwaitTimesOut(ConditionObject c, AwaitMethod awaitMethod) { |
| 241 |
|
long timeoutMillis = timeoutMillis(); |
| 242 |
< |
long startTime = System.nanoTime(); |
| 242 |
> |
long startTime; |
| 243 |
|
try { |
| 244 |
|
switch (awaitMethod) { |
| 245 |
|
case awaitTimed: |
| 246 |
+ |
startTime = System.nanoTime(); |
| 247 |
|
assertFalse(c.await(timeoutMillis, MILLISECONDS)); |
| 248 |
+ |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis); |
| 249 |
|
break; |
| 250 |
|
case awaitNanos: |
| 251 |
+ |
startTime = System.nanoTime(); |
| 252 |
|
long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis); |
| 253 |
|
long nanosRemaining = c.awaitNanos(nanosTimeout); |
| 254 |
|
assertTrue(nanosRemaining <= 0); |
| 255 |
|
assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS)); |
| 256 |
+ |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis); |
| 257 |
|
break; |
| 258 |
|
case awaitUntil: |
| 259 |
+ |
// We shouldn't assume that nanoTime and currentTimeMillis |
| 260 |
+ |
// use the same time source, so don't use nanoTime here. |
| 261 |
+ |
java.util.Date delayedDate = delayedDate(timeoutMillis()); |
| 262 |
|
assertFalse(c.awaitUntil(delayedDate(timeoutMillis))); |
| 263 |
+ |
assertTrue(new java.util.Date().getTime() >= delayedDate.getTime()); |
| 264 |
|
break; |
| 265 |
|
default: |
| 266 |
|
throw new UnsupportedOperationException(); |
| 267 |
|
} |
| 268 |
|
} catch (InterruptedException ie) { threadUnexpectedException(ie); } |
| 261 |
– |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis); |
| 269 |
|
} |
| 270 |
|
|
| 271 |
|
/** |
