--- jsr166/src/test/tck/ReentrantLockTest.java	2017/09/29 22:31:55	1.67
+++ jsr166/src/test/tck/ReentrantLockTest.java	2018/01/23 20:44:11	1.68
@@ -18,7 +18,6 @@ import java.util.concurrent.ThreadLocalR
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
@@ -88,7 +87,7 @@ public class ReentrantLockTest extends J
         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());