author | jlahoda |
Mon, 29 Aug 2016 15:53:03 +0200 | |
changeset 40602 | 50045337b3a1 |
parent 37758 | 3ecf9b414e05 |
permissions | -rw-r--r-- |
36776
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
1 |
/* |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
4 |
* |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
8 |
* |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
13 |
* accompanied this code). |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
14 |
* |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
18 |
* |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
21 |
* questions. |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
22 |
*/ |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
23 |
|
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
24 |
/** |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
25 |
* @test |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
26 |
* @bug 8150733 |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
27 |
* @summary NPE when compiling module-info.java with a class declaration in a non-module mode |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
28 |
* @library /tools/lib |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
29 |
* @modules |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
30 |
* jdk.compiler/com.sun.tools.javac.api |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
31 |
* jdk.compiler/com.sun.tools.javac.main |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36776
diff
changeset
|
32 |
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase |
36776
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
33 |
* @run main NPECompilingModuleInfoTest |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
34 |
*/ |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
35 |
|
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
36 |
import java.nio.file.Path; |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
37 |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36776
diff
changeset
|
38 |
import toolbox.JavacTask; |
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36776
diff
changeset
|
39 |
import toolbox.Task; |
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36776
diff
changeset
|
40 |
import toolbox.ToolBox; |
36776
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
41 |
|
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
42 |
public class NPECompilingModuleInfoTest extends ModuleTestBase { |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
43 |
public static void main(String... args) throws Exception { |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
44 |
new NPECompilingModuleInfoTest().runTests(); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
45 |
} |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
46 |
|
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
47 |
@Test |
37758 | 48 |
public void testCompileNoError(Path base) throws Exception { |
36776
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
49 |
Path mod = base.resolve("mod"); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
50 |
tb.writeJavaFiles(mod, "module mod { exports pkg; }"); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
51 |
Path pkg = mod.resolve("pkg"); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
52 |
Path customClass = pkg.resolve("module-info.java"); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
53 |
tb.writeFile(customClass, "package pkg; class C {}"); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
54 |
Path classes = base.resolve("classes"); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
55 |
tb.createDirectories(classes); |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
56 |
|
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36776
diff
changeset
|
57 |
new JavacTask(tb) |
36776
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
58 |
.outdir(classes) |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
59 |
.files(findJavaFiles(mod)) |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
60 |
.run() |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
61 |
.writeAll() |
36778
e04318f39f92
8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents:
36776
diff
changeset
|
62 |
.getOutputLines(Task.OutputKind.DIRECT); |
36776
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
63 |
} |
5e260fa5208a
8150733: NPE when compiling module-info.java with a class declaration in a non-module mode
vromero
parents:
diff
changeset
|
64 |
} |