8236997: tools/javac tests fail with --illegal-access=deny

Correctly exporting packages to tests. Reviewed-by: jlahoda
2020-01-28 09:13:27 +01:00 · 2020-01-28 09:13:27 +01:00 · f2013ac247
commit f2013ac247
parent a89b838d91
28 changed files with 31 additions and 97 deletions
--- a/test/jdk/java/lang/reflect/Proxy/ProxyGeneratorCombo.java
+++ b/test/jdk/java/lang/reflect/Proxy/ProxyGeneratorCombo.java
@ -28,6 +28,7 @@
 * @modules jdk.compiler/com.sun.tools.javac.api
 *          jdk.compiler/com.sun.tools.javac.code
 *          jdk.compiler/com.sun.tools.javac.comp
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.main
 *          jdk.compiler/com.sun.tools.javac.tree
 *          jdk.compiler/com.sun.tools.javac.util
--- a/test/langtools/tools/javac/DefiniteAssignment/T8204610.java
+++ b/test/langtools/tools/javac/DefiniteAssignment/T8204610.java
@ -27,10 +27,7 @@
 * @summary Compiler confused by parenthesized "this" in final fields assignments
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper

--- a/test/langtools/tools/javac/T7093325.java
+++ b/test/langtools/tools/javac/T7093325.java
@ -29,10 +29,7 @@
 * @library /tools/javac/lib
 * @modules jdk.jdeps/com.sun.tools.classfile
 *          jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main T7093325
--- a/test/langtools/tools/javac/T8222949/TestConstantDynamic.java
+++ b/test/langtools/tools/javac/T8222949/TestConstantDynamic.java
@ -29,8 +29,7 @@
 * @modules jdk.jdeps/com.sun.tools.classfile
 *          jdk.compiler/com.sun.tools.javac.api
 *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.jvm
 *          jdk.compiler/com.sun.tools.javac.tree
 *          jdk.compiler/com.sun.tools.javac.util
--- a/test/langtools/tools/javac/cast/intersection/IntersectionTypeCastTest.java
+++ b/test/langtools/tools/javac/cast/intersection/IntersectionTypeCastTest.java
@ -28,10 +28,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper

