mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 15:24:43 +02:00
8187443: Forest Consolidation: Move files to unified layout
Reviewed-by: darcy, ihse
This commit is contained in:
Erik Joelsson
parent
270fe13182
commit
3789983e89
56923 changed files with 3 additions and 15727 deletions
264
test/langtools/tools/javac/modules/MOptionTest.java
Normal file
264
test/langtools/tools/javac/modules/MOptionTest.java
Normal file
|
|
@ -0,0 +1,264 @@
|
|||
/*
|
||||
* 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
|
||||
* 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 8146946 8176743
|
||||
* @summary implement javac -m option
|
||||
* @library /tools/lib
|
||||
* @modules
|
||||
* jdk.compiler/com.sun.tools.javac.api
|
||||
* jdk.compiler/com.sun.tools.javac.main
|
||||
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
|
||||
* @run main MOptionTest
|
||||
*/
|
||||
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.attribute.FileTime;
|
||||
|
||||
import toolbox.JavacTask;
|
||||
import toolbox.Task;
|
||||
import toolbox.ToolBox;
|
||||
|
||||
public class MOptionTest extends ModuleTestBase {
|
||||
public static void main(String... args) throws Exception {
|
||||
new MOptionTest().runTests();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOneModule(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
Path m1 = src.resolve("m1x");
|
||||
Path build = base.resolve("build");
|
||||
Files.createDirectories(build);
|
||||
|
||||
tb.writeJavaFiles(m1,
|
||||
"module m1x {}",
|
||||
"package test; public class Test {}");
|
||||
|
||||
new JavacTask(tb)
|
||||
.options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
|
||||
.run(Task.Expect.SUCCESS)
|
||||
.writeAll();
|
||||
|
||||
Path moduleInfoClass = build.resolve("m1x/module-info.class");
|
||||
Path testTestClass = build.resolve("m1x/test/Test.class");
|
||||
|
||||
FileTime moduleInfoTimeStamp = Files.getLastModifiedTime(moduleInfoClass);
|
||||
FileTime testTestTimeStamp = Files.getLastModifiedTime(testTestClass);
|
||||
|
||||
Path moduleInfo = m1.resolve("module-info.java");
|
||||
if (moduleInfoTimeStamp.compareTo(Files.getLastModifiedTime(moduleInfo)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
|
||||
Path testTest = m1.resolve("test/Test.java");
|
||||
if (testTestTimeStamp.compareTo(Files.getLastModifiedTime(testTest)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
|
||||
Thread.sleep(2000); //timestamps
|
||||
|
||||
new JavacTask(tb)
|
||||
.options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
|
||||
.run(Task.Expect.SUCCESS)
|
||||
.writeAll();
|
||||
|
||||
if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
if (!testTestTimeStamp.equals(Files.getLastModifiedTime(testTestClass))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
Thread.sleep(2000); //timestamps
|
||||
|
||||
Files.setLastModifiedTime(testTest, FileTime.fromMillis(System.currentTimeMillis()));
|
||||
|
||||
new JavacTask(tb)
|
||||
.options("-m", "m1x", "--module-source-path", src.toString(), "-d", build.toString())
|
||||
.run(Task.Expect.SUCCESS)
|
||||
.writeAll();
|
||||
|
||||
if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
if (Files.getLastModifiedTime(testTestClass).compareTo(Files.getLastModifiedTime(testTest)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNoOutputDir(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
Path m1 = src.resolve("m1x");
|
||||
Path build = base.resolve("build");
|
||||
Files.createDirectories(build);
|
||||
|
||||
tb.writeJavaFiles(m1,
|
||||
"module m1x {}",
|
||||
"package test; public class Test {}");
|
||||
|
||||
String log = new JavacTask(tb)
|
||||
.options("-XDrawDiagnostics",
|
||||
"-m", "m1x",
|
||||
"--module-source-path", src.toString())
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutput(Task.OutputKind.DIRECT);
|
||||
|
||||
if (!log.contains("- compiler.err.output.dir.must.be.specified.with.dash.m.option"))
|
||||
throw new Exception("expected output not found");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNoModuleSourcePath(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
Path m1 = src.resolve("m1x");
|
||||
Path build = base.resolve("build");
|
||||
Files.createDirectories(build);
|
||||
|
||||
tb.writeJavaFiles(m1,
|
||||
"module m1x {}",
|
||||
"package test; public class Test {}");
|
||||
|
||||
String log = new JavacTask(tb)
|
||||
.options("-XDrawDiagnostics",
|
||||
"-m", "m1x",
|
||||
"-d", build.toString())
|
||||
.run(Task.Expect.FAIL)
|
||||
.writeAll()
|
||||
.getOutput(Task.OutputKind.DIRECT);
|
||||
|
||||
if (!log.contains("- compiler.err.modulesourcepath.must.be.specified.with.dash.m.option"))
|
||||
throw new Exception("expected output not found");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMultiModule(Path base) throws Exception {
|
||||
Path src = base.resolve("src");
|
||||
Path m1 = src.resolve("m1x");
|
||||
Path m2 = src.resolve("m2x");
|
||||
Path build = base.resolve("build");
|
||||
Files.createDirectories(build);
|
||||
|
||||
tb.writeJavaFiles(m1,
|
||||
"module m1x {}",
|
||||
"package p1; public class C1 {}");
|
||||
|
||||
tb.writeJavaFiles(m2,
|
||||
"module m2x {}",
|
||||
"package p2; public class C2 {}");
|
||||
|
||||
new JavacTask(tb)
|
||||
.options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
|
||||
.run(Task.Expect.SUCCESS)
|
||||
.writeAll();
|
||||
|
||||
Path m1ModuleInfoClass = build.resolve("m1x/module-info.class");
|
||||
Path classC1 = build.resolve("m1x/p1/C1.class");
|
||||
|
||||
Path m2ModuleInfoClass = build.resolve("m2x/module-info.class");
|
||||
Path classC2 = build.resolve("m2x/p2/C2.class");
|
||||
|
||||
FileTime m1ModuleInfoTimeStamp = Files.getLastModifiedTime(m1ModuleInfoClass);
|
||||
FileTime C1TimeStamp = Files.getLastModifiedTime(classC1);
|
||||
|
||||
FileTime m2ModuleInfoTimeStamp = Files.getLastModifiedTime(m2ModuleInfoClass);
|
||||
FileTime C2TimeStamp = Files.getLastModifiedTime(classC2);
|
||||
|
||||
Path m1ModuleInfo = m1.resolve("module-info.java");
|
||||
Path m2ModuleInfo = m2.resolve("module-info.java");
|
||||
|
||||
if (m1ModuleInfoTimeStamp.compareTo(Files.getLastModifiedTime(m1ModuleInfo)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
|
||||
if (m2ModuleInfoTimeStamp.compareTo(Files.getLastModifiedTime(m2ModuleInfo)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
|
||||
Path C1Source = m1.resolve("p1/C1.java");
|
||||
Path C2Source = m2.resolve("p2/C2.java");
|
||||
|
||||
if (C1TimeStamp.compareTo(Files.getLastModifiedTime(C1Source)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
|
||||
if (C2TimeStamp.compareTo(Files.getLastModifiedTime(C2Source)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
|
||||
Thread.sleep(2000); //timestamps
|
||||
|
||||
new JavacTask(tb)
|
||||
.options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
|
||||
.run(Task.Expect.SUCCESS)
|
||||
.writeAll();
|
||||
|
||||
if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
if (!m2ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m2ModuleInfoClass))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
if (!C1TimeStamp.equals(Files.getLastModifiedTime(classC1))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
if (!C2TimeStamp.equals(Files.getLastModifiedTime(classC2))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
Thread.sleep(2000); //timestamps
|
||||
|
||||
Files.setLastModifiedTime(C1Source, FileTime.fromMillis(System.currentTimeMillis()));
|
||||
Files.setLastModifiedTime(C2Source, FileTime.fromMillis(System.currentTimeMillis()));
|
||||
|
||||
new JavacTask(tb)
|
||||
.options("-m", "m1x,m2x", "--module-source-path", src.toString(), "-d", build.toString())
|
||||
.run(Task.Expect.SUCCESS)
|
||||
.writeAll();
|
||||
|
||||
if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
if (!m2ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m2ModuleInfoClass))) {
|
||||
throw new AssertionError("Classfile update!");
|
||||
}
|
||||
|
||||
if (Files.getLastModifiedTime(classC1).compareTo(Files.getLastModifiedTime(C1Source)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
|
||||
if (Files.getLastModifiedTime(classC2).compareTo(Files.getLastModifiedTime(C2Source)) < 0) {
|
||||
throw new AssertionError("Classfiles too old!");
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue