From e7b8456e69c72dffc1c561c68cc320abfa6af241 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Wed, 18 Feb 2015 09:57:21 -0800 Subject: Make ReferenceQueueTest#test_removeJ more robust. No spurrious failures if the sleep finishes before the RemoveThread is inside the try catch block. Bug: 19384923 Change-Id: I81e340e97eff5e1d011e980c2f89dfa679662547 --- .../harmony/tests/java/lang/ref/ReferenceQueueTest.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'harmony-tests/src/test/java') diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java index 75a5218..e010116 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java @@ -22,6 +22,7 @@ import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; +import java.util.concurrent.CountDownLatch; import libcore.java.lang.ref.FinalizationTester; public class ReferenceQueueTest extends junit.framework.TestCase { @@ -198,27 +199,29 @@ public class ReferenceQueueTest extends junit.framework.TestCase { assertNull(rq.poll()); class RemoveThread extends Thread { + public final CountDownLatch inBlock = new CountDownLatch(1); + public final CountDownLatch outOfBlock = new CountDownLatch(1); public void run() { try { + inBlock.countDown(); rq.remove(1000L); } catch(InterruptedException ie) { isThrown = true; } + outOfBlock.countDown(); } } RemoveThread rt = new RemoveThread(); rt.start(); try { + rt.inBlock.await(); + // Try to be inside of rq.remove(1000L) if possible. Thread.sleep(10); - } catch(InterruptedException ie) { - - } + } catch(InterruptedException ie) {} rt.interrupt(); try { - Thread.sleep(10); - } catch(InterruptedException ie) { - - } + rt.outOfBlock.await(); + } catch(InterruptedException ie) {} assertTrue(isThrown); assertNull(rq.poll()); -- cgit v1.1