More robust way to wait for finalization

Change-Id: I99aa3ac27c5157a6858978da20e480bc9847d88f

2 files changed, 5 insertions, 7 deletions

diff --git a/javaunohelper/JunitTest_juh.mk b/javaunohelper/JunitTest_juh.mk
index fc289ca589b5..214589d36a6d 100644
--- a/javaunohelper/JunitTest_juh.mk
+++ b/javaunohelper/JunitTest_juh.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_JunitTest_set_defs,juh,\
 ))
 
 $(eval $(call gb_JunitTest_use_jars,juh,\
+    OOoRunnerLight \
     ridl \
     jurt \
 ))
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
index 89ab9ddc547e..44cfcb952c34 100644
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
@@ -30,6 +30,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Before;
 import org.junit.Test;
+import util.WaitUnreachable;
 
 public class ComponentBase_Test
 {
@@ -97,16 +98,12 @@ public class ComponentBase_Test
 
     @Test public void test_finalize() throws Exception
     {
-        logger.log(Level.INFO, "Testing ComponentBase: test_finalize()");
         ComponentBase comp= new ComponentBase();
         obj1.nDisposingCalled = 0;
         comp.addEventListener(obj1);
-
+        WaitUnreachable u = new WaitUnreachable(comp);
         comp= null;
-        System.gc();
-        System.runFinalization();
-        logger.log(Level.FINE, "Waiting 51ms (-XX:MaxGCPauseMillis=50)");
-        Thread.sleep(51);
+        u.waitUnreachable();
         assertEquals(obj1.nDisposingCalled, 1);
     }
-}
\ No newline at end of file
+}