test/langtools/tools/javac/modules/AddExportsTest.java
author jlahoda
Mon, 16 Jul 2018 16:31:33 +0200
changeset 51123 d7c4c42ab260
parent 49822 53aae0c219e6
permissions -rw-r--r--
8207032: Compilation succeeds without checking readability when --add-exports used Summary: Ensuring --add-exports are only propagated when the target module reads the exporting module. Reviewed-by: vromero, jjg
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     1
/*
49822
53aae0c219e6 8196433: use the new error diagnostic approach at javac.Main
vromero
parents: 47216
diff changeset
     2
 * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     4
 *
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     7
 * published by the Free Software Foundation.
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     8
 *
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    13
 * accompanied this code).
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    14
 *
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    18
 *
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    21
 * questions.
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    22
 */
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    23
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    24
/*
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    25
 * @test
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
    26
 * @bug 8207032
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    27
 * @summary Test the --add-exports option
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    28
 * @library /tools/lib
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    29
 * @modules jdk.compiler/com.sun.tools.javac.api
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    30
 *          jdk.compiler/com.sun.tools.javac.main
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    31
 * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    32
 * @run main AddExportsTest
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    33
 */
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    34
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    35
import java.nio.file.Path;
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    36
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    37
import toolbox.JavacTask;
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    38
import toolbox.Task;
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
    39
import toolbox.Task.Expect;
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
    40
