stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8150824: Exceptions when omitting trailing arguments in cleanup

Browse Source 
The issue was fixed with the push for 8150829; this changeset adds tests.

Reviewed-by: psandoz
This commit is contained in:
Michael Haupt 2016-04-14 15:18:42 +02:00
parent 0319d95579
commit 418c757b71
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jdk/test/java/lang/invoke/TryFinallyTest.java
View File

@ -25,6 +25,7 @@
/* @test
* @bug 8139885
* @bug 8150824
* @bug 8150825
* @run testng/othervm -ea -esa test.java.lang.invoke.TryFinallyTest
*/
@ -70,6 +71,24 @@ public class TryFinallyTest {
assertEquals("Hello, world and universe (but world first)!", helloMore.invoke("world", "universe"));
}
@DataProvider
static Object[][] omitTrailingArguments() {
MethodHandle c = TryFinally.MH_voidCleanup;
return new Object[][]{
{c},
{MethodHandles.dropArguments(c, 1, int.class)},
{MethodHandles.dropArguments(c, 1, int.class, long.class)},
{MethodHandles.dropArguments(c, 1, int.class, long.class, Object.class, int.class)},
{MethodHandles.dropArguments(c, 1, int.class, long.class, Object.class, int.class, long.class)}
};
}
@Test(dataProvider = "omitTrailingArguments")
public static void testTryFinallyOmitTrailingArguments(MethodHandle cleanup) throws Throwable {
MethodHandle tf = MethodHandles.tryFinally(TryFinally.MH_dummyTarget, cleanup);
tf.invoke(1, 2L, "a", 23, 42L, "b");
}
@DataProvider
static Object[][] negativeTestData() {
MethodHandle intid = MethodHandles.identity(int.class);
@ -77,6 +96,8 @@ public class TryFinallyTest {
MethodHandle errTarget = MethodHandles.dropArguments(intco, 0, int.class, double.class, String.class, int.class);
MethodHandle errCleanup = MethodHandles.dropArguments(MethodHandles.constant(int.class, 0), 0, Throwable.class,
int.class, double.class, Object.class);
MethodHandle voidTarget = TryFinally.MH_voidTarget;
MethodHandle voidICleanup = MethodHandles.dropArguments(TryFinally.MH_voidCleanup, 1, int.class);
return new Object[][]{
{intid, MethodHandles.identity(double.class),
"target and return types must match: double != int"},
@ -87,9 +108,9 @@ public class TryFinallyTest {
{errTarget, errCleanup,
"cleanup parameters after (Throwable,result) and target parameter list prefix must match: " +
errCleanup.type() + " != " + errTarget.type()},
{TryFinally.MH_voidTarget, TryFinally.MH_voidCleanup,
{voidTarget, voidICleanup,
"cleanup parameters after (Throwable,result) and target parameter list prefix must match: " +
TryFinally.MH_voidCleanup.type() + " != " + TryFinally.MH_voidTarget.type()}
voidICleanup.type() + " != " + voidTarget.type()}
};
}
@ -133,7 +154,7 @@ public class TryFinallyTest {
static void voidTarget() {}
static void voidCleanup(Throwable t, int a) {}
static void voidCleanup(Throwable t) {}
static final Class<TryFinally> TRY_FINALLY = TryFinally.class;
@ -144,7 +165,7 @@ public class TryFinallyTest {
static final MethodType MT_greetMore = methodType(String.class, String.class, String.class);
static final MethodType MT_exclaimMore = methodType(String.class, Throwable.class, String.class, String.class);
static final MethodType MT_voidTarget = methodType(void.class);
static final MethodType MT_voidCleanup = methodType(void.class, Throwable.class, int.class);
static final MethodType MT_voidCleanup = methodType(void.class, Throwable.class);
static final MethodHandle MH_greet;
static final MethodHandle MH_exclaim;
@ -155,6 +176,8 @@ public class TryFinallyTest {
static final MethodHandle MH_voidTarget;
static final MethodHandle MH_voidCleanup;
static final MethodHandle MH_dummyTarget;
static final MethodType MT_hello = methodType(String.class, String.class);
static final MethodType MT_printHello = methodType(void.class, String.class);
static final MethodType MT_moreHello = methodType(String.class, String.class, String.class);
@ -169,6 +192,8 @@ public class TryFinallyTest {
MH_exclaimMore = LOOKUP.findStatic(TRY_FINALLY, "exclaimMore", MT_exclaimMore);
MH_voidTarget = LOOKUP.findStatic(TRY_FINALLY, "voidTarget", MT_voidTarget);
MH_voidCleanup = LOOKUP.findStatic(TRY_FINALLY, "voidCleanup", MT_voidCleanup);
MH_dummyTarget = MethodHandles.dropArguments(MH_voidTarget, 0, int.class, long.class, Object.class,
int.class, long.class, Object.class);
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}