langtools/test/tools/javac/modules/AutomaticModules.java
author jlahoda
Tue, 28 Jun 2016 13:33:04 +0200
changeset 39366 8bf5fe72ca88
parent 37758 3ecf9b414e05
child 40308 274367a99f98
permissions -rw-r--r--
8155026: javac grants implied readability to explicit modules Summary: Automatic modules should not 'requires public' ordinary named modules Reviewed-by: jjg
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     2
 * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     4
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     7
 * published by the Free Software Foundation.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     8
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    13
 * accompanied this code).
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    14
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    18
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    21
 * questions.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    22
 */
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    23
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    24
/**
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    25
 * @test
39366
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
    26
 * @bug 8155026
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    27
 * @summary Test automatic modules
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    28
 * @library /tools/lib
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    29
 * @modules
39366
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
    30
 *      java.desktop
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    31
 *      jdk.compiler/com.sun.tools.javac.api
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    32
 *      jdk.compiler/com.sun.tools.javac.main
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    33
 * @build toolbox.ToolBox toolbox.JavacTask toolbox.JarTask ModuleTestBase
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    34
 * @run main AutomaticModules
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    35
 */
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    36
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    37
import java.nio.file.Files;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    38
import java.nio.file.Path;
39366
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
    39
import java.util.Arrays;
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
    40
