912 lines
36 KiB
Java
912 lines
36 KiB
Java
/*
|
|
* Copyright (c) 2016, 2017, 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.
|
|
*
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
* accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU General Public License version
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
* questions.
|
|
*/
|
|
|
|
/*
|
|
* @test
|
|
* @bug 8169197 8172668 8173117 8175007 8189765 8193302
|
|
* @summary Check convenient errors are produced for inaccessible classes.
|
|
* @library /tools/lib
|
|
* @modules jdk.compiler/com.sun.tools.javac.api
|
|
* jdk.compiler/com.sun.tools.javac.main
|
|
* jdk.compiler/com.sun.tools.javac.util
|
|
* @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask ModuleTestBase
|
|
* @run main ConvenientAccessErrorsTest
|
|
*/
|
|
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Path;
|
|
import java.util.Arrays;
|
|
import java.util.List;
|
|
|
|
import com.sun.tools.javac.util.Context;
|
|
import com.sun.tools.javac.util.Convert;
|
|
import com.sun.tools.javac.util.Name;
|
|
import com.sun.tools.javac.util.Names;
|
|
import toolbox.JarTask;
|
|
import toolbox.JavacTask;
|
|
import toolbox.Task;
|
|
|
|
public class ConvenientAccessErrorsTest extends ModuleTestBase {
|
|
|
|
public static void main(String... args) throws Exception {
|
|
new ConvenientAccessErrorsTest().runTests();
|
|
}
|
|
|
|
@Test
|
|
public void testNoDep(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { exports api; }",
|
|
"package api; public class Api { public void call() { } }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { }",
|
|
"package test; public class Test { api.Api api; }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read: m2x, api, m1x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testNoDepNested(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { exports api; }",
|
|
"package api; public class Api { public static class Nested {} }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { }",
|
|
"package test; public class Test { api.Api.Nested nested; }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read: m2x, api, m1x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testNotExported(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { exports api; }",
|
|
"package api; public class Api { }",
|
|
"package impl; public class Impl { }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }",
|
|
"package test; public class Test { impl.Impl api; }");
|
|
Path src_m3 = src.resolve("m3x");
|
|
tb.writeJavaFiles(src_m3,
|
|
"module m3x { requires m1x; }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:35: compiler.err.package.not.visible: impl, (compiler.misc.not.def.access.not.exported: impl, m1x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { exports api; exports impl to m3x;}");
|
|
|
|
log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
expected = Arrays.asList(
|
|
"Test.java:1:35: compiler.err.package.not.visible: impl, (compiler.misc.not.def.access.not.exported.to.module: impl, m1x, m2x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testInaccessibleInExported(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { exports api; }",
|
|
"package api; class Api { }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }",
|
|
"package test; public class Test { api.Api api; }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:38: compiler.err.not.def.public.cant.access: api.Api, api",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testInaccessibleUnnamedModule(Path base) throws Exception {
|
|
Path jar = prepareTestJar(base, "package api; class Api { public static class Foo {} }");
|
|
|
|
Path moduleSrc = base.resolve("module-src");
|
|
Path m1x = moduleSrc.resolve("m1x");
|
|
|
|
Path classes = base.resolve("classes");
|
|
|
|
Files.createDirectories(classes);
|
|
|
|
tb.writeJavaFiles(m1x,
|
|
"module m1x { }",
|
|
"package test; public class Test { api.Api api; api.Api.Foo api; }");
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-classpath", jar.toString(),
|
|
"-XDrawDiagnostics")
|
|
.outdir(classes)
|
|
.files(findJavaFiles(moduleSrc))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:35: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
|
|
"Test.java:1:48: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
|
|
"2 errors");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testIndirectReferenceToUnnamedModule(Path base) throws Exception {
|
|
Path jar = prepareTestJar(base, "package api; public class Api { public void test() {} }");
|
|
|
|
Path moduleSrc = base.resolve("module-src");
|
|
Path m1x = moduleSrc.resolve("m1x");
|
|
Path auxiliary = moduleSrc.resolve("auxiliary");
|
|
|
|
Path classes = base.resolve("classes");
|
|
|
|
Files.createDirectories(classes);
|
|
|
|
tb.writeJavaFiles(m1x,
|
|
"module m1x { requires auxiliary; }",
|
|
"package test; public class Test { { auxiliary.Auxiliary.get().test(); } }");
|
|
|
|
tb.writeJavaFiles(auxiliary,
|
|
"module auxiliary { exports auxiliary; }",
|
|
"package auxiliary; public class Auxiliary { public static api.Api get() { return null; } }");
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-classpath", jar.toString(),
|
|
"-XDrawDiagnostics",
|
|
"--add-reads", "auxiliary=ALL-UNNAMED",
|
|
"--module-source-path", moduleSrc.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(moduleSrc))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:62: compiler.err.not.def.access.class.intf.cant.access.reason: test(), api.Api, api, (compiler.misc.not.def.access.does.not.read.unnamed: api, m1x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
private Path prepareTestJar(Path base, String code) throws Exception {
|
|
Path legacySrc = base.resolve("legacy-src");
|
|
tb.writeJavaFiles(legacySrc, code);
|
|
Path legacyClasses = base.resolve("legacy-classes");
|
|
Files.createDirectories(legacyClasses);
|
|
|
|
String log = new JavacTask(tb)
|
|
.options()
|
|
.outdir(legacyClasses)
|
|
.files(findJavaFiles(legacySrc))
|
|
.run()
|
|
.writeAll()
|
|
.getOutput(Task.OutputKind.DIRECT);
|
|
|
|
if (!log.isEmpty()) {
|
|
throw new Exception("unexpected output: " + log);
|
|
}
|
|
|
|
Path lib = base.resolve("lib");
|
|
|
|
Files.createDirectories(lib);
|
|
|
|
Path jar = lib.resolve("test-api-1.0.jar");
|
|
|
|
new JarTask(tb, jar)
|
|
.baseDir(legacyClasses)
|
|
.files("api/Api.class")
|
|
.run();
|
|
|
|
return jar;
|
|
}
|
|
|
|
@Test
|
|
public void testUnnamedModuleAccess(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { exports api to m2x; }",
|
|
"package api; class Api { }",
|
|
"package impl; class Impl { }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }");
|
|
Path modulepath = base.resolve("modulepath");
|
|
tb.createDirectories(modulepath);
|
|
|
|
new JavacTask(tb)
|
|
.options("--module-source-path", src.toString())
|
|
.outdir(modulepath)
|
|
.files(findJavaFiles(src))
|
|
.run()
|
|
.writeAll();
|
|
|
|
Path unnamedSrc = base.resolve("unnamedSrc");
|
|
tb.writeJavaFiles(unnamedSrc,
|
|
"public class Test { api.Api api; impl.Impl impl; }");
|
|
Path unnamedClasses = base.resolve("unnamed-classes");
|
|
Files.createDirectories(unnamedClasses);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("--module-path", modulepath.toString(),
|
|
"-XDrawDiagnostics")
|
|
.outdir(unnamedClasses)
|
|
.files(findJavaFiles(unnamedSrc))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:21: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read.from.unnamed: api, m1x)",
|
|
"Test.java:1:34: compiler.err.package.not.visible: impl, (compiler.misc.not.def.access.does.not.read.from.unnamed: impl, m1x)",
|
|
"2 errors"
|
|
);
|
|
|
|
if (!expected.equals(log)) {
|
|
throw new Exception("unexpected output: " + log);
|
|
}
|
|
|
|
log = new JavacTask(tb)
|
|
.options("--module-path", modulepath.toString(),
|
|
"--add-modules", "m1x",
|
|
"-XDrawDiagnostics")
|
|
.outdir(unnamedClasses)
|
|
.files(findJavaFiles(unnamedSrc))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
expected = Arrays.asList(
|
|
"Test.java:1:21: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.not.exported.to.module.from.unnamed: api, m1x)",
|
|
"Test.java:1:34: compiler.err.package.not.visible: impl, (compiler.misc.not.def.access.not.exported.from.unnamed: impl, m1x)",
|
|
"2 errors"
|
|
);
|
|
|
|
if (!expected.equals(log)) {
|
|
throw new Exception("unexpected output: " + log);
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void testInImport(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { }",
|
|
"package api; public class Api { public String test() { return null; } }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }",
|
|
"package test; import api.Api; public class Test { Api api; { api.test().length(); } }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:22: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.not.exported: api, m1x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testInImportOnDemand(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { }",
|
|
"package api; public class Api { public String test() { return null; } }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }",
|
|
"package test; import api.*; public class Test { Api api; { api.test().length(); } }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:22: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.not.exported: api, m1x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testInModuleImport(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { }",
|
|
"package api; public class Api { public String test() { return null; } }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }",
|
|
"package test; import module m1x; public class Test { Api api; { api.test().length(); } }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--enable-preview", "--source", System.getProperty("java.specification.version"),
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:54: compiler.err.cant.resolve.location: kindname.class, Api, , , (compiler.misc.location: kindname.class, test.Test, null)",
|
|
"- compiler.note.preview.filename: Test.java, DEFAULT",
|
|
"- compiler.note.preview.recompile",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testUnusedImportOnDemand2(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { }",
|
|
"package api; public class Api { }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }",
|
|
"package test; import api.*; public class Test { }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:22: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.not.exported: api, m1x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testClassPackageConflict(Path base) throws Exception {
|
|
Path libSrc = base.resolve("libSrc");
|
|
tb.writeJavaFiles(libSrc,
|
|
"package test.desktop; public class Any { }");
|
|
Path libClasses = base.resolve("libClasses");
|
|
tb.createDirectories(libClasses);
|
|
|
|
new JavacTask(tb)
|
|
.outdir(libClasses)
|
|
.files(findJavaFiles(libSrc))
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
Path src = base.resolve("src");
|
|
tb.writeJavaFiles(src,
|
|
"package test; public class desktop { public static class Action { } }",
|
|
"package use; import test.desktop.*; public class Use { test.desktop.Action a; }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
new JavacTask(tb)
|
|
.options("-XDrawDiagnostics")
|
|
.classpath(libClasses)
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run()
|
|
.writeAll();
|
|
}
|
|
|
|
@Test
|
|
public void testClassPackageConflictInUnnamed(Path base) throws Exception {
|
|
Path libSrc = base.resolve("libSrc");
|
|
tb.writeJavaFiles(libSrc,
|
|
"package desktop; public class Any { }");
|
|
Path libClasses = base.resolve("libClasses");
|
|
tb.createDirectories(libClasses);
|
|
|
|
new JavacTask(tb)
|
|
.outdir(libClasses)
|
|
.files(findJavaFiles(libSrc))
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
Path src = base.resolve("src");
|
|
tb.writeJavaFiles(src,
|
|
"public class desktop { public static class Action { } }",
|
|
"import desktop.*; public class Use { desktop.Action a; }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
new JavacTask(tb)
|
|
.options("-XDrawDiagnostics")
|
|
.classpath(libClasses)
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run()
|
|
.writeAll();
|
|
}
|
|
|
|
@Test
|
|
public void testUnresolvableInImport(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { }",
|
|
"package api; import can.not.resolve; public class Api { }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Api.java:1:28: compiler.err.doesnt.exist: can.not",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testMissingKnownClass(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"module m1x { exports api; }",
|
|
"package api; public class Base { }",
|
|
"package api; public class Sub extends Base { }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
Path m1xClasses = classes.resolve("m1x");
|
|
tb.createDirectories(m1xClasses);
|
|
|
|
new JavacTask(tb)
|
|
.options("-XDrawDiagnostics")
|
|
.outdir(m1xClasses)
|
|
.files(findJavaFiles(src_m1))
|
|
.run(Task.Expect.SUCCESS)
|
|
.writeAll();
|
|
|
|
Files.delete(m1xClasses.resolve("api").resolve("Base.class"));
|
|
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires m1x; }",
|
|
"""
|
|
package test;
|
|
import api.Sub;
|
|
import api.Base;
|
|
public class Test {
|
|
Sub a2;
|
|
Base a;
|
|
}
|
|
""");
|
|
Path m2xClasses = classes.resolve("m2x");
|
|
tb.createDirectories(m2xClasses);
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-path", classes.toString(),
|
|
"-XDdev")
|
|
.outdir(m2xClasses)
|
|
.files(findJavaFiles(src_m2))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:3:11: compiler.err.cant.resolve.location: kindname.class, Base, , , (compiler.misc.location: kindname.package, api, null)",
|
|
"Test.java:6:5: compiler.err.cant.resolve.location: kindname.class, Base, , , (compiler.misc.location: kindname.class, test.Test, null)",
|
|
"2 errors");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testInaccessibleInSourceModuleViaBinaryModule(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_m1 = src.resolve("m1x");
|
|
tb.writeJavaFiles(src_m1,
|
|
"@Deprecated module m1x { }");
|
|
Path src_m2 = src.resolve("m2x");
|
|
tb.writeJavaFiles(src_m2,
|
|
"module m2x { requires transitive m1x; }");
|
|
Path src_m3 = src.resolve("m3x");
|
|
tb.writeJavaFiles(src_m3,
|
|
"module m3x { requires transitive m2x; exports api; }",
|
|
"package api; class Api { }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run()
|
|
.writeAll();
|
|
|
|
tb.cleanDirectory(classes.resolve("m2x")); //force completion from source if needed
|
|
Files.delete(classes.resolve("m2x"));
|
|
|
|
tb.cleanDirectory(src_m3); //binary only module
|
|
Files.delete(src_m3);
|
|
|
|
//m4x does not depend on m1x/m2x/m3x, so cannot access api.Api
|
|
//but the recovery search should not complete m2x, as that would cause a deprecation warning:
|
|
Path src_m4 = src.resolve("m4x");
|
|
tb.writeJavaFiles(src_m4,
|
|
"module m4x { }",
|
|
"package m4x; public class Test extends api.Api { }");
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-source-path", src.toString(),
|
|
"--module-path", classes.toString(),
|
|
"-Xlint:deprecation")
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src_m4))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:40: compiler.err.package.not.visible: api, (compiler.misc.not.def.access.does.not.read: m4x, api, m3x)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testConvertNameCandidates(Path base) throws Exception {
|
|
Context ctx = new Context();
|
|
Names names = Names.instance(ctx);
|
|
Name name = names.fromString("com.sun.tools.javac.Attr.BreakAttr");
|
|
|
|
com.sun.tools.javac.util.List<String> actual =
|
|
Convert.classCandidates(name).map(n -> n.toString());
|
|
List<String> expected = Arrays.asList(
|
|
"com.sun$tools$javac$Attr$BreakAttr",
|
|
"com.sun.tools$javac$Attr$BreakAttr",
|
|
"com.sun.tools.javac$Attr$BreakAttr",
|
|
"com.sun.tools.javac.Attr$BreakAttr",
|
|
"com.sun.tools.javac.Attr.BreakAttr"
|
|
);
|
|
|
|
if (!expected.equals(actual)) {
|
|
throw new Exception("Expected names not generated: " + actual);
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void testInaccessibleInVisible(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_ma = src.resolve("ma");
|
|
tb.writeJavaFiles(src_ma,
|
|
"module ma { exports ma; }",
|
|
"package ma; class NotApi { public static class Inner { } }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
new JavacTask(tb)
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src_ma))
|
|
.run()
|
|
.writeAll();
|
|
|
|
Path src_mb = src.resolve("mb");
|
|
tb.writeJavaFiles(src_mb,
|
|
"module mb { requires ma; }",
|
|
"package mb.a; public class Test { ma.NotApi.Inner i1; mb.b.NotApi.Inner i2; }",
|
|
"package mb.b; class NotApi { public static class Inner { } }");
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-path", classes.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src_mb))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:44: compiler.err.not.def.access.class.intf.cant.access: ma.NotApi.Inner, ma.NotApi",
|
|
"Test.java:1:66: compiler.err.not.def.access.class.intf.cant.access: mb.b.NotApi.Inner, mb.b.NotApi",
|
|
"2 errors");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testPackagesUniquelyVisibleInImportOnDemand(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_ma = src.resolve("ma");
|
|
tb.writeJavaFiles(src_ma,
|
|
"module ma { exports ma; }",
|
|
"package ma; public class Api { }");
|
|
Path src_mb = src.resolve("mb");
|
|
tb.writeJavaFiles(src_mb,
|
|
"module mb { exports ma.mb; }",
|
|
"package ma.mb; public class Api { }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
new JavacTask(tb)
|
|
.options("--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run()
|
|
.writeAll();
|
|
|
|
Path test = src.resolve("test");
|
|
tb.writeJavaFiles(test,
|
|
"module test { requires mb; }",
|
|
"package test; import ma.*; public class Test { }");
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-path", classes.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(test))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:22: compiler.err.package.not.visible: ma, (compiler.misc.not.def.access.does.not.read: test, ma, ma)",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testPackagesUniquelyVisibleInImportOnDemandNoPrefixes(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path src_mb = src.resolve("mb");
|
|
tb.writeJavaFiles(src_mb,
|
|
"module mb { exports ma.mb; }",
|
|
"package ma.mb; public class Api { }");
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
new JavacTask(tb)
|
|
.options("--module-source-path", src.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(src))
|
|
.run()
|
|
.writeAll();
|
|
|
|
Path test = src.resolve("test");
|
|
tb.writeJavaFiles(test,
|
|
"module test { requires mb; }",
|
|
"package test; import ma.mb.*; import ma.*; public class Test { }");
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics",
|
|
"--module-path", classes.toString())
|
|
.outdir(classes)
|
|
.files(findJavaFiles(test))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:38: compiler.err.doesnt.exist: ma",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
}
|
|
|
|
@Test
|
|
public void testPackagesUniquelyVisibleInImportOnDemandThisModule(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path test = src.resolve("test");
|
|
tb.writeJavaFiles(test,
|
|
"module test { }",
|
|
"package ma.mb; public class Impl { }",
|
|
"package test; import ma.*; public class Test { }");
|
|
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics")
|
|
.outdir(classes)
|
|
.files(findJavaFiles(test))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:22: compiler.err.doesnt.exist: ma",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
|
|
new JavacTask(tb)
|
|
.options("-source", "8")
|
|
.outdir(classes)
|
|
.files(findJavaFiles(test.resolve("ma"), test.resolve("test")))
|
|
.run(Task.Expect.SUCCESS)
|
|
.writeAll();
|
|
}
|
|
|
|
@Test
|
|
public void testPackagesUniquelyVisibleInImportOnDemandThisModuleUnnamed(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path test = src.resolve("test");
|
|
tb.writeJavaFiles(test,
|
|
"package ma.mb; public class Impl { }",
|
|
"package test; import ma.*; public class Test { }");
|
|
|
|
Path classes = base.resolve("classes");
|
|
tb.createDirectories(classes);
|
|
|
|
List<String> log = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics")
|
|
.outdir(classes)
|
|
.files(findJavaFiles(test))
|
|
.run(Task.Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
List<String> expected = Arrays.asList(
|
|
"Test.java:1:22: compiler.err.doesnt.exist: ma",
|
|
"1 error");
|
|
|
|
if (!expected.equals(log))
|
|
throw new Exception("expected output not found; actual: " + log);
|
|
|
|
new JavacTask(tb)
|
|
.options("-source", "8")
|
|
.outdir(classes)
|
|
.files(findJavaFiles(test))
|
|
.run(Task.Expect.SUCCESS)
|
|
.writeAll();
|
|
}
|
|
}
|