langtools/test/tools/javac/modules/AddModulesTest.java
author jjg
Thu, 03 Nov 2016 13:59:15 -0700
changeset 41938 8e66bf10fcec
child 42269 24a766b7c106
permissions -rw-r--r--
8167975: align javac --add-* modules options with launcher Reviewed-by: jlahoda
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
/*
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
     2
 * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
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
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    26
 * @summary Test the --add-modules option
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    27
 * @library /tools/lib
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    28
 * @modules jdk.compiler/com.sun.tools.javac.api
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    29
 *          jdk.compiler/com.sun.tools.javac.main
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    30
 * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    31
 * @run main AddModulesTest
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    32
 */
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;
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    39
import toolbox.ToolBox;
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    40
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    41
public class AddModulesTest extends ModuleTestBase {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    42
    public static void main(String... args) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    43
        new AddModulesTest().runTests();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    44
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    45
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    46
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    47
    public void testEmpty(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    48
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    49
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    50
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    51
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    52
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    53
        testEmpty(src, classes, "--add-modules", "");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    54
        testEmpty(src, classes, "--add-modules=");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    55
    }
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
    private void testEmpty(Path src, Path classes, String... options) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    58
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    59
                .options(options)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    60
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    61
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    62
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    63
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    64
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    65
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    66
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    67
            "javac: no value for --add-modules option");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    68
    }
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
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    71
    public void testEmptyItem(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    72
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    73
        Path src_m1 = src.resolve("m1");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    74
        tb.writeJavaFiles(src_m1,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    75
                          "module m1 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    76
        Path src_m2 = src.resolve("m2");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    77
        tb.writeJavaFiles(src_m2,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    78
                          "module m2 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    79
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    80
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    81
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    82
        testEmptyItem(src, classes, ",m1");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    83
        testEmptyItem(src, classes, "m1,,m2");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    84
        testEmptyItem(src, classes, "m1,");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    85
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    86
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    87
    private void testEmptyItem(Path src, Path classes, String option) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    88
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    89
                .options("--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    90
                         "--add-modules", option)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    91
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    92
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    93
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    94
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    95
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    96
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    97
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    98
    public void testEmptyList(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    99
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   100
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   101
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   102
        tb.createDirectories(classes);
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
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   105
                .options("--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   106
                         "--add-modules", ",")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   107
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   108
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   109
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   110
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   111
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   112
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   113
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   114
            "javac: bad value for --add-modules option");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   115
    }
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
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   118
    public void testInvalidName(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   119
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   120
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   121
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   122
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   123
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   124
        String log = new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   125
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   126
                         "--add-modules", "BadModule!")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   127
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   128
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   129
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   130
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   131
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   132
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   133
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   134
            "- compiler.warn.bad.name.for.option: --add-modules, BadModule!");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   135
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   136
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   137
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   138
    public void testUnknownName(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   139
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   140
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   141
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   142
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   143
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   144
        String log = new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   145
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   146
                         "--add-modules", "DoesNotExist")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   147
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   148
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   149
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   150
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   151
                .getOutput(Task.OutputKind.DIRECT);
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
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   154
            "- compiler.err.module.not.found: DoesNotExist");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   155
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   156
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   157
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   158
    public void testDuplicate(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   159
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   160
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   161
        // setup a utility module
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   162
        Path src_m1 = src.resolve("m1");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   163
        tb.writeJavaFiles(src_m1,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   164
                          "module m1 { exports p1; }",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   165
                          "package p1; public class C1 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   166
        Path modules = base.resolve("modules");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   167
        tb.createDirectories(modules);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   168
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   169
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   170
                .options("--module-source-path", src.toString())
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   171
                .outdir(modules)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   172
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   173
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   174
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   175
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   176
        // now test access to the module
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   177
        Path src2 = base.resolve("src2");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   178
        tb.writeJavaFiles(src2,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   179
                          "class Dummy { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   180
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   181
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   182
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   183
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   184
                .options("--module-path", modules.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   185
                         "--add-modules", "m1,m1")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   186
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   187
                .files(findJavaFiles(src2))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   188
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   189
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   190
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   191
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   192
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   193
    public void testRepeatable(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   194
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   195
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   196
        // setup some utility modules
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   197
        Path src_m1 = src.resolve("m1");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   198
        tb.writeJavaFiles(src_m1,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   199
                          "module m1 { exports p1; }",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   200
                          "package p1; public class C1 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   201
        Path src_m2 = src.resolve("m2");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   202
        tb.writeJavaFiles(src_m2,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   203
                          "module m2 { exports p2; }",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   204
                          "package p2; public class C2 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   205
        Path modules = base.resolve("modules");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   206
        tb.createDirectories(modules);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   207
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   208
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   209
                .options("--module-source-path", src.toString())
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   210
                .outdir(modules)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   211
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   212
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   213
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   214
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   215
        // now test access to the modules
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   216
        Path src2 = base.resolve("src2");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   217
        tb.writeJavaFiles(src2,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   218
                          "class Dummy { p1.C1 c1; p2.C2 c2; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   219
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   220
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   221
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   222
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   223
                .options("--module-path", modules.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   224
                         "--add-modules", "m1",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   225
                         "--add-modules", "m2")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   226
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   227
                .files(findJavaFiles(src2))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   228
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   229
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   230
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   231
}
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   232