import java.util.List;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    41
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    42
import toolbox.JarTask;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    43
import toolbox.JavacTask;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    44
import toolbox.Task;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    45
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    46
public class AutomaticModules extends ModuleTestBase {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    47
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    48
    public static void main(String... args) throws Exception {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    49
        AutomaticModules t = new AutomaticModules();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    50
        t.runTests();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    51
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    52
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    53
    @Test
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    54
    public void testSimple(Path base) throws Exception {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    55
        Path legacySrc = base.resolve("legacy-src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    56
        tb.writeJavaFiles(legacySrc,
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    57
                          "package api; import java.awt.event.ActionListener; public abstract class Api implements ActionListener {}");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    58
        Path legacyClasses = base.resolve("legacy-classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    59
        Files.createDirectories(legacyClasses);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    60
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    61
        String log = new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    62
                .options()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    63
                .outdir(legacyClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    64
                .files(findJavaFiles(legacySrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    65
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    66
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    67
                .getOutput(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    68
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    69
        if (!log.isEmpty()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    70
            throw new Exception("unexpected output: " + log);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    71
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    72
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    73
        Path modulePath = base.resolve("module-path");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    74
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    75
        Files.createDirectories(modulePath);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    76
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    77
        Path jar = modulePath.resolve("test-api-1.0.jar");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    78
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    79
        new JarTask(tb, jar)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    80
          .baseDir(legacyClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    81
          .files("api/Api.class")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    82
          .run();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    83
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    84
        Path moduleSrc = base.resolve("module-src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    85
        Path m1 = moduleSrc.resolve("m1");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    86
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    87
        Path classes = base.resolve("classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    88
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    89
        Files.createDirectories(classes);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    90
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    91
        tb.writeJavaFiles(m1,
39366
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
    92
                          "module m1 { requires test.api; requires java.desktop; }",
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    93
                          "package impl; public class Impl { public void e(api.Api api) { api.actionPerformed(null); } }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    94
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    95
        new JavacTask(tb)
39366
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
    96
                .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString())
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    97
                .outdir(classes)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    98
                .files(findJavaFiles(moduleSrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    99
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   100
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   101
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   102
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   103
    @Test
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   104
    public void testUnnamedModule(Path base) throws Exception {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   105
        Path legacySrc = base.resolve("legacy-src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   106
        tb.writeJavaFiles(legacySrc,
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   107
                          "package api; public abstract class Api { public void run(CharSequence str) { } private void run(base.Base base) { } }",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   108
                          "package base; public interface Base { public void run(); }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   109
        Path legacyClasses = base.resolve("legacy-classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   110
        Files.createDirectories(legacyClasses);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   111
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   112
        String log = new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   113
                .options()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   114
                .outdir(legacyClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   115
                .files(findJavaFiles(legacySrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   116
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   117
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   118
                .getOutput(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   119
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   120
        if (!log.isEmpty()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   121
            throw new Exception("unexpected output: " + log);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   122
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   123
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   124
        Path modulePath = base.resolve("module-path");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   125
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   126
        Files.createDirectories(modulePath);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   127
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   128
        Path apiJar = modulePath.resolve("test-api-1.0.jar");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   129
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   130
        new JarTask(tb, apiJar)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   131
          .baseDir(legacyClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   132
          .files("api/Api.class")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   133
          .run();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   134
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   135
        Path baseJar = base.resolve("base.jar");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   136
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   137
        new JarTask(tb, baseJar)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   138
          .baseDir(legacyClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   139
          .files("base/Base.class")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   140
          .run();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   141
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   142
        Path moduleSrc = base.resolve("module-src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   143
        Path m1 = moduleSrc.resolve("m1");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   144
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   145
        Path classes = base.resolve("classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   146
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   147
        Files.createDirectories(classes);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   148
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   149
        tb.writeJavaFiles(m1,
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   150
                          "module m1 { requires test.api; }",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   151
                          "package impl; public class Impl { public void e(api.Api api) { api.run(\"\"); } }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   152
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   153
        new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   154
                .options("-modulesourcepath", moduleSrc.toString(), "-modulepath", modulePath.toString(), "-classpath", baseJar.toString())
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   155
                .outdir(classes)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   156
                .files(findJavaFiles(moduleSrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   157
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   158
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   159
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   160
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   161
    @Test
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   162
    public void testModuleInfoFromClassFileDependsOnAutomatic(Path base) throws Exception {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   163
        Path automaticSrc = base.resolve("automaticSrc");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   164
        tb.writeJavaFiles(automaticSrc, "package api; public class Api {}");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   165
        Path automaticClasses = base.resolve("automaticClasses");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   166
        tb.createDirectories(automaticClasses);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   167
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   168
        String automaticLog = new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   169
                                .outdir(automaticClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   170
                                .files(findJavaFiles(automaticSrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   171
                                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   172
                                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   173
                                .getOutput(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   174
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   175
        if (!automaticLog.isEmpty())
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   176
            throw new Exception("expected output not found: " + automaticLog);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   177
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   178
        Path modulePath = base.resolve("module-path");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   179
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   180
        Files.createDirectories(modulePath);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   181
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   182
        Path automaticJar = modulePath.resolve("automatic-1.0.jar");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   183
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   184
        new JarTask(tb, automaticJar)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   185
          .baseDir(automaticClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   186
          .files("api/Api.class")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   187
          .run();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   188
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   189
        Path depSrc = base.resolve("depSrc");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   190
        Path depClasses = base.resolve("depClasses");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   191
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   192
        Files.createDirectories(depSrc);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   193
        Files.createDirectories(depClasses);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   194
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   195
        tb.writeJavaFiles(depSrc,
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   196
                          "module m1 { requires public automatic; }",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   197
                          "package dep; public class Dep { api.Api api; }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   198
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   199
        new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   200
                .options("-modulepath", modulePath.toString())
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   201
                .outdir(depClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   202
                .files(findJavaFiles(depSrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   203
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   204
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   205
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   206
        Path moduleJar = modulePath.resolve("m1.jar");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   207
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   208
        new JarTask(tb, moduleJar)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   209
          .baseDir(depClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   210
          .files("module-info.class", "dep/Dep.class")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   211
          .run();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   212
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   213
        Path testSrc = base.resolve("testSrc");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   214
        Path testClasses = base.resolve("testClasses");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   215
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   216
        Files.createDirectories(testSrc);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   217
        Files.createDirectories(testClasses);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   218
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   219
        tb.writeJavaFiles(testSrc,
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   220
                          "module m2 { requires automatic; }",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   221
                          "package test; public class Test { }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   222
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   223
        new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   224
                .options("-modulepath", modulePath.toString())
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   225
                .outdir(testClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   226
                .files(findJavaFiles(testSrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   227
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   228
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   229
    }
39366
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   230
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   231
    @Test
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   232
    public void testAutomaticAndNamedModules(Path base) throws Exception {
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   233
        Path modulePath = base.resolve("module-path");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   234
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   235
        Files.createDirectories(modulePath);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   236
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   237
        for (char c : new char[] {'A', 'B'}) {
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   238
            Path automaticSrc = base.resolve("automaticSrc" + c);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   239
            tb.writeJavaFiles(automaticSrc, "package api" + c + "; public class Api {}");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   240
            Path automaticClasses = base.resolve("automaticClasses" + c);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   241
            tb.createDirectories(automaticClasses);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   242
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   243
            String automaticLog = new JavacTask(tb)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   244
                                    .outdir(automaticClasses)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   245
                                    .files(findJavaFiles(automaticSrc))
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   246
                                    .run()
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   247
                                    .writeAll()
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   248
                                    .getOutput(Task.OutputKind.DIRECT);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   249
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   250
            if (!automaticLog.isEmpty())
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   251
                throw new Exception("expected output not found: " + automaticLog);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   252
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   253
            Path automaticJar = modulePath.resolve("automatic" + c + "-1.0.jar");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   254
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   255
            new JarTask(tb, automaticJar)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   256
              .baseDir(automaticClasses)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   257
              .files("api" + c + "/Api.class")
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   258
              .run();
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   259
        }
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   260
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   261
        Path moduleSrc = base.resolve("module-src");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   262
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   263
        tb.writeJavaFiles(moduleSrc.resolve("m1"),
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   264
                          "module m1 { requires automaticA; }",
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   265
                          "package impl; public class Impl { apiA.Api a; apiB.Api b; m2.M2 m;}");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   266
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   267
        tb.writeJavaFiles(moduleSrc.resolve("m2"),
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   268
                          "module m2 { exports m2; }",
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   269
                          "package m2; public class M2 { }");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   270
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   271
        Path classes = base.resolve("classes");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   272
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   273
        Files.createDirectories(classes);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   274
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   275
        List<String> log = new JavacTask(tb)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   276
                .options("-modulesourcepath", moduleSrc.toString(),
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   277
                         "-modulepath", modulePath.toString(),
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   278
                         "-addmods", "automaticB",
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   279
                         "-XDrawDiagnostics")
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   280
                .outdir(classes)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   281
                .files(findJavaFiles(moduleSrc))
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   282
                .run(Task.Expect.FAIL)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   283
                .writeAll()
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   284
                .getOutputLines(Task.OutputKind.DIRECT);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   285
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   286
        List<String> expected = Arrays.asList("Impl.java:1:61: compiler.err.not.def.access.package.cant.access: m2.M2, m2",
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   287
                                              "1 error");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   288
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   289
        if (!expected.equals(log)) {
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   290
            throw new Exception("expected output not found: " + log);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   291
        }
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   292
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   293
        log = new JavacTask(tb)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   294
                .options("-modulesourcepath", moduleSrc.toString(),
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   295
                         "-modulepath", modulePath.toString(),
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   296
                         "-XDrawDiagnostics")
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   297
                .outdir(classes)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   298
                .files(findJavaFiles(moduleSrc))
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   299
                .run(Task.Expect.FAIL)
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   300
                .writeAll()
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   301
                .getOutputLines(Task.OutputKind.DIRECT);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   302
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   303
        expected = Arrays.asList("Impl.java:1:51: compiler.err.doesnt.exist: apiB",
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   304
                                 "Impl.java:1:61: compiler.err.not.def.access.package.cant.access: m2.M2, m2",
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   305
                                 "2 errors");
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   306
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   307
        if (!expected.equals(log)) {
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   308
            throw new Exception("expected output not found: " + log);
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   309
        }
8bf5fe72ca88 8155026: javac grants implied readability to explicit modules
jlahoda
parents: 37758
diff changeset
   310
    }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   311
}