66 |
|
import java.util.Collection; |
67 |
|
import java.util.Collections; |
68 |
|
import java.util.Date; |
69 |
+ |
import java.util.Deque; |
70 |
|
import java.util.Enumeration; |
71 |
+ |
import java.util.HashSet; |
72 |
|
import java.util.Iterator; |
73 |
|
import java.util.List; |
74 |
|
import java.util.NoSuchElementException; |
75 |
|
import java.util.PropertyPermission; |
76 |
+ |
import java.util.Set; |
77 |
|
import java.util.concurrent.BlockingQueue; |
78 |
|
import java.util.concurrent.Callable; |
79 |
|
import java.util.concurrent.CountDownLatch; |
102 |
|
import java.util.concurrent.atomic.AtomicReference; |
103 |
|
import java.util.regex.Pattern; |
104 |
|
|
102 |
– |
import junit.framework.AssertionFailedError; |
105 |
|
import junit.framework.Test; |
106 |
|
import junit.framework.TestCase; |
107 |
|
import junit.framework.TestResult; |
117 |
|
* |
118 |
|
* <ol> |
119 |
|
* |
120 |
< |
* <li>All assertions in code running in generated threads must use |
121 |
< |
* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link |
122 |
< |
* #threadAssertEquals}, or {@link #threadAssertNull}, (not |
123 |
< |
* {@code fail}, {@code assertTrue}, etc.) It is OK (but not |
124 |
< |
* particularly recommended) for other code to use these forms too. |
125 |
< |
* Only the most typically used JUnit assertion methods are defined |
126 |
< |
* this way, but enough to live with. |
120 |
> |
* <li>All code not running in the main test thread (manually spawned threads |
121 |
> |
* or the common fork join pool) must be checked for failure (and completion!). |
122 |
> |
* Mechanisms that can be used to ensure this are: |
123 |
> |
* <ol> |
124 |
> |
* <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch |
125 |
> |
* that the task completed normally, which is checked before returning from |
126 |
> |
* the test method in the main thread. |
127 |
> |
* <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue}, |
128 |
> |
* or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.) |
129 |
> |
* Only the most typically used JUnit assertion methods are defined |
130 |
> |
* this way, but enough to live with. |
131 |
> |
* <li>Recording failure explicitly using {@link #threadUnexpectedException} |
132 |
> |
* or {@link #threadRecordFailure}. |
133 |
> |
* <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above. |
134 |
> |
* </ol> |
135 |
|
* |
136 |
|
* <li>If you override {@link #setUp} or {@link #tearDown}, make sure |
137 |
|
* to invoke {@code super.setUp} and {@code super.tearDown} within |
429 |
|
for (String testClassName : testClassNames) { |
430 |
|
try { |
431 |
|
Class<?> testClass = Class.forName(testClassName); |
432 |
< |
Method m = testClass.getDeclaredMethod("suite", |
423 |
< |
new Class<?>[0]); |
432 |
> |
Method m = testClass.getDeclaredMethod("suite"); |
433 |
|
suite.addTest(newTestSuite((Test)m.invoke(null))); |
434 |
< |
} catch (Exception e) { |
435 |
< |
throw new Error("Missing test class", e); |
434 |
> |
} catch (ReflectiveOperationException e) { |
435 |
> |
throw new AssertionError("Missing test class", e); |
436 |
|
} |
437 |
|
} |
438 |
|
} |
454 |
|
} |
455 |
|
} |
456 |
|
|
457 |
< |
public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; } |
458 |
< |
public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; } |
459 |
< |
public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; } |
460 |
< |
public static boolean atLeastJava9() { |
461 |
< |
return JAVA_CLASS_VERSION >= 53.0 |
462 |
< |
// As of 2015-09, java9 still uses 52.0 class file version |
454 |
< |
|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$"); |
455 |
< |
} |
456 |
< |
public static boolean atLeastJava10() { |
457 |
< |
return JAVA_CLASS_VERSION >= 54.0 |
458 |
< |
|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$"); |
459 |
< |
} |
457 |
> |
public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; } |
458 |
> |
public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; } |
459 |
> |
public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; } |
460 |
> |
public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; } |
461 |
> |
public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; } |
462 |
> |
public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; } |
463 |
|
|
464 |
|
/** |
465 |
|
* Collects all JSR166 unit tests as one suite. |
547 |
|
"DoubleAdderTest", |
548 |
|
"ForkJoinPool8Test", |
549 |
|
"ForkJoinTask8Test", |
550 |
+ |
"HashMapTest", |
551 |
|
"LinkedBlockingDeque8Test", |
552 |
|
"LinkedBlockingQueue8Test", |
553 |
+ |
"LinkedHashMapTest", |
554 |
|
"LongAccumulatorTest", |
555 |
|
"LongAdderTest", |
556 |
|
"SplittableRandomTest", |
611 |
|
for (String methodName : testMethodNames(testClass)) |
612 |
|
suite.addTest((Test) c.newInstance(data, methodName)); |
613 |
|
return suite; |
614 |
< |
} catch (Exception e) { |
615 |
< |
throw new Error(e); |
614 |
> |
} catch (ReflectiveOperationException e) { |
615 |
> |
throw new AssertionError(e); |
616 |
|
} |
617 |
|
} |
618 |
|
|
628 |
|
if (atLeastJava8()) { |
629 |
|
String name = testClass.getName(); |
630 |
|
String name8 = name.replaceAll("Test$", "8Test"); |
631 |
< |
if (name.equals(name8)) throw new Error(name); |
631 |
> |
if (name.equals(name8)) throw new AssertionError(name); |
632 |
|
try { |
633 |
|
return (Test) |
634 |
|
Class.forName(name8) |
635 |
< |
.getMethod("testSuite", new Class[] { dataClass }) |
635 |
> |
.getMethod("testSuite", dataClass) |
636 |
|
.invoke(null, data); |
637 |
< |
} catch (Exception e) { |
638 |
< |
throw new Error(e); |
637 |
> |
} catch (ReflectiveOperationException e) { |
638 |
> |
throw new AssertionError(e); |
639 |
|
} |
640 |
|
} else { |
641 |
|
return new TestSuite(); |
744 |
|
String msg = toString() + ": " + String.format(format, args); |
745 |
|
System.err.println(msg); |
746 |
|
dumpTestThreads(); |
747 |
< |
throw new AssertionFailedError(msg); |
747 |
> |
throw new AssertionError(msg); |
748 |
|
} |
749 |
|
|
750 |
|
/** |
765 |
|
throw (RuntimeException) t; |
766 |
|
else if (t instanceof Exception) |
767 |
|
throw (Exception) t; |
768 |
< |
else { |
769 |
< |
AssertionFailedError afe = |
765 |
< |
new AssertionFailedError(t.toString()); |
766 |
< |
afe.initCause(t); |
767 |
< |
throw afe; |
768 |
< |
} |
768 |
> |
else |
769 |
> |
throw new AssertionError(t.toString(), t); |
770 |
|
} |
771 |
|
|
772 |
|
if (Thread.interrupted()) |
800 |
|
|
801 |
|
/** |
802 |
|
* Just like fail(reason), but additionally recording (using |
803 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
804 |
< |
* the current testcase will fail. |
803 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
804 |
> |
* current testcase will fail. |
805 |
|
*/ |
806 |
|
public void threadFail(String reason) { |
807 |
|
try { |
808 |
|
fail(reason); |
809 |
< |
} catch (AssertionFailedError t) { |
810 |
< |
threadRecordFailure(t); |
811 |
< |
throw t; |
809 |
> |
} catch (AssertionError fail) { |
810 |
> |
threadRecordFailure(fail); |
811 |
> |
throw fail; |
812 |
|
} |
813 |
|
} |
814 |
|
|
815 |
|
/** |
816 |
|
* Just like assertTrue(b), but additionally recording (using |
817 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
818 |
< |
* the current testcase will fail. |
817 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
818 |
> |
* current testcase will fail. |
819 |
|
*/ |
820 |
|
public void threadAssertTrue(boolean b) { |
821 |
|
try { |
822 |
|
assertTrue(b); |
823 |
< |
} catch (AssertionFailedError t) { |
824 |
< |
threadRecordFailure(t); |
825 |
< |
throw t; |
823 |
> |
} catch (AssertionError fail) { |
824 |
> |
threadRecordFailure(fail); |
825 |
> |
throw fail; |
826 |
|
} |
827 |
|
} |
828 |
|
|
829 |
|
/** |
830 |
|
* Just like assertFalse(b), but additionally recording (using |
831 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
832 |
< |
* the current testcase will fail. |
831 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
832 |
> |
* current testcase will fail. |
833 |
|
*/ |
834 |
|
public void threadAssertFalse(boolean b) { |
835 |
|
try { |
836 |
|
assertFalse(b); |
837 |
< |
} catch (AssertionFailedError t) { |
838 |
< |
threadRecordFailure(t); |
839 |
< |
throw t; |
837 |
> |
} catch (AssertionError fail) { |
838 |
> |
threadRecordFailure(fail); |
839 |
> |
throw fail; |
840 |
|
} |
841 |
|
} |
842 |
|
|
843 |
|
/** |
844 |
|
* Just like assertNull(x), but additionally recording (using |
845 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
846 |
< |
* the current testcase will fail. |
845 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
846 |
> |
* current testcase will fail. |
847 |
|
*/ |
848 |
|
public void threadAssertNull(Object x) { |
849 |
|
try { |
850 |
|
assertNull(x); |
851 |
< |
} catch (AssertionFailedError t) { |
852 |
< |
threadRecordFailure(t); |
853 |
< |
throw t; |
851 |
> |
} catch (AssertionError fail) { |
852 |
> |
threadRecordFailure(fail); |
853 |
> |
throw fail; |
854 |
|
} |
855 |
|
} |
856 |
|
|
857 |
|
/** |
858 |
|
* Just like assertEquals(x, y), but additionally recording (using |
859 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
860 |
< |
* the current testcase will fail. |
859 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
860 |
> |
* current testcase will fail. |
861 |
|
*/ |
862 |
|
public void threadAssertEquals(long x, long y) { |
863 |
|
try { |
864 |
|
assertEquals(x, y); |
865 |
< |
} catch (AssertionFailedError t) { |
866 |
< |
threadRecordFailure(t); |
867 |
< |
throw t; |
865 |
> |
} catch (AssertionError fail) { |
866 |
> |
threadRecordFailure(fail); |
867 |
> |
throw fail; |
868 |
|
} |
869 |
|
} |
870 |
|
|
871 |
|
/** |
872 |
|
* Just like assertEquals(x, y), but additionally recording (using |
873 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
874 |
< |
* the current testcase will fail. |
873 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
874 |
> |
* current testcase will fail. |
875 |
|
*/ |
876 |
|
public void threadAssertEquals(Object x, Object y) { |
877 |
|
try { |
878 |
|
assertEquals(x, y); |
879 |
< |
} catch (AssertionFailedError fail) { |
879 |
> |
} catch (AssertionError fail) { |
880 |
|
threadRecordFailure(fail); |
881 |
|
throw fail; |
882 |
|
} catch (Throwable fail) { |
886 |
|
|
887 |
|
/** |
888 |
|
* Just like assertSame(x, y), but additionally recording (using |
889 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
890 |
< |
* the current testcase will fail. |
889 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
890 |
> |
* current testcase will fail. |
891 |
|
*/ |
892 |
|
public void threadAssertSame(Object x, Object y) { |
893 |
|
try { |
894 |
|
assertSame(x, y); |
895 |
< |
} catch (AssertionFailedError fail) { |
895 |
> |
} catch (AssertionError fail) { |
896 |
|
threadRecordFailure(fail); |
897 |
|
throw fail; |
898 |
|
} |
914 |
|
|
915 |
|
/** |
916 |
|
* Records the given exception using {@link #threadRecordFailure}, |
917 |
< |
* then rethrows the exception, wrapping it in an |
918 |
< |
* AssertionFailedError if necessary. |
917 |
> |
* then rethrows the exception, wrapping it in an AssertionError |
918 |
> |
* if necessary. |
919 |
|
*/ |
920 |
|
public void threadUnexpectedException(Throwable t) { |
921 |
|
threadRecordFailure(t); |
924 |
|
throw (RuntimeException) t; |
925 |
|
else if (t instanceof Error) |
926 |
|
throw (Error) t; |
927 |
< |
else { |
928 |
< |
AssertionFailedError afe = |
928 |
< |
new AssertionFailedError("unexpected exception: " + t); |
929 |
< |
afe.initCause(t); |
930 |
< |
throw afe; |
931 |
< |
} |
927 |
> |
else |
928 |
> |
throw new AssertionError("unexpected exception: " + t, t); |
929 |
|
} |
930 |
|
|
931 |
|
/** |
1101 |
|
for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) { |
1102 |
|
try { delay(1); } |
1103 |
|
catch (InterruptedException fail) { |
1104 |
< |
fail("Unexpected InterruptedException"); |
1104 |
> |
throw new AssertionError("Unexpected InterruptedException", fail); |
1105 |
|
} |
1106 |
|
Thread.State s = thread.getState(); |
1107 |
|
if (s == expected) |
1287 |
|
|
1288 |
|
/** |
1289 |
|
* Sleeps until the given time has elapsed. |
1290 |
< |
* Throws AssertionFailedError if interrupted. |
1290 |
> |
* Throws AssertionError if interrupted. |
1291 |
|
*/ |
1292 |
|
static void sleep(long millis) { |
1293 |
|
try { |
1294 |
|
delay(millis); |
1295 |
|
} catch (InterruptedException fail) { |
1296 |
< |
AssertionFailedError afe = |
1300 |
< |
new AssertionFailedError("Unexpected InterruptedException"); |
1301 |
< |
afe.initCause(fail); |
1302 |
< |
throw afe; |
1296 |
> |
throw new AssertionError("Unexpected InterruptedException", fail); |
1297 |
|
} |
1298 |
|
} |
1299 |
|
|
1300 |
|
/** |
1301 |
|
* Spin-waits up to the specified number of milliseconds for the given |
1302 |
|
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
1303 |
+ |
* @param waitingForGodot if non-null, an additional condition to satisfy |
1304 |
|
*/ |
1305 |
< |
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) { |
1306 |
< |
long startTime = 0L; |
1307 |
< |
for (;;) { |
1308 |
< |
Thread.State s = thread.getState(); |
1309 |
< |
if (s == Thread.State.BLOCKED || |
1310 |
< |
s == Thread.State.WAITING || |
1311 |
< |
s == Thread.State.TIMED_WAITING) |
1312 |
< |
return; |
1313 |
< |
else if (s == Thread.State.TERMINATED) |
1305 |
> |
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis, |
1306 |
> |
Callable<Boolean> waitingForGodot) { |
1307 |
> |
for (long startTime = 0L;;) { |
1308 |
> |
switch (thread.getState()) { |
1309 |
> |
default: break; |
1310 |
> |
case BLOCKED: case WAITING: case TIMED_WAITING: |
1311 |
> |
try { |
1312 |
> |
if (waitingForGodot == null || waitingForGodot.call()) |
1313 |
> |
return; |
1314 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
1315 |
> |
break; |
1316 |
> |
case TERMINATED: |
1317 |
|
fail("Unexpected thread termination"); |
1318 |
< |
else if (startTime == 0L) |
1318 |
> |
} |
1319 |
> |
|
1320 |
> |
if (startTime == 0L) |
1321 |
|
startTime = System.nanoTime(); |
1322 |
|
else if (millisElapsedSince(startTime) > timeoutMillis) { |
1323 |
< |
threadAssertTrue(thread.isAlive()); |
1324 |
< |
fail("timed out waiting for thread to enter wait state"); |
1323 |
> |
assertTrue(thread.isAlive()); |
1324 |
> |
if (waitingForGodot == null |
1325 |
> |
|| thread.getState() == Thread.State.RUNNABLE) |
1326 |
> |
fail("timed out waiting for thread to enter wait state"); |
1327 |
> |
else |
1328 |
> |
fail("timed out waiting for condition, thread state=" |
1329 |
> |
+ thread.getState()); |
1330 |
|
} |
1331 |
|
Thread.yield(); |
1332 |
|
} |
1334 |
|
|
1335 |
|
/** |
1336 |
|
* Spin-waits up to the specified number of milliseconds for the given |
1337 |
< |
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING, |
1333 |
< |
* and additionally satisfy the given condition. |
1337 |
> |
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
1338 |
|
*/ |
1339 |
< |
void waitForThreadToEnterWaitState( |
1340 |
< |
Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) { |
1337 |
< |
long startTime = 0L; |
1338 |
< |
for (;;) { |
1339 |
< |
Thread.State s = thread.getState(); |
1340 |
< |
if (s == Thread.State.BLOCKED || |
1341 |
< |
s == Thread.State.WAITING || |
1342 |
< |
s == Thread.State.TIMED_WAITING) { |
1343 |
< |
try { |
1344 |
< |
if (waitingForGodot.call()) |
1345 |
< |
return; |
1346 |
< |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
1347 |
< |
} |
1348 |
< |
else if (s == Thread.State.TERMINATED) |
1349 |
< |
fail("Unexpected thread termination"); |
1350 |
< |
else if (startTime == 0L) |
1351 |
< |
startTime = System.nanoTime(); |
1352 |
< |
else if (millisElapsedSince(startTime) > timeoutMillis) { |
1353 |
< |
threadAssertTrue(thread.isAlive()); |
1354 |
< |
fail("timed out waiting for thread to enter wait state"); |
1355 |
< |
} |
1356 |
< |
Thread.yield(); |
1357 |
< |
} |
1339 |
> |
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) { |
1340 |
> |
waitForThreadToEnterWaitState(thread, timeoutMillis, null); |
1341 |
|
} |
1342 |
|
|
1343 |
|
/** |
1345 |
|
* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
1346 |
|
*/ |
1347 |
|
void waitForThreadToEnterWaitState(Thread thread) { |
1348 |
< |
waitForThreadToEnterWaitState(thread, LONG_DELAY_MS); |
1348 |
> |
waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null); |
1349 |
|
} |
1350 |
|
|
1351 |
|
/** |
1353 |
|
* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING, |
1354 |
|
* and additionally satisfy the given condition. |
1355 |
|
*/ |
1356 |
< |
void waitForThreadToEnterWaitState( |
1357 |
< |
Thread thread, Callable<Boolean> waitingForGodot) { |
1356 |
> |
void waitForThreadToEnterWaitState(Thread thread, |
1357 |
> |
Callable<Boolean> waitingForGodot) { |
1358 |
|
waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot); |
1359 |
|
} |
1360 |
|
|
1373 |
|
// r.run(); |
1374 |
|
// } catch (Throwable fail) { threadUnexpectedException(fail); } |
1375 |
|
// if (millisElapsedSince(startTime) > timeoutMillis/2) |
1376 |
< |
// throw new AssertionFailedError("did not return promptly"); |
1376 |
> |
// throw new AssertionError("did not return promptly"); |
1377 |
|
// } |
1378 |
|
|
1379 |
|
// void assertTerminatesPromptly(Runnable r) { |
1386 |
|
*/ |
1387 |
|
<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) { |
1388 |
|
long startTime = System.nanoTime(); |
1389 |
+ |
T actual = null; |
1390 |
|
try { |
1391 |
< |
assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS)); |
1391 |
> |
actual = f.get(timeoutMillis, MILLISECONDS); |
1392 |
|
} catch (Throwable fail) { threadUnexpectedException(fail); } |
1393 |
+ |
assertEquals(expectedValue, actual); |
1394 |
|
if (millisElapsedSince(startTime) > timeoutMillis/2) |
1395 |
< |
throw new AssertionFailedError("timed get did not return promptly"); |
1395 |
> |
throw new AssertionError("timed get did not return promptly"); |
1396 |
|
} |
1397 |
|
|
1398 |
|
<T> void checkTimedGet(Future<T> f, T expectedValue) { |
1450 |
|
} |
1451 |
|
} |
1452 |
|
|
1468 |
– |
public abstract class RunnableShouldThrow implements Runnable { |
1469 |
– |
protected abstract void realRun() throws Throwable; |
1470 |
– |
|
1471 |
– |
final Class<?> exceptionClass; |
1472 |
– |
|
1473 |
– |
<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) { |
1474 |
– |
this.exceptionClass = exceptionClass; |
1475 |
– |
} |
1476 |
– |
|
1477 |
– |
public final void run() { |
1478 |
– |
try { |
1479 |
– |
realRun(); |
1480 |
– |
threadShouldThrow(exceptionClass.getSimpleName()); |
1481 |
– |
} catch (Throwable t) { |
1482 |
– |
if (! exceptionClass.isInstance(t)) |
1483 |
– |
threadUnexpectedException(t); |
1484 |
– |
} |
1485 |
– |
} |
1486 |
– |
} |
1487 |
– |
|
1453 |
|
public abstract class ThreadShouldThrow extends Thread { |
1454 |
|
protected abstract void realRun() throws Throwable; |
1455 |
|
|
1462 |
|
public final void run() { |
1463 |
|
try { |
1464 |
|
realRun(); |
1500 |
– |
threadShouldThrow(exceptionClass.getSimpleName()); |
1465 |
|
} catch (Throwable t) { |
1466 |
|
if (! exceptionClass.isInstance(t)) |
1467 |
|
threadUnexpectedException(t); |
1468 |
+ |
return; |
1469 |
|
} |
1470 |
+ |
threadShouldThrow(exceptionClass.getSimpleName()); |
1471 |
|
} |
1472 |
|
} |
1473 |
|
|
1477 |
|
public final void run() { |
1478 |
|
try { |
1479 |
|
realRun(); |
1514 |
– |
threadShouldThrow("InterruptedException"); |
1480 |
|
} catch (InterruptedException success) { |
1481 |
|
threadAssertFalse(Thread.interrupted()); |
1482 |
+ |
return; |
1483 |
|
} catch (Throwable fail) { |
1484 |
|
threadUnexpectedException(fail); |
1485 |
|
} |
1486 |
+ |
threadShouldThrow("InterruptedException"); |
1487 |
|
} |
1488 |
|
} |
1489 |
|
|
1495 |
|
return realCall(); |
1496 |
|
} catch (Throwable fail) { |
1497 |
|
threadUnexpectedException(fail); |
1531 |
– |
return null; |
1498 |
|
} |
1499 |
< |
} |
1534 |
< |
} |
1535 |
< |
|
1536 |
< |
public abstract class CheckedInterruptedCallable<T> |
1537 |
< |
implements Callable<T> { |
1538 |
< |
protected abstract T realCall() throws Throwable; |
1539 |
< |
|
1540 |
< |
public final T call() { |
1541 |
< |
try { |
1542 |
< |
T result = realCall(); |
1543 |
< |
threadShouldThrow("InterruptedException"); |
1544 |
< |
return result; |
1545 |
< |
} catch (InterruptedException success) { |
1546 |
< |
threadAssertFalse(Thread.interrupted()); |
1547 |
< |
} catch (Throwable fail) { |
1548 |
< |
threadUnexpectedException(fail); |
1549 |
< |
} |
1550 |
< |
return null; |
1499 |
> |
throw new AssertionError("unreached"); |
1500 |
|
} |
1501 |
|
} |
1502 |
|
|
1553 |
|
} |
1554 |
|
|
1555 |
|
public void await(CountDownLatch latch, long timeoutMillis) { |
1556 |
+ |
boolean timedOut = false; |
1557 |
|
try { |
1558 |
< |
if (!latch.await(timeoutMillis, MILLISECONDS)) |
1609 |
< |
fail("timed out waiting for CountDownLatch for " |
1610 |
< |
+ (timeoutMillis/1000) + " sec"); |
1558 |
> |
timedOut = !latch.await(timeoutMillis, MILLISECONDS); |
1559 |
|
} catch (Throwable fail) { |
1560 |
|
threadUnexpectedException(fail); |
1561 |
|
} |
1562 |
+ |
if (timedOut) |
1563 |
+ |
fail("timed out waiting for CountDownLatch for " |
1564 |
+ |
+ (timeoutMillis/1000) + " sec"); |
1565 |
|
} |
1566 |
|
|
1567 |
|
public void await(CountDownLatch latch) { |
1569 |
|
} |
1570 |
|
|
1571 |
|
public void await(Semaphore semaphore) { |
1572 |
+ |
boolean timedOut = false; |
1573 |
|
try { |
1574 |
< |
if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS)) |
1623 |
< |
fail("timed out waiting for Semaphore for " |
1624 |
< |
+ (LONG_DELAY_MS/1000) + " sec"); |
1574 |
> |
timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS); |
1575 |
|
} catch (Throwable fail) { |
1576 |
|
threadUnexpectedException(fail); |
1577 |
|
} |
1578 |
+ |
if (timedOut) |
1579 |
+ |
fail("timed out waiting for Semaphore for " |
1580 |
+ |
+ (LONG_DELAY_MS/1000) + " sec"); |
1581 |
|
} |
1582 |
|
|
1583 |
|
public void await(CyclicBarrier barrier) { |
1602 |
|
// long startTime = System.nanoTime(); |
1603 |
|
// while (!flag.get()) { |
1604 |
|
// if (millisElapsedSince(startTime) > timeoutMillis) |
1605 |
< |
// throw new AssertionFailedError("timed out"); |
1605 |
> |
// throw new AssertionError("timed out"); |
1606 |
|
// Thread.yield(); |
1607 |
|
// } |
1608 |
|
// } |
1611 |
|
public String call() { throw new NullPointerException(); } |
1612 |
|
} |
1613 |
|
|
1661 |
– |
public class SmallPossiblyInterruptedRunnable extends CheckedRunnable { |
1662 |
– |
protected void realRun() { |
1663 |
– |
try { |
1664 |
– |
delay(SMALL_DELAY_MS); |
1665 |
– |
} catch (InterruptedException ok) {} |
1666 |
– |
} |
1667 |
– |
} |
1668 |
– |
|
1614 |
|
public Runnable possiblyInterruptedRunnable(final long timeoutMillis) { |
1615 |
|
return new CheckedRunnable() { |
1616 |
|
protected void realRun() { |
1666 |
|
return realCompute(); |
1667 |
|
} catch (Throwable fail) { |
1668 |
|
threadUnexpectedException(fail); |
1724 |
– |
return null; |
1669 |
|
} |
1670 |
+ |
throw new AssertionError("unreached"); |
1671 |
|
} |
1672 |
|
} |
1673 |
|
|
1681 |
|
|
1682 |
|
/** |
1683 |
|
* A CyclicBarrier that uses timed await and fails with |
1684 |
< |
* AssertionFailedErrors instead of throwing checked exceptions. |
1684 |
> |
* AssertionErrors instead of throwing checked exceptions. |
1685 |
|
*/ |
1686 |
|
public static class CheckedBarrier extends CyclicBarrier { |
1687 |
|
public CheckedBarrier(int parties) { super(parties); } |
1690 |
|
try { |
1691 |
|
return super.await(2 * LONG_DELAY_MS, MILLISECONDS); |
1692 |
|
} catch (TimeoutException timedOut) { |
1693 |
< |
throw new AssertionFailedError("timed out"); |
1693 |
> |
throw new AssertionError("timed out"); |
1694 |
|
} catch (Exception fail) { |
1695 |
< |
AssertionFailedError afe = |
1751 |
< |
new AssertionFailedError("Unexpected exception: " + fail); |
1752 |
< |
afe.initCause(fail); |
1753 |
< |
throw afe; |
1695 |
> |
throw new AssertionError("Unexpected exception: " + fail, fail); |
1696 |
|
} |
1697 |
|
} |
1698 |
|
} |
1755 |
|
|
1756 |
|
@SuppressWarnings("unchecked") |
1757 |
|
<T> T serialClone(T o) { |
1758 |
+ |
T clone = null; |
1759 |
|
try { |
1760 |
|
ObjectInputStream ois = new ObjectInputStream |
1761 |
|
(new ByteArrayInputStream(serialBytes(o))); |
1762 |
< |
T clone = (T) ois.readObject(); |
1820 |
< |
if (o == clone) assertImmutable(o); |
1821 |
< |
assertSame(o.getClass(), clone.getClass()); |
1822 |
< |
return clone; |
1762 |
> |
clone = (T) ois.readObject(); |
1763 |
|
} catch (Throwable fail) { |
1764 |
|
threadUnexpectedException(fail); |
1825 |
– |
return null; |
1765 |
|
} |
1766 |
+ |
if (o == clone) assertImmutable(o); |
1767 |
+ |
else assertSame(o.getClass(), clone.getClass()); |
1768 |
+ |
return clone; |
1769 |
|
} |
1770 |
|
|
1771 |
|
/** |
1784 |
|
(new ByteArrayInputStream(bos.toByteArray())); |
1785 |
|
T clone = (T) ois.readObject(); |
1786 |
|
if (o == clone) assertImmutable(o); |
1787 |
< |
assertSame(o.getClass(), clone.getClass()); |
1787 |
> |
else assertSame(o.getClass(), clone.getClass()); |
1788 |
|
return clone; |
1789 |
|
} |
1790 |
|
|
1815 |
|
try { throwingAction.run(); } |
1816 |
|
catch (Throwable t) { |
1817 |
|
threw = true; |
1818 |
< |
if (!expectedExceptionClass.isInstance(t)) { |
1819 |
< |
AssertionFailedError afe = |
1820 |
< |
new AssertionFailedError |
1821 |
< |
("Expected " + expectedExceptionClass.getName() + |
1822 |
< |
", got " + t.getClass().getName()); |
1881 |
< |
afe.initCause(t); |
1882 |
< |
threadUnexpectedException(afe); |
1883 |
< |
} |
1818 |
> |
if (!expectedExceptionClass.isInstance(t)) |
1819 |
> |
throw new AssertionError( |
1820 |
> |
"Expected " + expectedExceptionClass.getName() + |
1821 |
> |
", got " + t.getClass().getName(), |
1822 |
> |
t); |
1823 |
|
} |
1824 |
|
if (!threw) |
1825 |
|
shouldThrow(expectedExceptionClass.getName()); |
2035 |
|
assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount()); |
2036 |
|
assertEquals(savedQueueSize, p.getQueue().size()); |
2037 |
|
} |
2038 |
+ |
|
2039 |
+ |
void assertCollectionsEquals(Collection<?> x, Collection<?> y) { |
2040 |
+ |
assertEquals(x, y); |
2041 |
+ |
assertEquals(y, x); |
2042 |
+ |
assertEquals(x.isEmpty(), y.isEmpty()); |
2043 |
+ |
assertEquals(x.size(), y.size()); |
2044 |
+ |
if (x instanceof List) { |
2045 |
+ |
assertEquals(x.toString(), y.toString()); |
2046 |
+ |
} |
2047 |
+ |
if (x instanceof List || x instanceof Set) { |
2048 |
+ |
assertEquals(x.hashCode(), y.hashCode()); |
2049 |
+ |
} |
2050 |
+ |
if (x instanceof List || x instanceof Deque) { |
2051 |
+ |
assertTrue(Arrays.equals(x.toArray(), y.toArray())); |
2052 |
+ |
assertTrue(Arrays.equals(x.toArray(new Object[0]), |
2053 |
+ |
y.toArray(new Object[0]))); |
2054 |
+ |
} |
2055 |
+ |
} |
2056 |
+ |
|
2057 |
+ |
/** |
2058 |
+ |
* A weaker form of assertCollectionsEquals which does not insist |
2059 |
+ |
* that the two collections satisfy Object#equals(Object), since |
2060 |
+ |
* they may use identity semantics as Deques do. |
2061 |
+ |
*/ |
2062 |
+ |
void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) { |
2063 |
+ |
if (x instanceof List || x instanceof Set) |
2064 |
+ |
assertCollectionsEquals(x, y); |
2065 |
+ |
else { |
2066 |
+ |
assertEquals(x.isEmpty(), y.isEmpty()); |
2067 |
+ |
assertEquals(x.size(), y.size()); |
2068 |
+ |
assertEquals(new HashSet(x), new HashSet(y)); |
2069 |
+ |
if (x instanceof Deque) { |
2070 |
+ |
assertTrue(Arrays.equals(x.toArray(), y.toArray())); |
2071 |
+ |
assertTrue(Arrays.equals(x.toArray(new Object[0]), |
2072 |
+ |
y.toArray(new Object[0]))); |
2073 |
+ |
} |
2074 |
+ |
} |
2075 |
+ |
} |
2076 |
|
} |