95bf19563b
Co-authored-by: Alex Buckley <alex.buckley@oracle.com> Co-authored-by: Maurizio Mimadamore <maurizio.mimadamore@oracle.com> Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Co-authored-by: Tobias Hartmann <tobias.hartmann@oracle.com> Co-authored-by: Vlaidmir Ivanov <vladimir.x.ivanov@oracle.com> Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com> Co-authored-by: Vladimir Kozlov <vladimir.kozlov@oracle.com> Co-authored-by: John Rose <john.r.rose@oracle.com> Co-authored-by: Daniel Smith <daniel.smith@oracle.com> Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com> Co-authored-by: Kumar Srinivasan <kumardotsrinivasan@gmail.com> Co-authored-by: Boris Ulasevich <boris.ulasevich@bell-sw.com> Reviewed-by: alanb, psandoz, mchung, coleenp, acorn, mcimadamore, forax, jlahoda, sspitsyn, abuckley
109 lines
3.7 KiB
Java
109 lines
3.7 KiB
Java
/*
|
|
* Copyright (c) 2016, 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 8081800 8010319
|
|
* @summary Redefine private and default interface methods
|
|
* @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 RedefineInterfaceMethods
|
|
*/
|
|
|
|
// package access top-level class to avoid problem with RedefineClassHelper
|
|
// and nested types.
|
|
|
|
interface RedefineInterfaceMethods_B {
|
|
int ORIGINAL_RETURN = 1;
|
|
int NEW_RETURN = 2;
|
|
private int privateMethod() {
|
|
return ORIGINAL_RETURN;
|
|
}
|
|
public default int defaultMethod() {
|
|
return privateMethod();
|
|
}
|
|
}
|
|
|
|
public class RedefineInterfaceMethods {
|
|
|
|
static final int RET = -2;
|
|
|
|
public static String redefinedPrivateMethod =
|
|
"interface RedefineInterfaceMethods_B {" +
|
|
" int ORIGINAL_RETURN = 1;" +
|
|
" int NEW_RETURN = 2;" +
|
|
" private int privateMethod() {" +
|
|
" return NEW_RETURN;" +
|
|
" }" +
|
|
" public default int defaultMethod() {" +
|
|
" return privateMethod();" +
|
|
" }" +
|
|
"}";
|
|
|
|
public static String redefinedDefaultMethod =
|
|
"interface RedefineInterfaceMethods_B {" +
|
|
" int ORIGINAL_RETURN = 1;" +
|
|
" int NEW_RETURN = 2;" +
|
|
" private int privateMethod() {" +
|
|
" return ORIGINAL_RETURN;" +
|
|
" }" +
|
|
" public default int defaultMethod() {" +
|
|
" return RedefineInterfaceMethods.RET;" +
|
|
" }" +
|
|
"}";
|
|
|
|
static class Impl implements RedefineInterfaceMethods_B {
|
|
}
|
|
|
|
|
|
public static void main(String[] args) throws Exception {
|
|
|
|
Impl impl = new Impl();
|
|
|
|
int res = impl.defaultMethod();
|
|
if (res != RedefineInterfaceMethods_B.ORIGINAL_RETURN)
|
|
throw new Error("defaultMethod returned " + res +
|
|
" expected " + RedefineInterfaceMethods_B.ORIGINAL_RETURN);
|
|
|
|
RedefineClassHelper.redefineClass(RedefineInterfaceMethods_B.class, redefinedPrivateMethod);
|
|
|
|
res = impl.defaultMethod();
|
|
if (res != RedefineInterfaceMethods_B.NEW_RETURN)
|
|
throw new Error("defaultMethod returned " + res +
|
|
" expected " + RedefineInterfaceMethods_B.NEW_RETURN);
|
|
|
|
System.gc();
|
|
|
|
RedefineClassHelper.redefineClass(RedefineInterfaceMethods_B.class, redefinedDefaultMethod);
|
|
|
|
res = impl.defaultMethod();
|
|
if (res != RET)
|
|
throw new Error("defaultMethod returned " + res +
|
|
" expected " + RET);
|
|
}
|
|
}
|