528 |
|
} |
529 |
|
|
530 |
|
/** |
531 |
+ |
* Checks that the threads do not terminate within the default |
532 |
+ |
* millisecond delay of {@code timeoutMillis()}. |
533 |
+ |
*/ |
534 |
+ |
void assertThreadsStayAlive(Thread... threads) { |
535 |
+ |
assertThreadsStayAlive(timeoutMillis(), threads); |
536 |
+ |
} |
537 |
+ |
|
538 |
+ |
/** |
539 |
+ |
* Checks that the threads do not terminate within the given millisecond delay. |
540 |
+ |
*/ |
541 |
+ |
void assertThreadsStayAlive(long millis, Thread... threads) { |
542 |
+ |
try { |
543 |
+ |
// No need to optimize the failing case via Thread.join. |
544 |
+ |
delay(millis); |
545 |
+ |
for (Thread thread : threads) |
546 |
+ |
assertTrue(thread.isAlive()); |
547 |
+ |
} catch (InterruptedException ie) { |
548 |
+ |
fail("Unexpected InterruptedException"); |
549 |
+ |
} |
550 |
+ |
} |
551 |
+ |
|
552 |
+ |
/** |
553 |
|
* Checks that future.get times out, with the default timeout of |
554 |
|
* {@code timeoutMillis()}. |
555 |
|
*/ |
712 |
|
} |
713 |
|
|
714 |
|
/** |
715 |
< |
* Waits up to the specified number of milliseconds for the given |
715 |
> |
* Spin-waits up to the specified number of milliseconds for the given |
716 |
|
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
717 |
|
*/ |
718 |
|
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) { |
719 |
< |
long timeoutNanos = timeoutMillis * 1000L * 1000L; |
698 |
< |
long t0 = System.nanoTime(); |
719 |
> |
long startTime = System.nanoTime(); |
720 |
|
for (;;) { |
721 |
|
Thread.State s = thread.getState(); |
722 |
|
if (s == Thread.State.BLOCKED || |
725 |
|
return; |
726 |
|
else if (s == Thread.State.TERMINATED) |
727 |
|
fail("Unexpected thread termination"); |
728 |
< |
else if (System.nanoTime() - t0 > timeoutNanos) { |
728 |
> |
else if (millisElapsedSince(startTime) > timeoutMillis) { |
729 |
|
threadAssertTrue(thread.isAlive()); |
730 |
|
return; |
731 |
|
} |
926 |
|
} |
927 |
|
} |
928 |
|
|
929 |
+ |
public void await(Semaphore semaphore) { |
930 |
+ |
try { |
931 |
+ |
assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS)); |
932 |
+ |
} catch (Throwable t) { |
933 |
+ |
threadUnexpectedException(t); |
934 |
+ |
} |
935 |
+ |
} |
936 |
+ |
|
937 |
|
// /** |
938 |
|
// * Spin-waits up to LONG_DELAY_MS until flag becomes true. |
939 |
|
// */ |
1202 |
|
} |
1203 |
|
} |
1204 |
|
|
1205 |
< |
@SuppressWarnings("unchecked") |
1206 |
< |
<T> T serialClone(T o) { |
1205 |
> |
void assertSerialEquals(Object x, Object y) { |
1206 |
> |
assertTrue(Arrays.equals(serialBytes(x), serialBytes(y))); |
1207 |
> |
} |
1208 |
> |
|
1209 |
> |
void assertNotSerialEquals(Object x, Object y) { |
1210 |
> |
assertFalse(Arrays.equals(serialBytes(x), serialBytes(y))); |
1211 |
> |
} |
1212 |
> |
|
1213 |
> |
byte[] serialBytes(Object o) { |
1214 |
|
try { |
1215 |
|
ByteArrayOutputStream bos = new ByteArrayOutputStream(); |
1216 |
|
ObjectOutputStream oos = new ObjectOutputStream(bos); |
1217 |
|
oos.writeObject(o); |
1218 |
|
oos.flush(); |
1219 |
|
oos.close(); |
1220 |
< |
ByteArrayInputStream bin = |
1221 |
< |
new ByteArrayInputStream(bos.toByteArray()); |
1222 |
< |
ObjectInputStream ois = new ObjectInputStream(bin); |
1223 |
< |
return (T) ois.readObject(); |
1220 |
> |
return bos.toByteArray(); |
1221 |
> |
} catch (Throwable t) { |
1222 |
> |
threadUnexpectedException(t); |
1223 |
> |
return new byte[0]; |
1224 |
> |
} |
1225 |
> |
} |
1226 |
> |
|
1227 |
> |
@SuppressWarnings("unchecked") |
1228 |
> |
<T> T serialClone(T o) { |
1229 |
> |
try { |
1230 |
> |
ObjectInputStream ois = new ObjectInputStream |
1231 |
> |
(new ByteArrayInputStream(serialBytes(o))); |
1232 |
> |
T clone = (T) ois.readObject(); |
1233 |
> |
assertSame(o.getClass(), clone.getClass()); |
1234 |
> |
return clone; |
1235 |
|
} catch (Throwable t) { |
1236 |
|
threadUnexpectedException(t); |
1237 |
|
return null; |