commit 13ca74fed068a6a49221b5213ce0b1bebeda3ed6
author Narayan Kamath <narayan@google.com> Wed Nov 18 15:42:26 2015 +0000
committer Narayan Kamath <narayan@google.com> Thu Nov 19 17:25:43 2015 +0000
tree ad13148ce9def67464eeb289260b3b1e2a782dc3
parent d0096a46c5c3d95dc65db4c68febeb2cb3988fcc

Fix 030-bad-finalizer & 059-finalizer-throw.

Use a default uncaught exception handler to log messages.

bug: 25759624
Change-Id: I9f3253261e15cd62bd433e01b852ecae40a8f58d

test/030-bad-finalizer/expected.txt

diff --git a/test/030-bad-finalizer/expected.txt b/test/030-bad-finalizer/expected.txt
index ee9cfff..c1f3f4f 100644
--- a/test/030-bad-finalizer/expected.txt
+++ b/test/030-bad-finalizer/expected.txt
@@ -2,3 +2,4 @@
 Finalizer started and spinning...
 Finalizer done spinning.
 Finalizer sleeping forever now.
+Caught exception: Main$BadFinalizer.finalize() timed out after 10 seconds

test/030-bad-finalizer/src/Main.java

diff --git a/test/030-bad-finalizer/src/Main.java b/test/030-bad-finalizer/src/Main.java
index 942ee25..79b53ef 100644
--- a/test/030-bad-finalizer/src/Main.java
+++ b/test/030-bad-finalizer/src/Main.java
@@ -21,6 +21,15 @@
     public static void main(String[] args) {
         BadFinalizer bf = new BadFinalizer();
 
+        Thread.setDefaultUncaughtExceptionHandler(
+            new Thread.UncaughtExceptionHandler() {
+                @Override
+                public void uncaughtException(Thread t, Throwable e) {
+                    System.out.println("Caught exception: " + e.getMessage());
+                    System.exit(0);
+                }
+            });
+
         System.out.println("About to null reference and request GC.");
         bf = null;
         Runtime.getRuntime().gc();

test/059-finalizer-throw/expected.txt

diff --git a/test/059-finalizer-throw/expected.txt b/test/059-finalizer-throw/expected.txt
index cbc9ece..fb4c3aa 100644
--- a/test/059-finalizer-throw/expected.txt
+++ b/test/059-finalizer-throw/expected.txt
@@ -1,2 +1,2 @@
 In finalizer
-done
+Caught exception: whee

test/059-finalizer-throw/src/Main.java

diff --git a/test/059-finalizer-throw/src/Main.java b/test/059-finalizer-throw/src/Main.java
index fa80fe3..e863e83 100644
--- a/test/059-finalizer-throw/src/Main.java
+++ b/test/059-finalizer-throw/src/Main.java
@@ -30,6 +30,14 @@
     }
 
     public static void main(String[] args) {
+        Thread.setDefaultUncaughtExceptionHandler(
+            new Thread.UncaughtExceptionHandler() {
+                @Override
+                public void uncaughtException(Thread t, Throwable e) {
+                    System.out.println("Caught exception: " + e.getMessage());
+                }
+            });
+
         createAndForget();
 
         System.gc();
@@ -56,8 +64,6 @@
         } catch (InterruptedException ie) {
             System.err.println(ie);
         }
-
-        System.out.println("done");
     }
 
     protected void finalize() throws Throwable {