--- jsr166/src/test/tck/SemaphoreTest.java 2017/05/29 19:15:03 1.42 +++ jsr166/src/test/tck/SemaphoreTest.java 2018/01/23 20:44:11 1.43 @@ -13,7 +13,6 @@ import java.util.concurrent.CountDownLat import java.util.concurrent.Semaphore; import java.util.concurrent.ThreadLocalRandom; -import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestSuite; @@ -74,7 +73,7 @@ public class SemaphoreTest extends JSR16 long startTime = System.nanoTime(); while (!s.hasQueuedThread(t)) { if (millisElapsedSince(startTime) > LONG_DELAY_MS) - throw new AssertionFailedError("timed out"); + throw new AssertionError("timed out"); Thread.yield(); } assertTrue(s.hasQueuedThreads()); @@ -88,7 +87,7 @@ public class SemaphoreTest extends JSR16 long startTime = System.nanoTime(); while (!s.hasQueuedThreads()) { if (millisElapsedSince(startTime) > LONG_DELAY_MS) - throw new AssertionFailedError("timed out"); + throw new AssertionError("timed out"); Thread.yield(); } }