Address follow-up comments from aosp/2721077.

Bug: 297147201
Test: ./art/test/testrunner/testrunner.py --host --64 -b --optimizing
Change-Id: Ie89d310633339b785de5d9f3daf653abfbff875c

1 files changed, 8 insertions, 1 deletions

diff --git a/test/2277-methodhandle-invokeexact/src-multidex/Multi.java b/test/2277-methodhandle-invokeexact/src-multidex/Multi.java
index 43601a947e..5f2dcf0093 100644
--- a/test/2277-methodhandle-invokeexact/src-multidex/Multi.java
+++ b/test/2277-methodhandle-invokeexact/src-multidex/Multi.java
@@ -18,6 +18,7 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.invoke.WrongMethodTypeException;
+import java.util.Objects;
 import java.util.Optional;
 
 public class Multi {
@@ -29,7 +30,7 @@ public class Multi {
     public static void $noinline$testMHFromMain(MethodHandle mh) throws Throwable {
         Optional<Integer> nonEmpty = Optional.<Integer>of(1001);
         Object result = (Object) mh.invokeExact(nonEmpty);
-        System.out.println("Multi: mh.invokeExact(nonEmpty)=" + result);
+        assertEquals("Expected 1001, but got " + result, 1001, result);
 
         try {
             mh.invokeExact(nonEmpty);
@@ -37,6 +38,12 @@ public class Multi {
         } catch (WrongMethodTypeException expected) {}
     }
 
+    private static void assertEquals(String msg, Object expected, Object actual) {
+        if (!Objects.equals(expected, actual)) {
+            fail(msg);
+        }
+    }
+
     private static void fail(String msg) {
       throw new AssertionError(msg);
     }