Fix the expectations for test 084.
I added a new part to the test, but only ran it in --dev mode, which doesn't
check the expectations, which I forgot to update. Also make naming and comment
improvements.
Change-Id: Ie2cac9f3b0837eda4a821d972f72c96e0316337a
diff --git a/test/084-class-init/expected.txt b/test/084-class-init/expected.txt
index 6e74fbb..5b0b3ff 100644
--- a/test/084-class-init/expected.txt
+++ b/test/084-class-init/expected.txt
@@ -1,3 +1,4 @@
+caught exception thrown during clinit
Got expected EIIE for FIELD0
Got expected NCDFE for FIELD0
Got expected NCDFE for FIELD1
diff --git a/test/084-class-init/src/Main.java b/test/084-class-init/src/Main.java
index 4ca2dbc..f551dc5 100644
--- a/test/084-class-init/src/Main.java
+++ b/test/084-class-init/src/Main.java
@@ -16,12 +16,12 @@
public class Main {
static {
- staticMethod();
+ staticMethodCalledByClinit();
}
- private static void staticMethod() {
- // Test that DeliverException works when the handler -- this method -- is currently a
- // resolution stub because it's running on behalf of <clinit>.
+ private static void staticMethodCalledByClinit() {
+ // Test that DeliverException works when we need to unwind to a handler -- this method --
+ // that is currently a resolution stub because it's running on behalf of <clinit>.
try {
throwDuringClinit();
System.err.println("didn't throw!");
