test/runtime/modules/CCE_module_msg.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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) 2015, 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.
*** 21,56 ****
   * questions.
   */
  
  /**
   * @test
!  * @run main/othervm CCE_module_msg
   */
  
  // Test that the message in a runtime ClassCastException contains module info.
  public class CCE_module_msg {
  
!     public static void main(String[] args) {
!         invalidCastTest();
      }
  
!     public static void invalidCastTest() {
          java.lang.Object instance = new java.lang.Object();
          int left = 23;
          int right = 42;
          try {
              for (int i = 0; i < 1; i += 1) {
                  left = ((Derived) instance).method(left, right);
              }
              throw new RuntimeException("ClassCastException wasn't thrown, test failed.");
          } catch (ClassCastException cce) {
              System.out.println(cce.getMessage());
!             if (!cce.getMessage().contains("java.lang.Object (in module: java.base) cannot be cast")) {
                  throw new RuntimeException("Wrong message: " + cce.getMessage());
              }
          }
      }
  }
  
  class Derived extends java.lang.Object {
      public int method(int left, int right) {
          return right;
--- 21,109 ----
   * questions.
   */
  
  /**
   * @test
!  * @modules java.base/jdk.internal.misc
!  * @library /test/lib ..
!  * @compile p2/c2.java
!  * @compile p1/c1.java
!  * @build sun.hotspot.WhiteBox
!  * @compile/module=java.base java/lang/reflect/ModuleHelper.java
!  * @run main ClassFileInstaller sun.hotspot.WhiteBox
!  *                              sun.hotspot.WhiteBox$WhiteBoxPermission
!  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI CCE_module_msg
   */
  
+ import java.lang.reflect.Module;
+ import static jdk.test.lib.Asserts.*;
+ 
  // Test that the message in a runtime ClassCastException contains module info.
  public class CCE_module_msg {
  
!     public static void main(String[] args) throws Throwable {
!         // Should not display version
!         invalidObjectToDerived();
!         // Should display version
!         invalidClassToString();
      }
  
!     public static void invalidObjectToDerived() {
          java.lang.Object instance = new java.lang.Object();
          int left = 23;
          int right = 42;
          try {
              for (int i = 0; i < 1; i += 1) {
                  left = ((Derived) instance).method(left, right);
              }
              throw new RuntimeException("ClassCastException wasn't thrown, test failed.");
          } catch (ClassCastException cce) {
              System.out.println(cce.getMessage());
!             if (!cce.getMessage().contains("java.base/java.lang.Object cannot be cast to Derived")) {
                  throw new RuntimeException("Wrong message: " + cce.getMessage());
              }
          }
      }
+ 
+     public static void invalidClassToString() throws Throwable {
+         Object m1, m2;
+ 
+         // Get the java.lang.reflect.Module object for module java.base.
+         Class jlObject = Class.forName("java.lang.Object");
+         Object jlObject_jlrM = jlObject.getModule();
+         assertNotNull(jlObject_jlrM, "jlrModule object of java.lang.Object should not be null");
+ 
+         // Get the class loader for AccessCheckRead and assume it's also used to
+         // load classes p1.c1 and p2.c2.
+         ClassLoader this_cldr = AccessCheckRead.class.getClassLoader();
+ 
+         // Define a module for p1.
+         m1 = ModuleHelper.ModuleObject("module1", this_cldr, new String[] { "p1" });
+         assertNotNull(m1, "Module should not be null");
+         ModuleHelper.DefineModule(m1, "9.0", "m1/here", new String[] { "p1" });
+         ModuleHelper.AddReadsModule(m1, jlObject_jlrM);
+ 
+         // Define a module for p2.
+         m2 = ModuleHelper.ModuleObject("module2", this_cldr, new String[] { "p2" });
+         assertNotNull(m2, "Module should not be null");
+         ModuleHelper.DefineModule(m2, "9.0", "m2/there", new String[] { "p2" });
+         ModuleHelper.AddReadsModule(m2, jlObject_jlrM);
+ 
+         try {
+             ModuleHelper.AddModuleExportsToAll(m2, "p2");
+             Object p2Obj = new p2.c2();
+             System.out.println((String)p2Obj);
+         } catch (ClassCastException cce) {
+             String exception = cce.getMessage();
+             System.out.println(exception);
+             if (exception.contains("module2/p2.c2") ||
+                 !(exception.contains("module2@") &&
+                   exception.contains("/p2.c2 cannot be cast to java.base/java.lang.String"))) {
+                 throw new RuntimeException("Wrong message: " + exception);
+             }
+         }
+     }
  }
  
  class Derived extends java.lang.Object {
      public int method(int left, int right) {
          return right;