archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8169069: Module system implementation refresh (11/2016)

Browse source 
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Bhavesh Patel <bhavesh.x.patel@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Reviewed-by: mcimadamore, jjg, mchung, anazarov
This commit is contained in:
Alan Bateman 2016-12-01 09:02:42 +00:00
parent 51f50b64e5
commit 22e233b2e9
214 changed files with 5453 additions and 1175 deletions
Download patch file Download diff file Expand all files Collapse all files

93
langtools/test/tools/javac/modules/ProvidesTest.java
View file

@ -41,7 +41,6 @@ import java.util.List;
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.Task.Expect;
import toolbox.ToolBox;
public class ProvidesTest extends ModuleTestBase {
public static void main(String... args) throws Exception {
@ -426,4 +425,96 @@ public class ProvidesTest extends ModuleTestBase {
.run(Expect.SUCCESS)
.writeAll();
}
@Test
public void testFactory(Path base) throws Exception {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"module m { exports p1; provides p1.C1 with p2.C2; }",
"package p1; public interface C1 { }",
"package p2; public class C2 { public static p1.C1 provider() { return null; } }");
new JavacTask(tb)
.options("-XDrawDiagnostics")
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(src))
.run()
.writeAll()
.getOutput(Task.OutputKind.DIRECT);
List<String> output;
List<String> expected;
tb.writeJavaFiles(src,
"package p2; public class C2 { public p1.C1 provider() { return null; } }");
output = new JavacTask(tb)
.options("-XDrawDiagnostics")
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.must.be.subtype.of.service.interface",
"1 error");
if (!expected.equals(output)) {
throw new Exception("Expected output not found. Output: " + output);
}
tb.writeJavaFiles(src,
"package p2; public class C2 { static p1.C1 provider() { return null; } }");
output = new JavacTask(tb)
.options("-XDrawDiagnostics")
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.must.be.subtype.of.service.interface",
"1 error");
if (!expected.equals(output)) {
throw new Exception("Expected output not found. Output: " + output);
}
tb.writeJavaFiles(src,
"package p2; public class C2 { public static Object provider() { return null; } }");
output = new JavacTask(tb)
.options("-XDrawDiagnostics")
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface",
"1 error");
if (!expected.equals(output)) {
throw new Exception("Expected output not found. Output: " + output);
}
tb.writeJavaFiles(src,
"package p2; public class C2 { public static p1.C1 provider = new p1.C1() {}; }");
output = new JavacTask(tb)
.options("-XDrawDiagnostics")
.outdir(Files.createDirectories(base.resolve("classes")))
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.must.be.subtype.of.service.interface",
"1 error");
if (!expected.equals(output)) {
throw new Exception("Expected output not found. Output: " + output);
}
}
}