test/langtools/tools/javac/modules/AddModulesTest.java
author darcy
Fri, 02 Feb 2018 10:29:25 -0800
changeset 48723 6cb86bf0b51e
parent 47216 71c04702a3d5
child 49822 53aae0c219e6
permissions -rw-r--r--
8196623: Update JavaBaseTest.java to be version agnostic Reviewed-by: vromero
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
/*
43871
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
     2
 * Copyright (c) 2015, 2017, 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
43871
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    26
 * @bug 8167975 8173596
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    27
 * @summary Test the --add-modules 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
43871
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    31
 * @build toolbox.Assert toolbox.ToolBox toolbox.JavacTask ModuleTestBase
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    32
 * @run main AddModulesTest
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
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    36
import java.nio.file.Path;
43871
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    37
import java.util.Arrays;
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    38
43871
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    39
import javax.tools.JavaCompiler;
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    40
import javax.tools.JavaCompiler.CompilationTask;
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    41
import javax.tools.JavaFileObject;
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    42
import javax.tools.StandardJavaFileManager;
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    43
import javax.tools.StandardLocation;
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    44
import javax.tools.ToolProvider;
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    45
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
    46
import toolbox.Assert;
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    47
import toolbox.JavacTask;
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    48
import toolbox.Task;
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    49
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    50
public class AddModulesTest extends ModuleTestBase {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    51
    public static void main(String... args) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    52
        new AddModulesTest().runTests();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    53
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    54
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    55
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    56
    public void testEmpty(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    57
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    58
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    59
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    60
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    61
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    62
        testEmpty(src, classes, "--add-modules", "");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    63
        testEmpty(src, classes, "--add-modules=");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    64
    }
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
    private void testEmpty(Path src, Path classes, String... options) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    67
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    68
                .options(options)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    69
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    70
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    71
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    72
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    73
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    74
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    75
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    76
            "javac: no value for --add-modules option");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    77
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    78
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    79
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    80
    public void testEmptyItem(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    81
        Path src = base.resolve("src");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
    82
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    83
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
    84
                          "module m1x { }");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
    85
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    86
        tb.writeJavaFiles(src_m2,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
    87
                          "module m2x { }");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    88
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    89
        tb.createDirectories(classes);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    90
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
    91
        testEmptyItem(src, classes, ",m1x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
    92
        testEmptyItem(src, classes, "m1x,,m2x");
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
    93
        testEmptyItem(src, classes, "m1x,");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    94
    }
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
    private void testEmptyItem(Path src, Path classes, String option) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    97
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    98
                .options("--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
    99
                         "--add-modules", option)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   100
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   101
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   102
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   103
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   104
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   105
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   106
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   107
    public void testEmptyList(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   108
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   109
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   110
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   111
        tb.createDirectories(classes);
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
        String log = new JavacTask(tb, Task.Mode.CMDLINE)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   114
                .options("--module-source-path", src.toString(),
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   115
                         "--add-modules", ",")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   116
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   117
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   118
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   119
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   120
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   121
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   122
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   123
            "javac: bad value for --add-modules option");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   124
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   125
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   126
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   127
    public void testInvalidName(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   128
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   129
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   130
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   131
        tb.createDirectories(classes);
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
        String log = new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   134
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   135
                         "--add-modules", "BadModule!")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   136
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   137
                .files(findJavaFiles(src))
42269
24a766b7c106 8164590: javac --inherit-runtime-environment fails with "cannot find modules: ALL-DEFAULT"
jjg
parents: 41938
diff changeset
   138
                .run(Task.Expect.FAIL)
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   139
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   140
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   141
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   142
        checkOutputContains(log,
42269
24a766b7c106 8164590: javac --inherit-runtime-environment fails with "cannot find modules: ALL-DEFAULT"
jjg
parents: 41938
diff changeset
   143
            "- compiler.err.bad.name.for.option: --add-modules, BadModule!");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   144
    }
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   145
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   146
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   147
    public void testUnknownName(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   148
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   149
        tb.writeJavaFiles(src, "class Dummy { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   150
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   151
        tb.createDirectories(classes);
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
        String log = new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   154
                .options("-XDrawDiagnostics",
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   155
                         "--add-modules", "DoesNotExist")
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   156
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   157
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   158
                .run(Task.Expect.FAIL)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   159
                .writeAll()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   160
                .getOutput(Task.OutputKind.DIRECT);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   161
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   162
        checkOutputContains(log,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   163
            "- compiler.err.module.not.found: DoesNotExist");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   164
    }
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
    @Test
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   167
    public void testDuplicate(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   168
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   169
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   170
        // setup a utility module
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   171
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   172
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   173
                          "module m1x { exports p1; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   174
                          "package p1; public class C1 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   175
        Path modules = base.resolve("modules");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   176
        tb.createDirectories(modules);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   177
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   178
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   179
                .options("--module-source-path", src.toString())
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   180
                .outdir(modules)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   181
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   182
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   183
                .writeAll();
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
        // now test access to the module
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   186
        Path src2 = base.resolve("src2");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   187
        tb.writeJavaFiles(src2,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   188
                          "class Dummy { p1.C1 c1; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   189
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   190
        tb.createDirectories(classes);
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
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   193
                .options("--module-path", modules.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   194
                         "--add-modules", "m1x,m1x")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   195
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   196
                .files(findJavaFiles(src2))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   197
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   198
                .writeAll();
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 testRepeatable(Path base) throws Exception {
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   203
        Path src = base.resolve("src");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   204
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   205
        // setup some utility modules
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   206
        Path src_m1 = src.resolve("m1x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   207
        tb.writeJavaFiles(src_m1,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   208
                          "module m1x { exports p1; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   209
                          "package p1; public class C1 { }");
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   210
        Path src_m2 = src.resolve("m2x");
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   211
        tb.writeJavaFiles(src_m2,
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   212
                          "module m2x { exports p2; }",
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   213
                          "package p2; public class C2 { }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   214
        Path modules = base.resolve("modules");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   215
        tb.createDirectories(modules);
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   216
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   217
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   218
                .options("--module-source-path", src.toString())
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   219
                .outdir(modules)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   220
                .files(findJavaFiles(src))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   221
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   222
                .writeAll();
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
        // now test access to the modules
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   225
        Path src2 = base.resolve("src2");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   226
        tb.writeJavaFiles(src2,
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   227
                          "class Dummy { p1.C1 c1; p2.C2 c2; }");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   228
        Path classes = base.resolve("classes");
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   229
        tb.createDirectories(classes);
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
        new JavacTask(tb)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   232
                .options("--module-path", modules.toString(),
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   233
                         "--add-modules", "m1x",
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42269
diff changeset
   234
                         "--add-modules", "m2x")
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   235
                .outdir(classes)
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   236
                .files(findJavaFiles(src2))
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   237
                .run()
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   238
                .writeAll();
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   239
    }
43871
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   240
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   241
    @Test
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   242
    public void testAddModulesAPI(Path base) throws Exception {
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   243
        Path src = base.resolve("src");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   244
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   245
        // setup some utility modules
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   246
        Path src_m1 = src.resolve("m1x");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   247
        tb.writeJavaFiles(src_m1,
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   248
                          "module m1x { exports p1; }",
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   249
                          "package p1; public class C1 { }");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   250
        Path src_m2 = src.resolve("m2x");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   251
        tb.writeJavaFiles(src_m2,
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   252
                          "module m2x { exports p2; }",
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   253
                          "package p2; public class C2 { }");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   254
        Path modules = base.resolve("modules");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   255
        tb.createDirectories(modules);
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   256
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   257
        new JavacTask(tb)
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   258
                .options("--module-source-path", src.toString())
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   259
                .outdir(modules)
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   260
                .files(findJavaFiles(src))
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   261
                .run()
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   262
                .writeAll();
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   263
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   264
        // now test access to the modules
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   265
        Path src2 = base.resolve("src2");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   266
        tb.writeJavaFiles(src2,
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   267
                          "class Dummy { p1.C1 c1; p2.C2 c2; }");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   268
        Path classes = base.resolve("classes");
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   269
        tb.createDirectories(classes);
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   270
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   271
        JavaCompiler c = ToolProvider.getSystemJavaCompiler();
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   272
        try (StandardJavaFileManager fm = c.getStandardFileManager(null, null, null)) {
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   273
            fm.setLocationFromPaths(StandardLocation.MODULE_PATH, Arrays.asList(modules));
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   274
            fm.setLocationFromPaths(StandardLocation.CLASS_OUTPUT, Arrays.asList(classes));
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   275
            Iterable<? extends JavaFileObject> files = fm.getJavaFileObjects(findJavaFiles(src2));
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   276
            CompilationTask t = c.getTask(null, fm, null, null, null, files);
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   277
            t.addModules(Arrays.asList("m1x", "m2x"));
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   278
            Assert.check(t.call());
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   279
        }
f164f4506389 8173596: JavaCompiler.CompilationTask should support addModules
jjg
parents: 42822
diff changeset
   280
    }
41938
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   281
}
8e66bf10fcec 8167975: align javac --add-* modules options with launcher
jjg
parents:
diff changeset
   282