8155034: [TESTBUG] ctw tests fail to compile: module reads package sun.reflect from both jdk.unsupported and java.base
Summary: Replace sun.reflect with jdk.internal.reflect
Reviewed-by: iignatyev, ddmitriev
--- a/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java Thu Apr 28 09:10:10 2016 +0000
+++ b/hotspot/test/testlibrary/ctw/src/sun/hotspot/tools/ctw/Compiler.java Thu Apr 28 17:58:18 2016 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,7 +25,7 @@
import sun.hotspot.WhiteBox;
import jdk.internal.misc.SharedSecrets;
-import sun.reflect.ConstantPool;
+import jdk.internal.reflect.ConstantPool;
import java.lang.reflect.Executable;
--- a/hotspot/test/testlibrary_tests/ctw/ClassesDirTest.java Thu Apr 28 09:10:10 2016 +0000
+++ b/hotspot/test/testlibrary_tests/ctw/ClassesDirTest.java Thu Apr 28 17:58:18 2016 +0300
@@ -26,7 +26,7 @@
* @bug 8012447
* @library /testlibrary /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.misc
- * java.base/sun.reflect
+ * java.base/jdk.internal.reflect
* java.management
* @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
--- a/hotspot/test/testlibrary_tests/ctw/ClassesListTest.java Thu Apr 28 09:10:10 2016 +0000
+++ b/hotspot/test/testlibrary_tests/ctw/ClassesListTest.java Thu Apr 28 17:58:18 2016 +0300
@@ -26,7 +26,7 @@
* @bug 8012447
* @library /testlibrary /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.misc
- * java.base/sun.reflect
+ * java.base/jdk.internal.reflect
* java.management
* @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
--- a/hotspot/test/testlibrary_tests/ctw/JarDirTest.java Thu Apr 28 09:10:10 2016 +0000
+++ b/hotspot/test/testlibrary_tests/ctw/JarDirTest.java Thu Apr 28 17:58:18 2016 +0300
@@ -26,7 +26,7 @@
* @bug 8012447
* @library /testlibrary /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.misc
- * java.base/sun.reflect
+ * java.base/jdk.internal.reflect
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
--- a/hotspot/test/testlibrary_tests/ctw/JarsTest.java Thu Apr 28 09:10:10 2016 +0000
+++ b/hotspot/test/testlibrary_tests/ctw/JarsTest.java Thu Apr 28 17:58:18 2016 +0300
@@ -26,7 +26,7 @@
* @bug 8012447
* @library /testlibrary /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.misc
- * java.base/sun.reflect
+ * java.base/jdk.internal.reflect
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor