commit 8cb030663ecd2e1939f5e2e0eddbb2ff57d1b8f1
author Mathieu Chartier <mathieuc@google.com> Mon Oct 13 10:58:01 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Oct 13 11:00:25 2014 -0700
tree 00ce13daa14c3f25ce89bb1a335b384ed0fb5a6d
parent 472b1591300912af2430e3299c3b6119624c2849

Make finalization test more robust

Moved some logic to its own function to prevent vregs keeping objects
live. Not sure if it fixes flaky test, can't reproduce.

Bug: 17932313
Change-Id: Ib9c70d954a9692d6529f6ac645c9d0e9f596e502

test/036-finalizer/src/Main.java

diff --git a/test/036-finalizer/src/Main.java b/test/036-finalizer/src/Main.java
index 390472d..4ebbdc5 100644
--- a/test/036-finalizer/src/Main.java
+++ b/test/036-finalizer/src/Main.java
@@ -141,16 +141,17 @@
       }
     }
 
-    private static void runFinalizationTest() {
-      int count = 1024;
+    private static void allocFinalizableObjects(int count) {
       Object[] objs = new Object[count];
       for (int i = 0; i < count; ++i) {
         objs[i] = new FinalizeCounter(i);
       }
-      for (int i = 0; i < count; ++i) {
-        objs[i] = null;
-      }
-      System.gc();
+    }
+
+    private static void runFinalizationTest() {
+      int count = 1024;
+      allocFinalizableObjects(count);
+      Runtime.getRuntime().gc();
       System.runFinalization();
       System.out.println("Finalized " + FinalizeCounter.getCount() + " / "  + count);
     }