7044892: JSR 292: API entry points sometimes throw the wrong exceptions or doesn't throw the expected one
Summary: point-fixes for 7038847, 7038860, 7042656, 7042829, 7041853, and several other reports
Reviewed-by: never, kvn
diff --git a/test/java/lang/invoke/MethodHandlesTest.java b/test/java/lang/invoke/MethodHandlesTest.java
index 9ebe37a..ded00ae 100644
--- a/test/java/lang/invoke/MethodHandlesTest.java
+++ b/test/java/lang/invoke/MethodHandlesTest.java
@@ -505,8 +505,15 @@
System.out.print(':');
}
+ static final boolean DEBUG_METHOD_HANDLE_NAMES = Boolean.getBoolean("java.lang.invoke.MethodHandle.DEBUG_NAMES");
+
// rough check of name string
- static void assertNameStringContains(Object x, String s) {
+ static void assertNameStringContains(MethodHandle x, String s) {
+ if (!DEBUG_METHOD_HANDLE_NAMES) {
+ // ignore s
+ assertEquals("MethodHandle"+x.type(), x.toString());
+ return;
+ }
if (x.toString().contains(s)) return;
assertEquals(s, x);
}