author | jjg |
Thu, 03 Nov 2016 13:59:15 -0700 | |
changeset 41938 | 8e66bf10fcec |
parent 40308 | 274367a99f98 |
child 42822 | a84956e7ee4d |
permissions | -rw-r--r-- |
36526 | 1 |
/* |
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
|
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
*/ |
|
23 |
||
24 |
/** |
|
25 |
* @test |
|
26 |
* @bug 8146946 |
|
27 |
* @summary implement javac -m option |
|
28 |
* @library /tools/lib |
|
29 |
* @modules |
|
30 |
* jdk.compiler/com.sun.tools.javac.api |
|
31 |
* jdk.compiler/com.sun.tools.javac.main |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
32 |
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase |
36526 | 33 |
* @run main MOptionTest |
34 |
*/ |
|
35 |
||
36 |
import java.nio.file.Files; |
|
37 |
import java.nio.file.Path; |
|
38 |
import java.nio.file.attribute.FileTime; |
|
39 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
40 |
import toolbox.JavacTask; |
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
41 |
import toolbox.Task; |
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
42 |
import toolbox.ToolBox; |
36526 | 43 |
|
44 |
public class MOptionTest extends ModuleTestBase { |
|
45 |
public static void main(String... args) throws Exception { |
|
46 |
new MOptionTest().runTests(); |
|
47 |
} |
|
48 |
||
49 |
@Test |
|
37758 | 50 |
public void testOneModule(Path base) throws Exception { |
36526 | 51 |
Path src = base.resolve("src"); |
52 |
Path m1 = src.resolve("m1"); |
|
53 |
Path build = base.resolve("build"); |
|
54 |
Files.createDirectories(build); |
|
55 |
||
56 |
tb.writeJavaFiles(m1, |
|
57 |
"module m1 {}", |
|
58 |
"package test; public class Test {}"); |
|
59 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
60 |
new JavacTask(tb) |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
37758
diff
changeset
|
61 |
.options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString()) |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
62 |
.run(Task.Expect.SUCCESS) |
36526 | 63 |
.writeAll(); |
64 |
||
65 |
Path moduleInfoClass = build.resolve("m1/module-info.class"); |
|
66 |
Path testTestClass = build.resolve("m1/test/Test.class"); |
|
67 |
||
68 |
FileTime moduleInfoTimeStamp = Files.getLastModifiedTime(moduleInfoClass); |
|
69 |
FileTime testTestTimeStamp = Files.getLastModifiedTime(testTestClass); |
|
70 |
||
71 |
Path moduleInfo = m1.resolve("module-info.java"); |
|
72 |
if (moduleInfoTimeStamp.compareTo(Files.getLastModifiedTime(moduleInfo)) < 0) { |
|
73 |
throw new AssertionError("Classfiles too old!"); |
|
74 |
} |
|
75 |
||
76 |
Path testTest = m1.resolve("test/Test.java"); |
|
77 |
if (testTestTimeStamp.compareTo(Files.getLastModifiedTime(testTest)) < 0) { |
|
78 |
throw new AssertionError("Classfiles too old!"); |
|
79 |
} |
|
80 |
||
81 |
Thread.sleep(2000); //timestamps |
|
82 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
83 |
new JavacTask(tb) |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
37758
diff
changeset
|
84 |
.options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString()) |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
85 |
.run(Task.Expect.SUCCESS) |
36526 | 86 |
.writeAll(); |
87 |
||
88 |
if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) { |
|
89 |
throw new AssertionError("Classfile update!"); |
|
90 |
} |
|
91 |
||
92 |
if (!testTestTimeStamp.equals(Files.getLastModifiedTime(testTestClass))) { |
|
93 |
throw new AssertionError("Classfile update!"); |
|
94 |
} |
|
95 |
||
96 |
Thread.sleep(2000); //timestamps |
|
97 |
||
98 |
Files.setLastModifiedTime(testTest, FileTime.fromMillis(System.currentTimeMillis())); |
|
99 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
100 |
new JavacTask(tb) |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
37758
diff
changeset
|
101 |
.options("-m", "m1", "--module-source-path", src.toString(), "-d", build.toString()) |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
102 |
.run(Task.Expect.SUCCESS) |
36526 | 103 |
.writeAll(); |
104 |
||
105 |
if (!moduleInfoTimeStamp.equals(Files.getLastModifiedTime(moduleInfoClass))) { |
|
106 |
throw new AssertionError("Classfile update!"); |
|
107 |
} |
|
108 |
||
109 |
if (Files.getLastModifiedTime(testTestClass).compareTo(Files.getLastModifiedTime(testTest)) < 0) { |
|
110 |
throw new AssertionError("Classfiles too old!"); |
|
111 |
} |
|
112 |
} |
|
113 |
||
114 |
@Test |
|
37758 | 115 |
public void testNoOutputDir(Path base) throws Exception { |
36526 | 116 |
Path src = base.resolve("src"); |
117 |
Path m1 = src.resolve("m1"); |
|
118 |
Path build = base.resolve("build"); |
|
119 |
Files.createDirectories(build); |
|
120 |
||
121 |
tb.writeJavaFiles(m1, |
|
122 |
"module m1 {}", |
|
123 |
"package test; public class Test {}"); |
|
124 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
125 |
String log = new JavacTask(tb) |
36526 | 126 |
.options("-XDrawDiagnostics", |
127 |
"-m", "m1", |
|
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
37758
diff
changeset
|
128 |
"--module-source-path", src.toString()) |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
129 |
.run(Task.Expect.FAIL) |
36526 | 130 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
131 |
.getOutput(Task.OutputKind.DIRECT); |
36526 | 132 |
|
133 |
if (!log.contains("- compiler.err.output.dir.must.be.specified.with.dash.m.option")) |
|
134 |
throw new Exception("expected output not found"); |
|
135 |
} |
|
136 |
||
137 |
@Test |
|
37758 | 138 |
public void testNoModuleSourcePath(Path base) throws Exception { |
36526 | 139 |
Path src = base.resolve("src"); |
140 |
Path m1 = src.resolve("m1"); |
|
141 |
Path build = base.resolve("build"); |
|
142 |
Files.createDirectories(build); |
|
143 |
||
144 |
tb.writeJavaFiles(m1, |
|
145 |
"module m1 {}", |
|
146 |
"package test; public class Test {}"); |
|
147 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
148 |
String log = new JavacTask(tb) |
36526 | 149 |
.options("-XDrawDiagnostics", |
150 |
"-m", "m1", |
|
151 |
"-d", build.toString()) |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
152 |
.run(Task.Expect.FAIL) |
36526 | 153 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
154 |
.getOutput(Task.OutputKind.DIRECT); |
36526 | 155 |
|
156 |
if (!log.contains("- compiler.err.modulesourcepath.must.be.specified.with.dash.m.option")) |
|
157 |
throw new Exception("expected output not found"); |
|
158 |
} |
|
159 |
||
160 |
@Test |
|
37758 | 161 |
public void testMultiModule(Path base) throws Exception { |
36526 | 162 |
Path src = base.resolve("src"); |
163 |
Path m1 = src.resolve("m1"); |
|
164 |
Path m2 = src.resolve("m2"); |
|
165 |
Path build = base.resolve("build"); |
|
166 |
Files.createDirectories(build); |
|
167 |
||
168 |
tb.writeJavaFiles(m1, |
|
169 |
"module m1 {}", |
|
170 |
"package p1; public class C1 {}"); |
|
171 |
||
172 |
tb.writeJavaFiles(m2, |
|
173 |
"module m2 {}", |
|
174 |
"package p2; public class C2 {}"); |
|
175 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
176 |
new JavacTask(tb) |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
37758
diff
changeset
|
177 |
.options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString()) |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
178 |
.run(Task.Expect.SUCCESS) |
36526 | 179 |
.writeAll(); |
180 |
||
181 |
Path m1ModuleInfoClass = build.resolve("m1/module-info.class"); |
|
182 |
Path classC1 = build.resolve("m1/p1/C1.class"); |
|
183 |
||
184 |
Path m2ModuleInfoClass = build.resolve("m2/module-info.class"); |
|
185 |
Path classC2 = build.resolve("m2/p2/C2.class"); |
|
186 |
||
187 |
FileTime m1ModuleInfoTimeStamp = Files.getLastModifiedTime(m1ModuleInfoClass); |
|
188 |
FileTime C1TimeStamp = Files.getLastModifiedTime(classC1); |
|
189 |
||
190 |
FileTime m2ModuleInfoTimeStamp = Files.getLastModifiedTime(m2ModuleInfoClass); |
|
191 |
FileTime C2TimeStamp = Files.getLastModifiedTime(classC2); |
|
192 |
||
193 |
Path m1ModuleInfo = m1.resolve("module-info.java"); |
|
194 |
Path m2ModuleInfo = m2.resolve("module-info.java"); |
|
195 |
||
196 |
if (m1ModuleInfoTimeStamp.compareTo(Files.getLastModifiedTime(m1ModuleInfo)) < 0) { |
|
197 |
throw new AssertionError("Classfiles too old!"); |
|
198 |
} |
|
199 |
||
200 |
if (m2ModuleInfoTimeStamp.compareTo(Files.getLastModifiedTime(m2ModuleInfo)) < 0) { |
|
201 |
throw new AssertionError("Classfiles too old!"); |
|
202 |
} |
|
203 |
||
204 |
Path C1Source = m1.resolve("p1/C1.java"); |
|
205 |
Path C2Source = m2.resolve("p2/C2.java"); |
|
206 |
||
207 |
if (C1TimeStamp.compareTo(Files.getLastModifiedTime(C1Source)) < 0) { |
|
208 |
throw new AssertionError("Classfiles too old!"); |
|
209 |
} |
|
210 |
||
211 |
if (C2TimeStamp.compareTo(Files.getLastModifiedTime(C2Source)) < 0) { |
|
212 |
throw new AssertionError("Classfiles too old!"); |
|
213 |
} |
|
214 |
||
215 |
Thread.sleep(2000); //timestamps |
|
216 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
217 |
new JavacTask(tb) |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
37758
diff
changeset
|
218 |
.options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString()) |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
219 |
.run(Task.Expect.SUCCESS) |
36526 | 220 |
.writeAll(); |
221 |
||
222 |
if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) { |
|
223 |
throw new AssertionError("Classfile update!"); |
|
224 |
} |
|
225 |
||
226 |
if (!m2ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m2ModuleInfoClass))) { |
|
227 |
throw new AssertionError("Classfile update!"); |
|
228 |
} |
|
229 |
||
230 |
if (!C1TimeStamp.equals(Files.getLastModifiedTime(classC1))) { |
|
231 |
throw new AssertionError("Classfile update!"); |
|
232 |
} |
|
233 |
||
234 |
if (!C2TimeStamp.equals(Files.getLastModifiedTime(classC2))) { |
|
235 |
throw new AssertionError("Classfile update!"); |
|
236 |
} |
|
237 |
||
238 |
Thread.sleep(2000); //timestamps |
|
239 |
||
240 |
Files.setLastModifiedTime(C1Source, FileTime.fromMillis(System.currentTimeMillis())); |
|
241 |
Files.setLastModifiedTime(C2Source, FileTime.fromMillis(System.currentTimeMillis())); |
|
242 |
||
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
243 |
new JavacTask(tb) |
40308
274367a99f98
8136930: Simplify use of module-system options by custom launchers
jjg
parents:
37758
diff
changeset
|
244 |
.options("-m", "m1,m2", "--module-source-path", src.toString(), "-d", build.toString()) |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36526
diff
changeset
|
245 |
.run(Task.Expect.SUCCESS) |
36526 | 246 |
.writeAll(); |
247 |
||
248 |
if (!m1ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m1ModuleInfoClass))) { |
|
249 |
throw new AssertionError("Classfile update!"); |
|
250 |
} |
|
251 |
||
252 |
if (!m2ModuleInfoTimeStamp.equals(Files.getLastModifiedTime(m2ModuleInfoClass))) { |
|
253 |
throw new AssertionError("Classfile update!"); |
|
254 |
} |
|
255 |
||
256 |
if (Files.getLastModifiedTime(classC1).compareTo(Files.getLastModifiedTime(C1Source)) < 0) { |
|
257 |
throw new AssertionError("Classfiles too old!"); |
|
258 |
} |
|
259 |
||
260 |
if (Files.getLastModifiedTime(classC2).compareTo(Files.getLastModifiedTime(C2Source)) < 0) { |
|
261 |
throw new AssertionError("Classfiles too old!"); |
|
262 |
} |
|
263 |
} |
|
264 |
} |