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; |
421 |
|
for (String testClassName : testClassNames) { |
422 |
|
try { |
423 |
|
Class<?> testClass = Class.forName(testClassName); |
424 |
< |
Method m = testClass.getDeclaredMethod("suite", |
423 |
< |
new Class<?>[0]); |
424 |
> |
Method m = testClass.getDeclaredMethod("suite"); |
425 |
|
suite.addTest(newTestSuite((Test)m.invoke(null))); |
426 |
< |
} catch (Exception e) { |
427 |
< |
throw new Error("Missing test class", e); |
426 |
> |
} catch (ReflectiveOperationException e) { |
427 |
> |
throw new AssertionError("Missing test class", e); |
428 |
|
} |
429 |
|
} |
430 |
|
} |
451 |
|
public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; } |
452 |
|
public static boolean atLeastJava9() { return JAVA_CLASS_VERSION >= 53.0; } |
453 |
|
public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; } |
454 |
+ |
public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; } |
455 |
|
|
456 |
|
/** |
457 |
|
* Collects all JSR166 unit tests as one suite. |
602 |
|
for (String methodName : testMethodNames(testClass)) |
603 |
|
suite.addTest((Test) c.newInstance(data, methodName)); |
604 |
|
return suite; |
605 |
< |
} catch (Exception e) { |
606 |
< |
throw new Error(e); |
605 |
> |
} catch (ReflectiveOperationException e) { |
606 |
> |
throw new AssertionError(e); |
607 |
|
} |
608 |
|
} |
609 |
|
|
619 |
|
if (atLeastJava8()) { |
620 |
|
String name = testClass.getName(); |
621 |
|
String name8 = name.replaceAll("Test$", "8Test"); |
622 |
< |
if (name.equals(name8)) throw new Error(name); |
622 |
> |
if (name.equals(name8)) throw new AssertionError(name); |
623 |
|
try { |
624 |
|
return (Test) |
625 |
|
Class.forName(name8) |
626 |
< |
.getMethod("testSuite", new Class[] { dataClass }) |
626 |
> |
.getMethod("testSuite", dataClass) |
627 |
|
.invoke(null, data); |
628 |
< |
} catch (Exception e) { |
629 |
< |
throw new Error(e); |
628 |
> |
} catch (ReflectiveOperationException e) { |
629 |
> |
throw new AssertionError(e); |
630 |
|
} |
631 |
|
} else { |
632 |
|
return new TestSuite(); |
735 |
|
String msg = toString() + ": " + String.format(format, args); |
736 |
|
System.err.println(msg); |
737 |
|
dumpTestThreads(); |
738 |
< |
throw new AssertionFailedError(msg); |
738 |
> |
throw new AssertionError(msg); |
739 |
|
} |
740 |
|
|
741 |
|
/** |
756 |
|
throw (RuntimeException) t; |
757 |
|
else if (t instanceof Exception) |
758 |
|
throw (Exception) t; |
759 |
< |
else { |
760 |
< |
AssertionFailedError afe = |
759 |
< |
new AssertionFailedError(t.toString()); |
760 |
< |
afe.initCause(t); |
761 |
< |
throw afe; |
762 |
< |
} |
759 |
> |
else |
760 |
> |
throw new AssertionError(t.toString(), t); |
761 |
|
} |
762 |
|
|
763 |
|
if (Thread.interrupted()) |
791 |
|
|
792 |
|
/** |
793 |
|
* Just like fail(reason), but additionally recording (using |
794 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
795 |
< |
* the current testcase will fail. |
794 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
795 |
> |
* current testcase will fail. |
796 |
|
*/ |
797 |
|
public void threadFail(String reason) { |
798 |
|
try { |
799 |
|
fail(reason); |
800 |
< |
} catch (AssertionFailedError t) { |
801 |
< |
threadRecordFailure(t); |
802 |
< |
throw t; |
800 |
> |
} catch (AssertionError fail) { |
801 |
> |
threadRecordFailure(fail); |
802 |
> |
throw fail; |
803 |
|
} |
804 |
|
} |
805 |
|
|
806 |
|
/** |
807 |
|
* Just like assertTrue(b), but additionally recording (using |
808 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
809 |
< |
* the current testcase will fail. |
808 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
809 |
> |
* current testcase will fail. |
810 |
|
*/ |
811 |
|
public void threadAssertTrue(boolean b) { |
812 |
|
try { |
813 |
|
assertTrue(b); |
814 |
< |
} catch (AssertionFailedError t) { |
815 |
< |
threadRecordFailure(t); |
816 |
< |
throw t; |
814 |
> |
} catch (AssertionError fail) { |
815 |
> |
threadRecordFailure(fail); |
816 |
> |
throw fail; |
817 |
|
} |
818 |
|
} |
819 |
|
|
820 |
|
/** |
821 |
|
* Just like assertFalse(b), but additionally recording (using |
822 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
823 |
< |
* the current testcase will fail. |
822 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
823 |
> |
* current testcase will fail. |
824 |
|
*/ |
825 |
|
public void threadAssertFalse(boolean b) { |
826 |
|
try { |
827 |
|
assertFalse(b); |
828 |
< |
} catch (AssertionFailedError t) { |
829 |
< |
threadRecordFailure(t); |
830 |
< |
throw t; |
828 |
> |
} catch (AssertionError fail) { |
829 |
> |
threadRecordFailure(fail); |
830 |
> |
throw fail; |
831 |
|
} |
832 |
|
} |
833 |
|
|
834 |
|
/** |
835 |
|
* Just like assertNull(x), but additionally recording (using |
836 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
837 |
< |
* the current testcase will fail. |
836 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
837 |
> |
* current testcase will fail. |
838 |
|
*/ |
839 |
|
public void threadAssertNull(Object x) { |
840 |
|
try { |
841 |
|
assertNull(x); |
842 |
< |
} catch (AssertionFailedError t) { |
843 |
< |
threadRecordFailure(t); |
844 |
< |
throw t; |
842 |
> |
} catch (AssertionError fail) { |
843 |
> |
threadRecordFailure(fail); |
844 |
> |
throw fail; |
845 |
|
} |
846 |
|
} |
847 |
|
|
848 |
|
/** |
849 |
|
* Just like assertEquals(x, y), but additionally recording (using |
850 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
851 |
< |
* the current testcase will fail. |
850 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
851 |
> |
* current testcase will fail. |
852 |
|
*/ |
853 |
|
public void threadAssertEquals(long x, long y) { |
854 |
|
try { |
855 |
|
assertEquals(x, y); |
856 |
< |
} catch (AssertionFailedError t) { |
857 |
< |
threadRecordFailure(t); |
858 |
< |
throw t; |
856 |
> |
} catch (AssertionError fail) { |
857 |
> |
threadRecordFailure(fail); |
858 |
> |
throw fail; |
859 |
|
} |
860 |
|
} |
861 |
|
|
862 |
|
/** |
863 |
|
* Just like assertEquals(x, y), but additionally recording (using |
864 |
< |
* threadRecordFailure) any AssertionFailedError thrown, so that |
865 |
< |
* the current testcase will fail. |
864 |
> |
* threadRecordFailure) any AssertionError thrown, so that the |
865 |
> |
* current testcase will fail. |
866 |
|
*/ |
867 |
|
public void threadAssertEquals(Object x, Object y) { |
868 |
|
try { |
869 |
|
assertEquals(x, y); |
870 |
< |
} catch (AssertionFailedError fail) { |
870 |
> |
} catch (AssertionError fail) { |
871 |
|
threadRecordFailure(fail); |
872 |
|
throw fail; |
873 |
|
} catch (Throwable fail) { |
877 |
|
|
878 |
|
/** |
879 |
|
* Just like assertSame(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 threadAssertSame(Object x, Object y) { |
884 |
|
try { |
885 |
|
assertSame(x, y); |
886 |
< |
} catch (AssertionFailedError fail) { |
886 |
> |
} catch (AssertionError fail) { |
887 |
|
threadRecordFailure(fail); |
888 |
|
throw fail; |
889 |
|
} |
905 |
|
|
906 |
|
/** |
907 |
|
* Records the given exception using {@link #threadRecordFailure}, |
908 |
< |
* then rethrows the exception, wrapping it in an |
909 |
< |
* AssertionFailedError if necessary. |
908 |
> |
* then rethrows the exception, wrapping it in an AssertionError |
909 |
> |
* if necessary. |
910 |
|
*/ |
911 |
|
public void threadUnexpectedException(Throwable t) { |
912 |
|
threadRecordFailure(t); |
915 |
|
throw (RuntimeException) t; |
916 |
|
else if (t instanceof Error) |
917 |
|
throw (Error) t; |
918 |
< |
else { |
919 |
< |
AssertionFailedError afe = |
922 |
< |
new AssertionFailedError("unexpected exception: " + t); |
923 |
< |
afe.initCause(t); |
924 |
< |
throw afe; |
925 |
< |
} |
918 |
> |
else |
919 |
> |
throw new AssertionError("unexpected exception: " + t, t); |
920 |
|
} |
921 |
|
|
922 |
|
/** |
1092 |
|
for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) { |
1093 |
|
try { delay(1); } |
1094 |
|
catch (InterruptedException fail) { |
1095 |
< |
fail("Unexpected InterruptedException"); |
1095 |
> |
throw new AssertionError("Unexpected InterruptedException", fail); |
1096 |
|
} |
1097 |
|
Thread.State s = thread.getState(); |
1098 |
|
if (s == expected) |
1278 |
|
|
1279 |
|
/** |
1280 |
|
* Sleeps until the given time has elapsed. |
1281 |
< |
* Throws AssertionFailedError if interrupted. |
1281 |
> |
* Throws AssertionError if interrupted. |
1282 |
|
*/ |
1283 |
|
static void sleep(long millis) { |
1284 |
|
try { |
1285 |
|
delay(millis); |
1286 |
|
} catch (InterruptedException fail) { |
1287 |
< |
AssertionFailedError afe = |
1294 |
< |
new AssertionFailedError("Unexpected InterruptedException"); |
1295 |
< |
afe.initCause(fail); |
1296 |
< |
throw afe; |
1287 |
> |
throw new AssertionError("Unexpected InterruptedException", fail); |
1288 |
|
} |
1289 |
|
} |
1290 |
|
|
1375 |
|
// r.run(); |
1376 |
|
// } catch (Throwable fail) { threadUnexpectedException(fail); } |
1377 |
|
// if (millisElapsedSince(startTime) > timeoutMillis/2) |
1378 |
< |
// throw new AssertionFailedError("did not return promptly"); |
1378 |
> |
// throw new AssertionError("did not return promptly"); |
1379 |
|
// } |
1380 |
|
|
1381 |
|
// void assertTerminatesPromptly(Runnable r) { |
1388 |
|
*/ |
1389 |
|
<T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) { |
1390 |
|
long startTime = System.nanoTime(); |
1391 |
+ |
T actual = null; |
1392 |
|
try { |
1393 |
< |
assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS)); |
1393 |
> |
actual = f.get(timeoutMillis, MILLISECONDS); |
1394 |
|
} catch (Throwable fail) { threadUnexpectedException(fail); } |
1395 |
+ |
assertEquals(expectedValue, actual); |
1396 |
|
if (millisElapsedSince(startTime) > timeoutMillis/2) |
1397 |
< |
throw new AssertionFailedError("timed get did not return promptly"); |
1397 |
> |
throw new AssertionError("timed get did not return promptly"); |
1398 |
|
} |
1399 |
|
|
1400 |
|
<T> void checkTimedGet(Future<T> f, T expectedValue) { |
1452 |
|
} |
1453 |
|
} |
1454 |
|
|
1462 |
– |
public abstract class RunnableShouldThrow implements Runnable { |
1463 |
– |
protected abstract void realRun() throws Throwable; |
1464 |
– |
|
1465 |
– |
final Class<?> exceptionClass; |
1466 |
– |
|
1467 |
– |
<T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) { |
1468 |
– |
this.exceptionClass = exceptionClass; |
1469 |
– |
} |
1470 |
– |
|
1471 |
– |
public final void run() { |
1472 |
– |
try { |
1473 |
– |
realRun(); |
1474 |
– |
threadShouldThrow(exceptionClass.getSimpleName()); |
1475 |
– |
} catch (Throwable t) { |
1476 |
– |
if (! exceptionClass.isInstance(t)) |
1477 |
– |
threadUnexpectedException(t); |
1478 |
– |
} |
1479 |
– |
} |
1480 |
– |
} |
1481 |
– |
|
1455 |
|
public abstract class ThreadShouldThrow extends Thread { |
1456 |
|
protected abstract void realRun() throws Throwable; |
1457 |
|
|
1616 |
|
// long startTime = System.nanoTime(); |
1617 |
|
// while (!flag.get()) { |
1618 |
|
// if (millisElapsedSince(startTime) > timeoutMillis) |
1619 |
< |
// throw new AssertionFailedError("timed out"); |
1619 |
> |
// throw new AssertionError("timed out"); |
1620 |
|
// Thread.yield(); |
1621 |
|
// } |
1622 |
|
// } |
1703 |
|
|
1704 |
|
/** |
1705 |
|
* A CyclicBarrier that uses timed await and fails with |
1706 |
< |
* AssertionFailedErrors instead of throwing checked exceptions. |
1706 |
> |
* AssertionErrors instead of throwing checked exceptions. |
1707 |
|
*/ |
1708 |
|
public static class CheckedBarrier extends CyclicBarrier { |
1709 |
|
public CheckedBarrier(int parties) { super(parties); } |
1712 |
|
try { |
1713 |
|
return super.await(2 * LONG_DELAY_MS, MILLISECONDS); |
1714 |
|
} catch (TimeoutException timedOut) { |
1715 |
< |
throw new AssertionFailedError("timed out"); |
1715 |
> |
throw new AssertionError("timed out"); |
1716 |
|
} catch (Exception fail) { |
1717 |
< |
AssertionFailedError afe = |
1745 |
< |
new AssertionFailedError("Unexpected exception: " + fail); |
1746 |
< |
afe.initCause(fail); |
1747 |
< |
throw afe; |
1717 |
> |
throw new AssertionError("Unexpected exception: " + fail, fail); |
1718 |
|
} |
1719 |
|
} |
1720 |
|
} |
1837 |
|
try { throwingAction.run(); } |
1838 |
|
catch (Throwable t) { |
1839 |
|
threw = true; |
1840 |
< |
if (!expectedExceptionClass.isInstance(t)) { |
1841 |
< |
AssertionFailedError afe = |
1842 |
< |
new AssertionFailedError |
1843 |
< |
("Expected " + expectedExceptionClass.getName() + |
1844 |
< |
", got " + t.getClass().getName()); |
1875 |
< |
afe.initCause(t); |
1876 |
< |
threadUnexpectedException(afe); |
1877 |
< |
} |
1840 |
> |
if (!expectedExceptionClass.isInstance(t)) |
1841 |
> |
throw new AssertionError( |
1842 |
> |
"Expected " + expectedExceptionClass.getName() + |
1843 |
> |
", got " + t.getClass().getName(), |
1844 |
> |
t); |
1845 |
|
} |
1846 |
|
if (!threw) |
1847 |
|
shouldThrow(expectedExceptionClass.getName()); |
2057 |
|
assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount()); |
2058 |
|
assertEquals(savedQueueSize, p.getQueue().size()); |
2059 |
|
} |
2060 |
+ |
|
2061 |
+ |
void assertCollectionsEquals(Collection<?> x, Collection<?> y) { |
2062 |
+ |
assertEquals(x, y); |
2063 |
+ |
assertEquals(y, x); |
2064 |
+ |
assertEquals(x.isEmpty(), y.isEmpty()); |
2065 |
+ |
assertEquals(x.size(), y.size()); |
2066 |
+ |
if (x instanceof List) { |
2067 |
+ |
assertEquals(x.toString(), y.toString()); |
2068 |
+ |
} |
2069 |
+ |
if (x instanceof List || x instanceof Set) { |
2070 |
+ |
assertEquals(x.hashCode(), y.hashCode()); |
2071 |
+ |
} |
2072 |
+ |
if (x instanceof List || x instanceof Deque) { |
2073 |
+ |
assertTrue(Arrays.equals(x.toArray(), y.toArray())); |
2074 |
+ |
assertTrue(Arrays.equals(x.toArray(new Object[0]), |
2075 |
+ |
y.toArray(new Object[0]))); |
2076 |
+ |
} |
2077 |
+ |
} |
2078 |
+ |
|
2079 |
+ |
/** |
2080 |
+ |
* A weaker form of assertCollectionsEquals which does not insist |
2081 |
+ |
* that the two collections satisfy Object#equals(Object), since |
2082 |
+ |
* they may use identity semantics as Deques do. |
2083 |
+ |
*/ |
2084 |
+ |
void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) { |
2085 |
+ |
if (x instanceof List || x instanceof Set) |
2086 |
+ |
assertCollectionsEquals(x, y); |
2087 |
+ |
else { |
2088 |
+ |
assertEquals(x.isEmpty(), y.isEmpty()); |
2089 |
+ |
assertEquals(x.size(), y.size()); |
2090 |
+ |
assertEquals(new HashSet(x), new HashSet(y)); |
2091 |
+ |
if (x instanceof Deque) { |
2092 |
+ |
assertTrue(Arrays.equals(x.toArray(), y.toArray())); |
2093 |
+ |
assertTrue(Arrays.equals(x.toArray(new Object[0]), |
2094 |
+ |
y.toArray(new Object[0]))); |
2095 |
+ |
} |
2096 |
+ |
} |
2097 |
+ |
} |
2098 |
|
} |