| 155 |
|
enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil } |
| 156 |
|
|
| 157 |
|
/** |
| 158 |
< |
* Awaits condition using the specified AwaitMethod. |
| 158 |
> |
* Awaits condition "indefinitely" using the specified AwaitMethod. |
| 159 |
|
*/ |
| 160 |
|
void await(Condition c, AwaitMethod awaitMethod) |
| 161 |
|
throws InterruptedException { |
| 162 |
+ |
long timeoutMillis = 2 * LONG_DELAY_MS; |
| 163 |
|
switch (awaitMethod) { |
| 164 |
|
case await: |
| 165 |
|
c.await(); |
| 166 |
|
break; |
| 167 |
|
case awaitTimed: |
| 168 |
< |
assertTrue(c.await(2 * LONG_DELAY_MS, MILLISECONDS)); |
| 168 |
> |
assertTrue(c.await(timeoutMillis, MILLISECONDS)); |
| 169 |
|
break; |
| 170 |
|
case awaitNanos: |
| 171 |
< |
long nanosRemaining = c.awaitNanos(MILLISECONDS.toNanos(2 * LONG_DELAY_MS)); |
| 171 |
> |
long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis); |
| 172 |
> |
long nanosRemaining = c.awaitNanos(timeoutNanos); |
| 173 |
|
assertTrue(nanosRemaining > 0); |
| 174 |
+ |
assertTrue(nanosRemaining <= timeoutNanos); |
| 175 |
|
break; |
| 176 |
|
case awaitUntil: |
| 177 |
< |
java.util.Date d = new java.util.Date(); |
| 175 |
< |
assertTrue(c.awaitUntil(new java.util.Date(d.getTime() + 2 * LONG_DELAY_MS))); |
| 177 |
> |
assertTrue(c.awaitUntil(delayedDate(timeoutMillis))); |
| 178 |
|
break; |
| 179 |
|
default: |
| 180 |
|
throw new AssertionError(); |
