8203225: Fix of redefining a method that removes 1 or more lambda expressions failed to commit test cases
Reviewed-by: zgu, lfoltan
diff --git a/test/hotspot/jtreg/runtime/RedefineTests/RedefineAddLambdaExpression.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineAddLambdaExpression.java
new file mode 100644
index 0000000..62d63fc
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/RedefineTests/RedefineAddLambdaExpression.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8193524
+ * @summary Redefine a class' public static method that contains a lambda expression
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @modules java.compiler
+ * java.instrument
+ * jdk.jartool/sun.tools.jar
+ * @run main RedefineClassHelper
+ * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineAddLambdaExpression
+ */
+
+interface MathOperation {
+ public int operation(int a, int b);
+}
+
+class B {
+ public static int operate(int a, int b, MathOperation mathOperation) {
+ return mathOperation.operation(a, b);
+ }
+ static int test_math(String p) {
+ MathOperation addition = (int a, int b) -> a + b;
+ return operate(10, 5, addition);
+ }
+}
+
+public class RedefineAddLambdaExpression {
+
+ public static String newB =
+ "class B {" +
+ " public static int operate(int a, int b, MathOperation mathOperation) {" +
+ " return mathOperation.operation(a, b);" +
+ " }" +
+ " static int test_math(String p) {" +
+ " MathOperation addition = (int a, int b) -> a + b;" +
+ " System.out.println(p + \" from class B's test_math method\");" +
+ " MathOperation subtraction = (int a, int b) -> a - b;" +
+ " return operate(10, 5, subtraction);" +
+ " }" +
+ "}";
+
+ public static void main(String[] args) throws Exception {
+ int res = B.test_math("Hello");
+ System.out.println("Result = " + res);
+ if (res != 15) {
+ throw new Error("test_math returned " + res + " expected " + 15);
+ }
+ RedefineClassHelper.redefineClass(B.class, newB);
+
+ res = B.test_math("Hello");
+ if (res != 5)
+ throw new Error("test_math returned " + res + " expected " + 5);
+ }
+}
diff --git a/test/hotspot/jtreg/runtime/RedefineTests/RedefineSubtractLambdaExpression.java b/test/hotspot/jtreg/runtime/RedefineTests/RedefineSubtractLambdaExpression.java
new file mode 100644
index 0000000..841a54c
--- /dev/null
+++ b/test/hotspot/jtreg/runtime/RedefineTests/RedefineSubtractLambdaExpression.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8193524
+ * @summary Redefine a class' public static method that contains a lambda expression
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ * @modules java.compiler
+ * java.instrument
+ * jdk.jartool/sun.tools.jar
+ * @run main RedefineClassHelper
+ * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class*=trace RedefineSubtractLambdaExpression
+ */
+
+interface MathOperation {
+ public int operation(int a, int b);
+}
+
+class B {
+ public static int operate(int a, int b, MathOperation mathOperation) {
+ return mathOperation.operation(a, b);
+ }
+ static int test_math(String p) {
+ System.out.println(p + " from class B's test_math method");
+ MathOperation subtraction = (int a, int b) -> a - b;
+ MathOperation addition = (int a, int b) -> a + b;
+ return operate(10, 5, addition);
+ }
+}
+
+public class RedefineSubtractLambdaExpression {
+
+ public static String newB =
+ "class B {" +
+ " public static int operate(int a, int b, MathOperation mathOperation) {" +
+ " return mathOperation.operation(a, b);" +
+ " }" +
+ " static int test_math(String p) {" +
+ " MathOperation subtraction = (int a, int b) -> a - b;" +
+ " return operate(10, 5, subtraction);" +
+ " }" +
+ "}";
+
+ public static void main(String[] args) throws Exception {
+ int res = B.test_math("Hello");
+ System.out.println("Result = " + res);
+ if (res != 15) {
+ throw new Error("test_math returned " + res + " expected " + 15);
+ }
+ RedefineClassHelper.redefineClass(B.class, newB);
+
+ res = B.test_math("Hello");
+ if (res != 5)
+ throw new Error("test_math returned " + res + " expected " + 5);
+ }
+}
