test/hotspot/jtreg/runtime/RedefineTests/RedefineInterfaceMethods.java

rev 50289 : [mq]: jep181-rev5

*** 1,7 ****
  /*
!  * Copyright (c) 2016, 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.
--- 1,7 ----
  /*
!  * 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.
*** 21,57 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 8081800
   * @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
   */
- public class RedefineInterfaceMethods {
  
!     static final int RET = -2;
  
!     static interface B {
!         int ORIGINAL_RETURN = 1;
!         int NEW_RETURN = 2;
!         private int privateMethod() {
!             return ORIGINAL_RETURN;
!         }
!         public default int defaultMethod() {
!             return privateMethod();
!         }
      }
  
      public static String redefinedPrivateMethod =
!         "interface RedefineInterfaceMethods$B {" +
          "    int ORIGINAL_RETURN = 1;" +
          "    int NEW_RETURN = 2;" +
          "    private int privateMethod() {" +
          "        return NEW_RETURN;" +
          "    }" +
--- 21,61 ----
   * 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;" +
          "    }" +
*** 59,102 ****
          "       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 B {
      }
  
  
      public static void main(String[] args) throws Exception {
  
          Impl impl = new Impl();
  
          int res = impl.defaultMethod();
!         if (res != B.ORIGINAL_RETURN)
              throw new Error("defaultMethod returned " + res +
!                             " expected " + B.ORIGINAL_RETURN);
  
!         RedefineClassHelper.redefineClass(B.class, redefinedPrivateMethod);
  
          res = impl.defaultMethod();
!         if (res != B.NEW_RETURN)
              throw new Error("defaultMethod returned " + res +
!                             " expected " + B.NEW_RETURN);
  
          System.gc();
  
!         RedefineClassHelper.redefineClass(B.class, redefinedDefaultMethod);
  
          res = impl.defaultMethod();
          if (res != RET)
              throw new Error("defaultMethod returned " + res +
                              " expected " + RET);
--- 63,106 ----
          "       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);