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 |
463 |
< |
|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$"); |
464 |
< |
} |
465 |
< |
public static boolean atLeastJava10() { |
466 |
< |
return JAVA_CLASS_VERSION >= 54.0 |
467 |
< |
|| JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$"); |
468 |
< |
} |
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 |
> |
public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; } |
464 |
> |
public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; } |
465 |
> |
public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; } |
466 |
> |
public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; } |
467 |
> |
public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; } |
468 |
> |
public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; } |
469 |
|
|
470 |
|
/** |
471 |
|
* Collects all JSR166 unit tests as one suite. |
517 |
|
ExecutorsTest.suite(), |
518 |
|
ExecutorCompletionServiceTest.suite(), |
519 |
|
FutureTaskTest.suite(), |
520 |
+ |
HashtableTest.suite(), |
521 |
|
LinkedBlockingDequeTest.suite(), |
522 |
|
LinkedBlockingQueueTest.suite(), |
523 |
|
LinkedListTest.suite(), |
554 |
|
"DoubleAdderTest", |
555 |
|
"ForkJoinPool8Test", |
556 |
|
"ForkJoinTask8Test", |
557 |
+ |
"HashMapTest", |
558 |
|
"LinkedBlockingDeque8Test", |
559 |
|
"LinkedBlockingQueue8Test", |
560 |
+ |
"LinkedHashMapTest", |
561 |
|
"LongAccumulatorTest", |
562 |
|
"LongAdderTest", |
563 |
|
"SplittableRandomTest", |
618 |
|
for (String methodName : testMethodNames(testClass)) |
619 |
|
suite.addTest((Test) c.newInstance(data, methodName)); |
620 |
|
return suite; |
621 |
< |
} catch (Exception e) { |
622 |
< |
throw new Error(e); |
621 |
> |
} catch (ReflectiveOperationException e) { |
622 |
> |
throw new AssertionError(e); |
623 |
|
} |
624 |
|
} |
625 |
|
|
635 |
|
if (atLeastJava8()) { |
636 |
|
String name = testClass.getName(); |
637 |
|
String name8 = name.replaceAll("Test$", "8Test"); |
638 |
< |
if (name.equals(name8)) throw new Error(name); |
638 |
> |
if (name.equals(name8)) throw new AssertionError(name); |
639 |
|
try { |
640 |
|
return (Test) |
641 |
|
Class.forName(name8) |
642 |
< |
.getMethod("testSuite", new Class[] { dataClass }) |
642 |
> |
.getMethod("testSuite", dataClass) |
643 |
|
.invoke(null, data); |
644 |
< |
} catch (Exception e) { |
645 |
< |
throw new Error(e); |
644 |
> |
} catch (ReflectiveOperationException e) { |
645 |
> |
throw new AssertionError(e); |
646 |
|
} |
647 |
|
} else { |
648 |
|
return new TestSuite(); |
751 |
|
String msg = toString() + ": " + String.format(format, args); |
752 |
|
System.err.println(msg); |
753 |
|
dumpTestThreads(); |
754 |
< |
throw new AssertionFailedError(msg); |
754 |
> |
throw new AssertionError(msg); |
755 |
|
} |
756 |
|
|
757 |
|
/** |
772 |
|
throw (RuntimeException) t; |
773 |
|
else if (t instanceof Exception) |
774 |
|
throw (Exception) t; |
775 |
< |
else { |
776 |
< |
AssertionFailedError afe = |
765 |
< |
new AssertionFailedError(t.toString()); |
766 |
< |
afe.initCause(t); |
767 |
< |
throw afe; |
768 |
< |
} |
775 |
> |
else |
776 |
> |
throw new AssertionError(t.toString(), t); |
777 |
|
} |
778 |
|
|
779 |
|
if (Thread.interrupted()) |
807 |
|
|
808 |
|
/** |
809 |
|
* Just like fail(reason), but additionally recording (using |
810 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
811 |
< |
* the current testcase will fail. |
810 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
811 |
> |
* current testcase will fail. |
812 |
|
*/ |
813 |
|
public void threadFail(String reason) { |
814 |
|
try { |
815 |
|
fail(reason); |
816 |
< |
} catch (AssertionFailedError t) { |
817 |
< |
threadRecordFailure(t); |
818 |
< |
throw t; |
816 |
> |
} catch (AssertionError fail) { |
817 |
> |
threadRecordFailure(fail); |
818 |
> |
throw fail; |
819 |
|
} |
820 |
|
} |
821 |
|
|
822 |
|
/** |
823 |
|
* Just like assertTrue(b), but additionally recording (using |
824 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
825 |
< |
* the current testcase will fail. |
824 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
825 |
> |
* current testcase will fail. |
826 |
|
*/ |
827 |
|
public void threadAssertTrue(boolean b) { |
828 |
|
try { |
829 |
|
assertTrue(b); |
830 |
< |
} catch (AssertionFailedError t) { |
831 |
< |
threadRecordFailure(t); |
832 |
< |
throw t; |
830 |
> |
} catch (AssertionError fail) { |
831 |
> |
threadRecordFailure(fail); |
832 |
> |
throw fail; |
833 |
|
} |
834 |
|
} |
835 |
|
|
836 |
|
/** |
837 |
|
* Just like assertFalse(b), but additionally recording (using |
838 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
839 |
< |
* the current testcase will fail. |
838 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
839 |
> |
* current testcase will fail. |
840 |
|
*/ |
841 |
|
public void threadAssertFalse(boolean b) { |
842 |
|
try { |
843 |
|
assertFalse(b); |
844 |
< |
} catch (AssertionFailedError t) { |
845 |
< |
threadRecordFailure(t); |
846 |
< |
throw t; |
844 |
> |
} catch (AssertionError fail) { |
845 |
> |
threadRecordFailure(fail); |
846 |
> |
throw fail; |
847 |
|
} |
848 |
|
} |
849 |
|
|
850 |
|
/** |
851 |
|
* Just like assertNull(x), but additionally recording (using |
852 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
853 |
< |
* the current testcase will fail. |
852 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
853 |
> |
* current testcase will fail. |
854 |
|
*/ |
855 |
|
public void threadAssertNull(Object x) { |
856 |
|
try { |
857 |
|
assertNull(x); |
858 |
< |
} catch (AssertionFailedError t) { |
859 |
< |
threadRecordFailure(t); |
860 |
< |
throw t; |
858 |
> |
} catch (AssertionError fail) { |
859 |
> |
threadRecordFailure(fail); |
860 |
> |
throw fail; |
861 |
|
} |
862 |
|
} |
863 |
|
|
864 |
|
/** |
865 |
|
* Just like assertEquals(x, y), but additionally recording (using |
866 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
867 |
< |
* the current testcase will fail. |
866 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
867 |
> |
* current testcase will fail. |
868 |
|
*/ |
869 |
|
public void threadAssertEquals(long x, long y) { |
870 |
|
try { |
871 |
|
assertEquals(x, y); |
872 |
< |
} catch (AssertionFailedError t) { |
873 |
< |
threadRecordFailure(t); |
874 |
< |
throw t; |
872 |
> |
} catch (AssertionError fail) { |
873 |
> |
threadRecordFailure(fail); |
874 |
> |
throw fail; |
875 |
|
} |
876 |
|
} |
877 |
|
|
878 |
|
/** |
879 |
|
* Just like assertEquals(x, y), but additionally recording (using |
880 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
881 |
< |
* the current testcase will fail. |
880 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
881 |
> |
* current testcase will fail. |
882 |
|
*/ |
883 |
|
public void threadAssertEquals(Object x, Object y) { |
884 |
|
try { |
885 |
|
assertEquals(x, y); |
886 |
< |
} catch (AssertionFailedError fail) { |
886 |
> |
} catch (AssertionError fail) { |
887 |
|
threadRecordFailure(fail); |
888 |
|
throw fail; |
889 |
|
} catch (Throwable fail) { |
893 |
|
|
894 |
|
/** |
895 |
|
* Just like assertSame(x, y), but additionally recording (using |
896 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
897 |
< |
* the current testcase will fail. |
896 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
897 |
> |
* current testcase will fail. |
898 |
|
*/ |
899 |
|
public void threadAssertSame(Object x, Object y) { |
900 |
|
try { |
901 |
|
assertSame(x, y); |
902 |
< |
} catch (AssertionFailedError fail) { |
902 |
> |
} catch (AssertionError fail) { |
903 |
|
threadRecordFailure(fail); |
904 |
|
throw fail; |
905 |
|
} |
921 |
|
|
922 |
|
/** |
923 |
|
* Records the given exception using {@link #threadRecordFailure}, |
924 |
< |
* then rethrows the exception, wrapping it in an |
925 |
< |
* AssertionFailedError if necessary. |
924 |
> |
* then rethrows the exception, wrapping it in an AssertionError |
925 |
> |
* if necessary. |
926 |
|
*/ |
927 |
|
public void threadUnexpectedException(Throwable t) { |
928 |
|
threadRecordFailure(t); |
931 |
|
throw (RuntimeException) t; |
932 |
|
else if (t instanceof Error) |
933 |
|
throw (Error) t; |
934 |
< |
else { |
935 |
< |
AssertionFailedError afe = |
928 |
< |
new AssertionFailedError("unexpected exception: " + t); |
929 |
< |
afe.initCause(t); |
930 |
< |
throw afe; |
931 |
< |
} |
934 |
> |
else |
935 |
> |
throw new AssertionError("unexpected exception: " + t, t); |
936 |
|
} |
937 |
|
|
938 |
|
/** |
1108 |
|
for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) { |
1109 |
|
try { delay(1); } |
1110 |
|
catch (InterruptedException fail) { |
1111 |
< |
fail("Unexpected InterruptedException"); |
1111 |
> |
throw new AssertionError("Unexpected InterruptedException", fail); |
1112 |
|
} |
1113 |
|
Thread.State s = thread.getState(); |
1114 |
|
if (s == expected) |
1120 |
|
} |
1121 |
|
|
1122 |
|
/** |
1119 |
– |
* Checks that thread does not terminate within the default |
1120 |
– |
* millisecond delay of {@code timeoutMillis()}. |
1121 |
– |
* TODO: REMOVEME |
1122 |
– |
*/ |
1123 |
– |
void assertThreadStaysAlive(Thread thread) { |
1124 |
– |
assertThreadStaysAlive(thread, timeoutMillis()); |
1125 |
– |
} |
1126 |
– |
|
1127 |
– |
/** |
1128 |
– |
* Checks that thread does not terminate within the given millisecond delay. |
1129 |
– |
* TODO: REMOVEME |
1130 |
– |
*/ |
1131 |
– |
void assertThreadStaysAlive(Thread thread, long millis) { |
1132 |
– |
try { |
1133 |
– |
// No need to optimize the failing case via Thread.join. |
1134 |
– |
delay(millis); |
1135 |
– |
assertTrue(thread.isAlive()); |
1136 |
– |
} catch (InterruptedException fail) { |
1137 |
– |
threadFail("Unexpected InterruptedException"); |
1138 |
– |
} |
1139 |
– |
} |
1140 |
– |
|
1141 |
– |
/** |
1142 |
– |
* Checks that the threads do not terminate within the default |
1143 |
– |
* millisecond delay of {@code timeoutMillis()}. |
1144 |
– |
* TODO: REMOVEME |
1145 |
– |
*/ |
1146 |
– |
void assertThreadsStayAlive(Thread... threads) { |
1147 |
– |
assertThreadsStayAlive(timeoutMillis(), threads); |
1148 |
– |
} |
1149 |
– |
|
1150 |
– |
/** |
1151 |
– |
* Checks that the threads do not terminate within the given millisecond delay. |
1152 |
– |
* TODO: REMOVEME |
1153 |
– |
*/ |
1154 |
– |
void assertThreadsStayAlive(long millis, Thread... threads) { |
1155 |
– |
try { |
1156 |
– |
// No need to optimize the failing case via Thread.join. |
1157 |
– |
delay(millis); |
1158 |
– |
for (Thread thread : threads) |
1159 |
– |
assertTrue(thread.isAlive()); |
1160 |
– |
} catch (InterruptedException fail) { |
1161 |
– |
threadFail("Unexpected InterruptedException"); |
1162 |
– |
} |
1163 |
– |
} |
1164 |
– |
|
1165 |
– |
/** |
1123 |
|
* Checks that future.get times out, with the default timeout of |
1124 |
|
* {@code timeoutMillis()}. |
1125 |
|
*/ |
1294 |
|
|
1295 |
|
/** |
1296 |
|
* Sleeps until the given time has elapsed. |
1297 |
< |
* Throws AssertionFailedError if interrupted. |
1297 |
> |
* Throws AssertionError if interrupted. |
1298 |
|
*/ |
1299 |
|
static void sleep(long millis) { |
1300 |
|
try { |
1301 |
|
delay(millis); |
1302 |
|
} catch (InterruptedException fail) { |
1303 |
< |
AssertionFailedError afe = |
1347 |
< |
new AssertionFailedError("Unexpected InterruptedException"); |
1348 |
< |
afe.initCause(fail); |
1349 |
< |
throw afe; |
1303 |
> |
throw new AssertionError("Unexpected InterruptedException", fail); |
1304 |
|
} |
1305 |
|
} |
1306 |
|
|
1307 |
|
/** |
1308 |
|
* Spin-waits up to the specified number of milliseconds for the given |
1309 |
|
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
1310 |
+ |
* @param waitingForGodot if non-null, an additional condition to satisfy |
1311 |
|
*/ |
1312 |
< |
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) { |
1313 |
< |
long startTime = 0L; |
1314 |
< |
for (;;) { |
1315 |
< |
Thread.State s = thread.getState(); |
1316 |
< |
if (s == Thread.State.BLOCKED || |
1317 |
< |
s == Thread.State.WAITING || |
1318 |
< |
s == Thread.State.TIMED_WAITING) |
1319 |
< |
return; |
1320 |
< |
else if (s == Thread.State.TERMINATED) |
1312 |
> |
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis, |
1313 |
> |
Callable<Boolean> waitingForGodot) { |
1314 |
> |
for (long startTime = 0L;;) { |
1315 |
> |
switch (thread.getState()) { |
1316 |
> |
default: break; |
1317 |
> |
case BLOCKED: case WAITING: case TIMED_WAITING: |
1318 |
> |
try { |
1319 |
> |
if (waitingForGodot == null || waitingForGodot.call()) |
1320 |
> |
return; |
1321 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
1322 |
> |
break; |
1323 |
> |
case TERMINATED: |
1324 |
|
fail("Unexpected thread termination"); |
1325 |
< |
else if (startTime == 0L) |
1325 |
> |
} |
1326 |
> |
|
1327 |
> |
if (startTime == 0L) |
1328 |
|
startTime = System.nanoTime(); |
1329 |
|
else if (millisElapsedSince(startTime) > timeoutMillis) { |
1330 |
< |
threadAssertTrue(thread.isAlive()); |
1331 |
< |
fail("timed out waiting for thread to enter wait state"); |
1330 |
> |
assertTrue(thread.isAlive()); |
1331 |
> |
if (waitingForGodot == null |
1332 |
> |
|| thread.getState() == Thread.State.RUNNABLE) |
1333 |
> |
fail("timed out waiting for thread to enter wait state"); |
1334 |
> |
else |
1335 |
> |
fail("timed out waiting for condition, thread state=" |
1336 |
> |
+ thread.getState()); |
1337 |
|
} |
1338 |
|
Thread.yield(); |
1339 |
|
} |
1341 |
|
|
1342 |
|
/** |
1343 |
|
* Spin-waits up to the specified number of milliseconds for the given |
1344 |
< |
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING, |
1380 |
< |
* and additionally satisfy the given condition. |
1344 |
> |
* thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
1345 |
|
*/ |
1346 |
< |
void waitForThreadToEnterWaitState( |
1347 |
< |
Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) { |
1384 |
< |
long startTime = 0L; |
1385 |
< |
for (;;) { |
1386 |
< |
Thread.State s = thread.getState(); |
1387 |
< |
if (s == Thread.State.BLOCKED || |
1388 |
< |
s == Thread.State.WAITING || |
1389 |
< |
s == Thread.State.TIMED_WAITING) { |
1390 |
< |
try { |
1391 |
< |
if (waitingForGodot.call()) |
1392 |
< |
return; |
1393 |
< |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
1394 |
< |
} |
1395 |
< |
else if (s == Thread.State.TERMINATED) |
1396 |
< |
fail("Unexpected thread termination"); |
1397 |
< |
else if (startTime == 0L) |
1398 |
< |
startTime = System.nanoTime(); |
1399 |
< |
else if (millisElapsedSince(startTime) > timeoutMillis) { |
1400 |
< |
threadAssertTrue(thread.isAlive()); |
1401 |
< |
fail("timed out waiting for thread to enter wait state"); |
1402 |
< |
} |
1403 |
< |
Thread.yield(); |
1404 |
< |
} |
1346 |
> |
void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) { |
1347 |
> |
waitForThreadToEnterWaitState(thread, timeoutMillis, null); |
1348 |
|
} |
1349 |
|
|
1350 |
|
/** |
1352 |
|
* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING. |
1353 |
|
*/ |
1354 |
|
void waitForThreadToEnterWaitState(Thread thread) { |
1355 |
< |
waitForThreadToEnterWaitState(thread, LONG_DELAY_MS); |
1355 |
> |
waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null); |
1356 |
|
} |
1357 |
|
|
1358 |
|
/** |
1360 |
|
* enter a wait state: BLOCKED, WAITING, or TIMED_WAITING, |
1361 |
|
* and additionally satisfy the given condition. |
1362 |
|
*/ |
1363 |
< |
void waitForThreadToEnterWaitState( |
1364 |
< |
Thread thread, Callable<Boolean> waitingForGodot) { |
1363 |
> |
void waitForThreadToEnterWaitState(Thread thread, |
1364 |
> |
Callable<Boolean> waitingForGodot) { |
1365 |
|
waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot); |
1366 |
|
} |
1367 |
|
|
1380 |
|
// r.run(); |
1381 |
|
// } catch (Throwable fail) { threadUnexpectedException(fail); } |
1382 |
|
// if (millisElapsedSince(startTime) > timeoutMillis/2) |
1383 |
< |
// throw new AssertionFailedError("did not return promptly"); |
1383 |
> |
// throw new AssertionError("did not return promptly"); |
1384 |
|
// } |
1385 |
|
|
1386 |
|
// void assertTerminatesPromptly(Runnable r) { |
1393 |
|
*/ |
1394 |
|
<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) { |
1395 |
|
long startTime = System.nanoTime(); |
1396 |
+ |
T actual = null; |
1397 |
|
try { |
1398 |
< |
assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS)); |
1398 |
> |
actual = f.get(timeoutMillis, MILLISECONDS); |
1399 |
|
} catch (Throwable fail) { threadUnexpectedException(fail); } |
1400 |
+ |
assertEquals(expectedValue, actual); |
1401 |
|
if (millisElapsedSince(startTime) > timeoutMillis/2) |
1402 |
< |
throw new AssertionFailedError("timed get did not return promptly"); |
1402 |
> |
throw new AssertionError("timed get did not return promptly"); |
1403 |
|
} |
1404 |
|
|
1405 |
|
<T> void checkTimedGet(Future<T> f, T expectedValue) { |
1457 |
|
} |
1458 |
|
} |
1459 |
|
|
1515 |
– |
public abstract class RunnableShouldThrow implements Runnable { |
1516 |
– |
protected abstract void realRun() throws Throwable; |
1517 |
– |
|
1518 |
– |
final Class<?> exceptionClass; |
1519 |
– |
|
1520 |
– |
<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) { |
1521 |
– |
this.exceptionClass = exceptionClass; |
1522 |
– |
} |
1523 |
– |
|
1524 |
– |
public final void run() { |
1525 |
– |
try { |
1526 |
– |
realRun(); |
1527 |
– |
threadShouldThrow(exceptionClass.getSimpleName()); |
1528 |
– |
} catch (Throwable t) { |
1529 |
– |
if (! exceptionClass.isInstance(t)) |
1530 |
– |
threadUnexpectedException(t); |
1531 |
– |
} |
1532 |
– |
} |
1533 |
– |
} |
1534 |
– |
|
1460 |
|
public abstract class ThreadShouldThrow extends Thread { |
1461 |
|
protected abstract void realRun() throws Throwable; |
1462 |
|
|
1469 |
|
public final void run() { |
1470 |
|
try { |
1471 |
|
realRun(); |
1547 |
– |
threadShouldThrow(exceptionClass.getSimpleName()); |
1472 |
|
} catch (Throwable t) { |
1473 |
|
if (! exceptionClass.isInstance(t)) |
1474 |
|
threadUnexpectedException(t); |
1475 |
+ |
return; |
1476 |
|
} |
1477 |
+ |
threadShouldThrow(exceptionClass.getSimpleName()); |
1478 |
|
} |
1479 |
|
} |
1480 |
|
|
1484 |
|
public final void run() { |
1485 |
|
try { |
1486 |
|
realRun(); |
1561 |
– |
threadShouldThrow("InterruptedException"); |
1487 |
|
} catch (InterruptedException success) { |
1488 |
|
threadAssertFalse(Thread.interrupted()); |
1489 |
+ |
return; |
1490 |
|
} catch (Throwable fail) { |
1491 |
|
threadUnexpectedException(fail); |
1492 |
|
} |
1493 |
+ |
threadShouldThrow("InterruptedException"); |
1494 |
|
} |
1495 |
|
} |
1496 |
|
|
1502 |
|
return realCall(); |
1503 |
|
} catch (Throwable fail) { |
1504 |
|
threadUnexpectedException(fail); |
1578 |
– |
return null; |
1505 |
|
} |
1506 |
< |
} |
1581 |
< |
} |
1582 |
< |
|
1583 |
< |
public abstract class CheckedInterruptedCallable<T> |
1584 |
< |
implements Callable<T> { |
1585 |
< |
protected abstract T realCall() throws Throwable; |
1586 |
< |
|
1587 |
< |
public final T call() { |
1588 |
< |
try { |
1589 |
< |
T result = realCall(); |
1590 |
< |
threadShouldThrow("InterruptedException"); |
1591 |
< |
return result; |
1592 |
< |
} catch (InterruptedException success) { |
1593 |
< |
threadAssertFalse(Thread.interrupted()); |
1594 |
< |
} catch (Throwable fail) { |
1595 |
< |
threadUnexpectedException(fail); |
1596 |
< |
} |
1597 |
< |
return null; |
1506 |
> |
throw new AssertionError("unreached"); |
1507 |
|
} |
1508 |
|
} |
1509 |
|
|
1560 |
|
} |
1561 |
|
|
1562 |
|
public void await(CountDownLatch latch, long timeoutMillis) { |
1563 |
+ |
boolean timedOut = false; |
1564 |
|
try { |
1565 |
< |
if (!latch.await(timeoutMillis, MILLISECONDS)) |
1656 |
< |
fail("timed out waiting for CountDownLatch for " |
1657 |
< |
+ (timeoutMillis/1000) + " sec"); |
1565 |
> |
timedOut = !latch.await(timeoutMillis, MILLISECONDS); |
1566 |
|
} catch (Throwable fail) { |
1567 |
|
threadUnexpectedException(fail); |
1568 |
|
} |
1569 |
+ |
if (timedOut) |
1570 |
+ |
fail("timed out waiting for CountDownLatch for " |
1571 |
+ |
+ (timeoutMillis/1000) + " sec"); |
1572 |
|
} |
1573 |
|
|
1574 |
|
public void await(CountDownLatch latch) { |
1576 |
|
} |
1577 |
|
|
1578 |
|
public void await(Semaphore semaphore) { |
1579 |
+ |
boolean timedOut = false; |
1580 |
|
try { |
1581 |
< |
if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS)) |
1670 |
< |
fail("timed out waiting for Semaphore for " |
1671 |
< |
+ (LONG_DELAY_MS/1000) + " sec"); |
1581 |
> |
timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS); |
1582 |
|
} catch (Throwable fail) { |
1583 |
|
threadUnexpectedException(fail); |
1584 |
|
} |
1585 |
+ |
if (timedOut) |
1586 |
+ |
fail("timed out waiting for Semaphore for " |
1587 |
+ |
+ (LONG_DELAY_MS/1000) + " sec"); |
1588 |
|
} |
1589 |
|
|
1590 |
|
public void await(CyclicBarrier barrier) { |
1609 |
|
// long startTime = System.nanoTime(); |
1610 |
|
// while (!flag.get()) { |
1611 |
|
// if (millisElapsedSince(startTime) > timeoutMillis) |
1612 |
< |
// throw new AssertionFailedError("timed out"); |
1612 |
> |
// throw new AssertionError("timed out"); |
1613 |
|
// Thread.yield(); |
1614 |
|
// } |
1615 |
|
// } |
1618 |
|
public String call() { throw new NullPointerException(); } |
1619 |
|
} |
1620 |
|
|
1708 |
– |
public class SmallPossiblyInterruptedRunnable extends CheckedRunnable { |
1709 |
– |
protected void realRun() { |
1710 |
– |
try { |
1711 |
– |
delay(SMALL_DELAY_MS); |
1712 |
– |
} catch (InterruptedException ok) {} |
1713 |
– |
} |
1714 |
– |
} |
1715 |
– |
|
1621 |
|
public Runnable possiblyInterruptedRunnable(final long timeoutMillis) { |
1622 |
|
return new CheckedRunnable() { |
1623 |
|
protected void realRun() { |
1673 |
|
return realCompute(); |
1674 |
|
} catch (Throwable fail) { |
1675 |
|
threadUnexpectedException(fail); |
1771 |
– |
return null; |
1676 |
|
} |
1677 |
+ |
throw new AssertionError("unreached"); |
1678 |
|
} |
1679 |
|
} |
1680 |
|
|
1688 |
|
|
1689 |
|
/** |
1690 |
|
* A CyclicBarrier that uses timed await and fails with |
1691 |
< |
* AssertionFailedErrors instead of throwing checked exceptions. |
1691 |
> |
* AssertionErrors instead of throwing checked exceptions. |
1692 |
|
*/ |
1693 |
|
public static class CheckedBarrier extends CyclicBarrier { |
1694 |
|
public CheckedBarrier(int parties) { super(parties); } |
1697 |
|
try { |
1698 |
|
return super.await(2 * LONG_DELAY_MS, MILLISECONDS); |
1699 |
|
} catch (TimeoutException timedOut) { |
1700 |
< |
throw new AssertionFailedError("timed out"); |
1700 |
> |
throw new AssertionError("timed out"); |
1701 |
|
} catch (Exception fail) { |
1702 |
< |
AssertionFailedError afe = |
1798 |
< |
new AssertionFailedError("Unexpected exception: " + fail); |
1799 |
< |
afe.initCause(fail); |
1800 |
< |
throw afe; |
1702 |
> |
throw new AssertionError("Unexpected exception: " + fail, fail); |
1703 |
|
} |
1704 |
|
} |
1705 |
|
} |
1751 |
|
} |
1752 |
|
} |
1753 |
|
|
1754 |
< |
void assertImmutable(final Object o) { |
1754 |
> |
void assertImmutable(Object o) { |
1755 |
|
if (o instanceof Collection) { |
1756 |
|
assertThrows( |
1757 |
|
UnsupportedOperationException.class, |
1758 |
< |
new Runnable() { public void run() { |
1857 |
< |
((Collection) o).add(null);}}); |
1758 |
> |
() -> ((Collection) o).add(null)); |
1759 |
|
} |
1760 |
|
} |
1761 |
|
|
1762 |
|
@SuppressWarnings("unchecked") |
1763 |
|
<T> T serialClone(T o) { |
1764 |
+ |
T clone = null; |
1765 |
|
try { |
1766 |
|
ObjectInputStream ois = new ObjectInputStream |
1767 |
|
(new ByteArrayInputStream(serialBytes(o))); |
1768 |
< |
T clone = (T) ois.readObject(); |
1867 |
< |
if (o == clone) assertImmutable(o); |
1868 |
< |
assertSame(o.getClass(), clone.getClass()); |
1869 |
< |
return clone; |
1768 |
> |
clone = (T) ois.readObject(); |
1769 |
|
} catch (Throwable fail) { |
1770 |
|
threadUnexpectedException(fail); |
1872 |
– |
return null; |
1771 |
|
} |
1772 |
+ |
if (o == clone) assertImmutable(o); |
1773 |
+ |
else assertSame(o.getClass(), clone.getClass()); |
1774 |
+ |
return clone; |
1775 |
|
} |
1776 |
|
|
1777 |
|
/** |
1790 |
|
(new ByteArrayInputStream(bos.toByteArray())); |
1791 |
|
T clone = (T) ois.readObject(); |
1792 |
|
if (o == clone) assertImmutable(o); |
1793 |
< |
assertSame(o.getClass(), clone.getClass()); |
1793 |
> |
else assertSame(o.getClass(), clone.getClass()); |
1794 |
|
return clone; |
1795 |
|
} |
1796 |
|
|
1815 |
|
} |
1816 |
|
|
1817 |
|
public void assertThrows(Class<? extends Throwable> expectedExceptionClass, |
1818 |
< |
Runnable... throwingActions) { |
1819 |
< |
for (Runnable throwingAction : throwingActions) { |
1818 |
> |
Action... throwingActions) { |
1819 |
> |
for (Action throwingAction : throwingActions) { |
1820 |
|
boolean threw = false; |
1821 |
|
try { throwingAction.run(); } |
1822 |
|
catch (Throwable t) { |
1823 |
|
threw = true; |
1824 |
< |
if (!expectedExceptionClass.isInstance(t)) { |
1825 |
< |
AssertionFailedError afe = |
1826 |
< |
new AssertionFailedError |
1827 |
< |
("Expected " + expectedExceptionClass.getName() + |
1828 |
< |
", got " + t.getClass().getName()); |
1928 |
< |
afe.initCause(t); |
1929 |
< |
threadUnexpectedException(afe); |
1930 |
< |
} |
1824 |
> |
if (!expectedExceptionClass.isInstance(t)) |
1825 |
> |
throw new AssertionError( |
1826 |
> |
"Expected " + expectedExceptionClass.getName() + |
1827 |
> |
", got " + t.getClass().getName(), |
1828 |
> |
t); |
1829 |
|
} |
1830 |
|
if (!threw) |
1831 |
|
shouldThrow(expectedExceptionClass.getName()); |
1858 |
|
Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current()); |
1859 |
|
} |
1860 |
|
|
1861 |
+ |
/** |
1862 |
+ |
* Returns the same String as would be returned by {@link |
1863 |
+ |
* Object#toString}, whether or not the given object's class |
1864 |
+ |
* overrides toString(). |
1865 |
+ |
* |
1866 |
+ |
* @see System#identityHashCode |
1867 |
+ |
*/ |
1868 |
+ |
static String identityString(Object x) { |
1869 |
+ |
return x.getClass().getName() |
1870 |
+ |
+ "@" + Integer.toHexString(System.identityHashCode(x)); |
1871 |
+ |
} |
1872 |
+ |
|
1873 |
|
// --- Shared assertions for Executor tests --- |
1874 |
|
|
1875 |
|
/** |
2041 |
|
assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount()); |
2042 |
|
assertEquals(savedQueueSize, p.getQueue().size()); |
2043 |
|
} |
2044 |
+ |
|
2045 |
+ |
void assertCollectionsEquals(Collection<?> x, Collection<?> y) { |
2046 |
+ |
assertEquals(x, y); |
2047 |
+ |
assertEquals(y, x); |
2048 |
+ |
assertEquals(x.isEmpty(), y.isEmpty()); |
2049 |
+ |
assertEquals(x.size(), y.size()); |
2050 |
+ |
if (x instanceof List) { |
2051 |
+ |
assertEquals(x.toString(), y.toString()); |
2052 |
+ |
} |
2053 |
+ |
if (x instanceof List || x instanceof Set) { |
2054 |
+ |
assertEquals(x.hashCode(), y.hashCode()); |
2055 |
+ |
} |
2056 |
+ |
if (x instanceof List || x instanceof Deque) { |
2057 |
+ |
assertTrue(Arrays.equals(x.toArray(), y.toArray())); |
2058 |
+ |
assertTrue(Arrays.equals(x.toArray(new Object[0]), |
2059 |
+ |
y.toArray(new Object[0]))); |
2060 |
+ |
} |
2061 |
+ |
} |
2062 |
+ |
|
2063 |
+ |
/** |
2064 |
+ |
* A weaker form of assertCollectionsEquals which does not insist |
2065 |
+ |
* that the two collections satisfy Object#equals(Object), since |
2066 |
+ |
* they may use identity semantics as Deques do. |
2067 |
+ |
*/ |
2068 |
+ |
void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) { |
2069 |
+ |
if (x instanceof List || x instanceof Set) |
2070 |
+ |
assertCollectionsEquals(x, y); |
2071 |
+ |
else { |
2072 |
+ |
assertEquals(x.isEmpty(), y.isEmpty()); |
2073 |
+ |
assertEquals(x.size(), y.size()); |
2074 |
+ |
assertEquals(new HashSet(x), new HashSet(y)); |
2075 |
+ |
if (x instanceof Deque) { |
2076 |
+ |
assertTrue(Arrays.equals(x.toArray(), y.toArray())); |
2077 |
+ |
assertTrue(Arrays.equals(x.toArray(new Object[0]), |
2078 |
+ |
y.toArray(new Object[0]))); |
2079 |
+ |
} |
2080 |
+ |
} |
2081 |
+ |
} |
2082 |
|
} |