--- a/test/jdk/java/util/concurrent/tck/ReentrantLockTest.java Sat Feb 10 09:17:53 2018 -0800
+++ b/test/jdk/java/util/concurrent/tck/ReentrantLockTest.java Sat Feb 10 09:23:41 2018 -0800
@@ -45,7 +45,6 @@
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
-import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -115,7 +114,7 @@
long startTime = System.nanoTime();
while (!lock.hasQueuedThread(t)) {
if (millisElapsedSince(startTime) > LONG_DELAY_MS)
- throw new AssertionFailedError("timed out");
+ throw new AssertionError("timed out");
Thread.yield();
}
assertTrue(t.isAlive());