import toolbox.Task.OutputKind;
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    41
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    42
public class AddExportsTest extends ModuleTestBase {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    43
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    44
    public static void main(String... args) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    45
        new AddExportsTest().runTests();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    46
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    47
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    48
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    49
    public void testEmpty(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    50
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    51
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    52
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    53
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    54
        testEmpty(src, classes, "--add-exports", "");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    55
        testEmpty(src, classes, "--add-exports=");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    56
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    57
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    58
    private void testEmpty(Path src, Path classes, String... options) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    59
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    60
                .options(options)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    61
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    62
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    63
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    64
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    65
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    66
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    67
        checkOutputContains(log,
49822
53aae0c219e6 8196433: use the new error diagnostic approach at javac.Main
vromero
parents: 47216
diff changeset
    68
            "error: no value for --add-exports option");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    69
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    70
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    71
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    72
    public void testEmptyItem(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    73
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
    74
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    75
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
    76
                          "module m1x { }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    77
                          "package p1; public class C1 { }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
    78
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    79
        tb.writeJavaFiles(src_m2,
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
    80
                          "module m2x { requires m1x; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    81
                          "package p2; class C2 { p1.C1 c1; }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
    82
        Path src_m3 = src.resolve("m3x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    83
        tb.writeJavaFiles(src_m3,
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
    84
                          "module m3x { requires m1x; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    85
                          "package p3; class C3 { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    86
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    87
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    88
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
    89
        testEmptyItem(src, classes, "m1x/p1=,m2x,m3x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
    90
        testEmptyItem(src, classes, "m1x/p1=m2x,,m3x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
    91
        testEmptyItem(src, classes, "m1x/p1=m2x,m3x,");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    92
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    93
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    94
    void testEmptyItem(Path src, Path classes, String option) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    95
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    96
                .options("--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    97
                         "--add-exports", option)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    98
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    99
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   100
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   101
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   102
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   103
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   104
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   105
    public void testEmptyList(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   106
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   107
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   108
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   109
                          "module m1x { exports p1; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   110
                          "package p1; public class C1 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   111
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   112
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   113
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   114
        testEmptyList(src, classes, "m1x/p1=");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   115
        testEmptyList(src, classes, "m1x/p1=,");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   116
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   117
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   118
    void testEmptyList(Path src, Path classes, String option) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   119
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   120
                .options("--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   121
                         "--add-exports", option)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   122
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   123
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   124
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   125
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   126
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   127
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   128
        checkOutputContains(log,
49822
53aae0c219e6 8196433: use the new error diagnostic approach at javac.Main
vromero
parents: 47216
diff changeset
   129
            "error: bad value for --add-exports option: '" + option + "'");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   130
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   131
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   132
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   133
    public void testMissingSourceParts(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   134
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   135
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   136
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   137
                          "module m1x { exports p1; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   138
                          "package p1; public class C1 { }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   139
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   140
        tb.writeJavaFiles(src_m2,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   141
                          "module m2x { }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   142
                          "package p2; class C2 { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   143
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   144
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   145
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   146
        testMissingSourcePart(src, classes, "=m2x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   147
        testMissingSourcePart(src, classes, "/=m2x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   148
        testMissingSourcePart(src, classes, "m1x/=m2x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   149
        testMissingSourcePart(src, classes, "/p1=m2x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   150
        testMissingSourcePart(src, classes, "m1xp1=m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   151
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   152
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   153
    private void testMissingSourcePart(Path src, Path classes, String option) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   154
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   155
                .options("--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   156
                         "--add-exports", option)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   157
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   158
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   159
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   160
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   161
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   162
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   163
        checkOutputContains(log,
49822
53aae0c219e6 8196433: use the new error diagnostic approach at javac.Main
vromero
parents: 47216
diff changeset
   164
            "error: bad value for --add-exports option: '" + option + "'");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   165
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   166
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   167
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   168
    public void testBadSourceParts(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   169
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   170
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   171
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   172
                          "module m1x { exports p1; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   173
                          "package p1; public class C1 { }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   174
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   175
        tb.writeJavaFiles(src_m2,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   176
                          "module m2x { }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   177
                          "package p2; class C2 { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   178
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   179
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   180
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   181
        testBadSourcePart(src, classes, "m!/p1=m2x", "m!");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   182
        testBadSourcePart(src, classes, "m1x/p!=m2x", "p!");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   183
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   184
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   185
    private void testBadSourcePart(Path src, Path classes, String option, String badName)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   186
                throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   187
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   188
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   189
                         "--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   190
                         "--add-exports", option)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   191
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   192
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   193
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   194
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   195
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   196
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   197
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   198
            "- compiler.warn.bad.name.for.option: --add-exports, " + badName);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   199
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   200
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   201
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   202
    public void testBadTarget(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   203
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   204
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   205
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   206
                          "module m1x { exports p1; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   207
                          "package p1; public class C1 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   208
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   209
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   210
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   211
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   212
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   213
                         "--module-source-path", src.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   214
                         "--add-exports", "m1x/p1=m!")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   215
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   216
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   217
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   218
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   219
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   220
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   221
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   222
            "- compiler.warn.bad.name.for.option: --add-exports, m!");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   223
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   224
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   225
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   226
    public void testSourceNotFound(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   227
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   228
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   229
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   230
                          "module m1x { }");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   231
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   232
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   233
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   234
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   235
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   236
                         "--module-source-path", src.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   237
                         "--add-exports", "DoesNotExist/p=m1x")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   238
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   239
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   240
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   241
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   242
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   243
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   244
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   245
            "- compiler.warn.module.for.option.not.found: --add-exports, DoesNotExist");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   246
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   247
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   248
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   249
    public void testTargetNotFound(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   250
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   251
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   252
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   253
                          "module m1x { }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   254
                          "package p1; class C1 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   255
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   256
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   257
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   258
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   259
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   260
                         "--module-source-path", src.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   261
                         "--add-exports", "m1x/p1=DoesNotExist")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   262
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   263
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   264
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   265
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   266
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   267
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   268
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   269
            "- compiler.warn.module.for.option.not.found: --add-exports, DoesNotExist");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   270
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   271
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   272
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   273
    public void testDuplicate(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   274
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   275
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   276
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   277
                          "module m1x { }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   278
                          "package p1; public class C1 { }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   279
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   280
        tb.writeJavaFiles(src_m2,
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   281
                          "module m2x { requires m1x; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   282
                          "package p2; class C2 { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   283
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   284
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   285
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   286
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   287
                .options("--module-source-path", src.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   288
                         "--add-exports", "m1x/p1=m2x,m2x")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   289
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   290
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   291
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   292
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   293
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   294
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   295
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   296
    public void testRepeated_SameTarget(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   297
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   298
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   299
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   300
                          "module m1x { }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   301
                          "package p1; public class C1 { }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   302
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   303
        tb.writeJavaFiles(src_m2,
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   304
                          "module m2x { requires m1x; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   305
                          "package p2; class C2 { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   306
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   307
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   308
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   309
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   310
                .options("--module-source-path", src.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   311
                         "--add-exports", "m1x/p1=m2x",
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   312
                         "--add-exports", "m1x/p1=m2x")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   313
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   314
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   315
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   316
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   317
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   318
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   319
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   320
    public void testRepeated_DifferentTarget(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   321
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   322
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   323
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   324
                          "module m1x { }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   325
                          "package p1; public class C1 { }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   326
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   327
        tb.writeJavaFiles(src_m2,
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   328
                          "module m2x { requires m1x; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   329
                          "package p2; class C2 { p1.C1 c1; }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   330
        Path src_m3 = src.resolve("m3x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   331
        tb.writeJavaFiles(src_m3,
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   332
                          "module m3x { requires m1x; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   333
                          "package p3; class C3 { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   334
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   335
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   336
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   337
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   338
                .options("--module-source-path", src.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   339
                         "--add-exports", "m1x/p1=m2x",
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 41938
diff changeset
   340
                         "--add-exports", "m1x/p1=m3x")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   341
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   342
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   343
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   344
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   345
    }
51123
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   346
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   347
    @Test
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   348
    public void testNoReads(Path base) throws Exception {
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   349
        Path src = base.resolve("src");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   350
        Path src_m1 = src.resolve("m1x");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   351
        tb.writeJavaFiles(src_m1,
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   352
                          "module m1x { }",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   353
                          "package p1; public class C1 { }");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   354
        Path src_m2 = src.resolve("m2x");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   355
        tb.writeJavaFiles(src_m2,
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   356
                          "module m2x { }",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   357
                          "package p2; class C2 { p1.C1 c1; }");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   358
        Path classes = base.resolve("classes");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   359
        tb.createDirectories(classes);
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   360
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   361
        String log;
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   362
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   363
        log = new JavacTask(tb)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   364
                .options("--module-source-path", src.toString(),
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   365
                         "-XDrawDiagnostics")
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   366
                .outdir(classes)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   367
                .files(findJavaFiles(src))
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   368
                .run(Expect.FAIL)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   369
                .writeAll()
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   370
                .getOutput(OutputKind.DIRECT);
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   371
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   372
        checkOutputContains(log,
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   373
            "C2.java:1:24: compiler.err.package.not.visible: p1, (compiler.misc.not.def.access.does.not.read: m2x, p1, m1x)");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   374
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   375
        log = new JavacTask(tb)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   376
                .options("--module-source-path", src.toString(),
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   377
                         "-XDrawDiagnostics",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   378
                         "--add-exports", "m1x/p1=m2x")
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   379
                .outdir(classes)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   380
                .files(findJavaFiles(src))
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   381
                .run(Expect.FAIL)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   382
                .writeAll()
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   383
                .getOutput(OutputKind.DIRECT);
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   384
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   385
        checkOutputContains(log,
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   386
            "C2.java:1:24: compiler.err.package.not.visible: p1, (compiler.misc.not.def.access.does.not.read: m2x, p1, m1x)");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   387
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   388
        Path mp = base.resolve("mp");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   389
        tb.createDirectories(mp);
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   390
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   391
        new JavacTask(tb)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   392
                .options("--module-source-path", src.toString(),
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   393
                         "-XDrawDiagnostics",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   394
                         "--add-exports", "m1x/p1=m2x",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   395
                         "--add-reads", "m2x=m1x")
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   396
                .outdir(mp)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   397
                .files(findJavaFiles(src))
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   398
                .run(Expect.SUCCESS)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   399
                .writeAll();
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   400
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   401
        log = new JavacTask(tb)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   402
                .options("-XDrawDiagnostics",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   403
                         "--add-exports", "m1x/p1=m2x",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   404
                         "--add-reads", "m2x=m1x",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   405
                         "--module-path", mp.toString())
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   406
                .outdir(classes)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   407
                .files(findJavaFiles(src_m2))
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   408
                .run(Expect.FAIL)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   409
                .writeAll()
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   410
                .getOutput(OutputKind.DIRECT);
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   411
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   412
        checkOutputContains(log,
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   413
            "C2.java:1:24: compiler.err.package.not.visible: p1, (compiler.misc.not.def.access.does.not.read: m2x, p1, m1x)");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   414
        checkOutputContains(log,
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   415
            "- compiler.warn.module.for.option.not.found: --add-reads, m1x");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   416
        checkOutputContains(log,
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   417
            "- compiler.warn.module.for.option.not.found: --add-exports, m1x");
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   418
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   419
        new JavacTask(tb)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   420
                .options("-XDrawDiagnostics",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   421
                         "--add-exports", "m1x/p1=m2x",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   422
                         "--add-reads", "m2x=m1x",
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   423
                         "--module-path", mp.toString(),
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   424
                         "--add-modules", "m1x")
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   425
                .outdir(classes)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   426
                .files(findJavaFiles(src_m2))
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   427
                .run(Expect.SUCCESS)
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   428
                .writeAll()
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   429
                .getOutput(OutputKind.DIRECT);
d7c4c42ab260 8207032: Compilation succeeds without checking readability when --add-exports used
jlahoda
parents: 49822
diff changeset
   430
    }
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   431
}