--- a/hotspot/test/runtime/modules/CCE_module_msg.java Thu Nov 17 15:54:48 2016 +0300
+++ b/hotspot/test/runtime/modules/CCE_module_msg.java Thu Nov 17 16:28:45 2016 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -23,17 +23,39 @@
/**
* @test
- * @run main/othervm CCE_module_msg
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib ..
+ * @compile p2/c2.java
+ * @compile p4/c4.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.io.*;
+import java.lang.reflect.Module;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import static jdk.test.lib.Asserts.*;
+
// Test that the message in a runtime ClassCastException contains module info.
public class CCE_module_msg {
+ private static final Path CLASSES_DIR = Paths.get("classes");
- public static void main(String[] args) {
- invalidCastTest();
+ public static void main(String[] args) throws Throwable {
+ // Should not display version
+ invalidObjectToDerived();
+ // Should display version
+ invalidClassToString();
+ // Should display customer class loader
+ invalidClassToStringCustomLoader();
}
- public static void invalidCastTest() {
+ public static void invalidObjectToDerived() {
java.lang.Object instance = new java.lang.Object();
int left = 23;
int right = 42;
@@ -44,11 +66,69 @@
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")) {
+ 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 {
+ // 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 CCE_module_msg and assume it's also used to
+ // load classes p1.c1 and p2.c2.
+ ClassLoader this_cldr = CCE_module_msg.class.getClassLoader();
+
+ // Define a module for p2.
+ Object 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);
+ throw new RuntimeException("ClassCastException wasn't thrown, test failed.");
+ } 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);
+ }
+ }
+ }
+
+ public static void invalidClassToStringCustomLoader() throws Throwable {
+ // 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");
+
+ // Create a customer class loader to load class p4/c4.
+ URL[] urls = new URL[] { CLASSES_DIR.toUri().toURL() };
+ ClassLoader parent = ClassLoader.getSystemClassLoader();
+ MyURLClassLoader myCldr = new MyURLClassLoader("MyClassLoader", urls, parent);
+
+ try {
+ // Class p4.c4 should be defined to the unnamed module of myCldr
+ Class p4_c4_class = myCldr.loadClass("p4.c4");
+ Object c4Obj = p4_c4_class.newInstance();
+ System.out.println((String)c4Obj);
+ throw new RuntimeException("ClassCastException wasn't thrown, test failed.");
+ } catch (ClassCastException cce) {
+ String exception = cce.getMessage();
+ System.out.println(exception);
+ if (!exception.contains("MyClassLoader//p4.c4 cannot be cast to java.base/java.lang.String")) {
+ throw new RuntimeException("Wrong message: " + exception);
+ }
+ }
+ }
}
class Derived extends java.lang.Object {
@@ -56,3 +136,35 @@
return right;
}
}
+
+class MyURLClassLoader extends URLClassLoader {
+ public MyURLClassLoader(String name,
+ URL[] urls,
+ ClassLoader parent) {
+ super(name, urls, parent);
+ }
+
+ public Class loadClass(String name) throws ClassNotFoundException {
+ if (!name.equals("p4.c4")) {
+ return super.loadClass(name);
+ }
+ byte[] data = getClassData(name);
+ return defineClass(name, data, 0, data.length);
+ }
+
+ byte[] getClassData(String name) {
+ try {
+ String TempName = name.replaceAll("\\.", "/");
+ String currentDir = System.getProperty("test.classes");
+ String filename = currentDir + File.separator + TempName + ".class";
+ FileInputStream fis = new FileInputStream(filename);
+ byte[] b = new byte[5000];
+ int cnt = fis.read(b, 0, 5000);
+ byte[] c = new byte[cnt];
+ for (int i=0; i<cnt; i++) c[i] = b[i];
+ return c;
+ } catch (IOException e) {
+ return null;
+ }
+ }
+}