--- a/test/langtools/tools/javac/classwriter/ExtraAttributes.java
+++ b/test/langtools/tools/javac/classwriter/ExtraAttributes.java
@ -86,7 +86,7 @@ public class ExtraAttributes implements Plugin {

        List<String> stdout = new toolbox.JavacTask(tb)
                .classpath(pluginJar)
-                .options("-Xplugin:ExtraAttributes")
+                .options("-XDaccessInternalAPI")
                .outdir(Files.createDirectories(Path.of("classes")))
                .files(tb.findJavaFiles(src))
                .run()
--- a/test/langtools/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java
+++ b/test/langtools/tools/javac/defaultMethods/static/hiding/InterfaceMethodHidingTest.java
@ -28,10 +28,7 @@
 *          Smoke test for static interface method hiding
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main InterfaceMethodHidingTest
--- a/test/langtools/tools/javac/defaultMethods/super/TestDefaultSuperCall.java
+++ b/test/langtools/tools/javac/defaultMethods/super/TestDefaultSuperCall.java
@ -28,10 +28,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main TestDefaultSuperCall
--- a/test/langtools/tools/javac/failover/CheckAttributedTree.java
+++ b/test/langtools/tools/javac/failover/CheckAttributedTree.java
@ -30,8 +30,7 @@
 * @modules java.desktop
 *          jdk.compiler/com.sun.tools.javac.api
 *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.tree
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
--- a/test/langtools/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java
+++ b/test/langtools/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java
@ -28,10 +28,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @compile -Xlint:all DiamondAndInnerClassTest.java
--- a/test/langtools/tools/javac/generics/inference/8176534/TestUncheckedCalls.java
+++ b/test/langtools/tools/javac/generics/inference/8176534/TestUncheckedCalls.java
@ -35,10 +35,7 @@ import java.util.stream.Stream;
 * @summary Missing check against target-type during applicability inference
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 *
--- a/test/langtools/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
+++ b/test/langtools/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java
@ -29,10 +29,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main GenericOverrideTest
--- a/test/langtools/tools/javac/lambda/FunctionalInterfaceConversionTest.java
+++ b/test/langtools/tools/javac/lambda/FunctionalInterfaceConversionTest.java
@ -29,10 +29,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main FunctionalInterfaceConversionTest
--- a/test/langtools/tools/javac/lambda/LambdaParserTest.java
+++ b/test/langtools/tools/javac/lambda/LambdaParserTest.java
@ -29,10 +29,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper

--- a/test/langtools/tools/javac/lambda/MethodReferenceParserTest.java
+++ b/test/langtools/tools/javac/lambda/MethodReferenceParserTest.java
@ -29,10 +29,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main MethodReferenceParserTest
--- a/test/langtools/tools/javac/lambda/TestInvokeDynamic.java
+++ b/test/langtools/tools/javac/lambda/TestInvokeDynamic.java
@ -31,8 +31,7 @@
 * @modules jdk.jdeps/com.sun.tools.classfile
 *          jdk.compiler/com.sun.tools.javac.api
 *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.jvm
 *          jdk.compiler/com.sun.tools.javac.tree
 *          jdk.compiler/com.sun.tools.javac.util
--- a/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java
+++ b/test/langtools/tools/javac/lambda/TestLambdaToMethodStats.java
@ -27,10 +27,7 @@
 * @summary Add stat support to LambdaToMethod
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main TestLambdaToMethodStats
--- a/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java
+++ b/test/langtools/tools/javac/lambda/bytecode/TestLambdaBytecode.java
@ -28,10 +28,7 @@
 * @library /tools/javac/lib
 * @modules jdk.jdeps/com.sun.tools.classfile
 *          jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main TestLambdaBytecode
--- a/test/langtools/tools/javac/lambda/deduplication/ClassFieldDeduplication.java
+++ b/test/langtools/tools/javac/lambda/deduplication/ClassFieldDeduplication.java
@ -28,6 +28,7 @@
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
 *          jdk.compiler/com.sun.tools.javac.code
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.tree
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
--- a/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
+++ b/test/langtools/tools/javac/lambda/mostSpecific/StructuralMostSpecificTest.java
@ -29,10 +29,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper

--- a/test/langtools/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java
+++ b/test/langtools/tools/javac/lambda/typeInference/combo/TypeInferenceComboTest.java
@ -30,10 +30,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @compile  TypeInferenceComboTest.java
--- a/test/langtools/tools/javac/lib/combo/ComboInstance.java
+++ b/test/langtools/tools/javac/lib/combo/ComboInstance.java
@ -23,10 +23,11 @@

 package combo;

-import java.lang.reflect.Method;
 import javax.tools.StandardJavaFileManager;
 import java.util.Optional;

+import com.sun.tools.javac.file.BaseFileManager;
+
 /**
 * This class is the common superclass of all combo test instances. It defines few helper methods
 * to build compilation tasks using the shared context object, as well as entry points for
@ -58,14 +59,7 @@ public abstract class ComboInstance<X extends ComboInstance<X>> {
            env.info().lastError = Optional.of(ex);
        } finally {
            this.env = null;
-            try {
-                Class<?> fmClass = env.fileManager().getClass();
-                Method clear = fmClass.getMethod("clear");
-                clear.setAccessible(true);
-                clear.invoke(env.fileManager());
-            } catch (Exception ex) {
-                throw new IllegalStateException(ex);
-            }
+            ((BaseFileManager) env.fileManager()).clear();
        }
    }

--- a/test/langtools/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java
+++ b/test/langtools/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java
@ -28,10 +28,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main DisjunctiveTypeWellFormednessTest
--- a/test/langtools/tools/javac/plugin/InternalAPI.java
+++ b/test/langtools/tools/javac/plugin/InternalAPI.java
@ -27,6 +27,7 @@
 *  @summary Extend support for -XDaccessInternalAPI to plugin modules
 *  @library /tools/lib
 *  @modules jdk.compiler/com.sun.tools.javac.api
+ *           jdk.compiler/com.sun.tools.javac.code
 *           jdk.compiler/com.sun.tools.javac.main
 *           jdk.jlink
 *  @build toolbox.ToolBox toolbox.JavacTask toolbox.JarTask
@ -127,10 +128,10 @@ public class InternalAPI extends TestRunner {
        runTests(m -> new Object[] { Path.of(m.getName()) });
    }

-    // -XDaccessInternalAPI has always been supported for classpath plugins
    @Test
    public void testClassPath(Path base) throws Exception {
        List<String> stdout = new JavacTask(tb)
+                .options("-XDaccessInternalAPI")
                .classpath(pluginJar)
                .outdir(Files.createDirectories(base.resolve("out")))
                .files(tb.findJavaFiles(Path.of("hw")))
--- a/test/langtools/tools/javac/resolve/BitWiseOperators.java
+++ b/test/langtools/tools/javac/resolve/BitWiseOperators.java
@ -27,10 +27,7 @@
 * @summary Verify that bitwise operators don't allow to mix numeric and boolean operands.
 * @library ../lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main BitWiseOperators
--- a/test/langtools/tools/javac/varargs/7042566/T7042566.java
+++ b/test/langtools/tools/javac/varargs/7042566/T7042566.java
@ -29,10 +29,7 @@
 * @library /tools/javac/lib
 * @modules jdk.jdeps/com.sun.tools.classfile
 *          jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main T7042566
--- a/test/langtools/tools/javac/varargs/warning/Warn4.java
+++ b/test/langtools/tools/javac/varargs/warning/Warn4.java
@ -28,10 +28,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main Warn4
--- a/test/langtools/tools/javac/varargs/warning/Warn5.java
+++ b/test/langtools/tools/javac/varargs/warning/Warn5.java
@ -28,10 +28,7 @@
 *  temporarily workaround combo tests are causing time out in several platforms
 * @library /tools/javac/lib
 * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.code
- *          jdk.compiler/com.sun.tools.javac.comp
- *          jdk.compiler/com.sun.tools.javac.main
- *          jdk.compiler/com.sun.tools.javac.tree
+ *          jdk.compiler/com.sun.tools.javac.file
 *          jdk.compiler/com.sun.tools.javac.util
 * @build combo.ComboTestHelper
 * @run main/othervm Warn5