langtools/test/tools/javac/modules/GraphsTest.java
author jjg
Wed, 10 Aug 2016 15:47:46 -0700
changeset 40308 274367a99f98
parent 39103 91a64ec5b970
child 40599 be40838eb215
permissions -rw-r--r--
8136930: Simplify use of module-system options by custom launchers 8160489: Multiple -Xpatch lines ignored by javac 8156998: javac should support new option -XinheritRuntimeEnvironment Reviewed-by: jlahoda, ksrini
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
     2
 * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
36526
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
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    26
 * @summary tests for module graph resolution issues
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    27
 * @library /tools/lib
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    28
 * @modules
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    29
 *      jdk.compiler/com.sun.tools.javac.api
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    30
 *      jdk.compiler/com.sun.tools.javac.main
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    31
 * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.ModuleBuilder
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    32
 *      ModuleTestBase
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    33
 * @run main GraphsTest
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    34
 */
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    35
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    36
import java.io.File;
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;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    39
import java.util.Arrays;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    40
import java.util.List;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    41
import java.util.regex.Pattern;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    42
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    43
import toolbox.JarTask;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    44
import toolbox.JavacTask;
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    45
import toolbox.ModuleBuilder;
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    46
import toolbox.Task;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    47
import toolbox.ToolBox;
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    48
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    49
public class GraphsTest extends ModuleTestBase {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    50
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    51
    public static void main(String... args) throws Exception {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    52
        GraphsTest t = new GraphsTest();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    53
        t.runTests();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    54
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    55
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    56
    /**
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    57
     * Tests diamond graph with an automatic module added in.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    58
     * +-------------+          +--------------------+         +------------------+
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    59
     * | module M    |          | module N           |         | module O         |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    60
     * |             | ----->   |                    | --->    |                  |  --> J.jar
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    61
     * | require N   |          | requires public  O |         |                  |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    62
     * | require L   |          |                    |         +------------------+
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    63
     * +-------------+          +--------------------+                  ^
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    64
     *       |                                                          |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    65
     *       |                  +--------------------+                  |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    66
     *       ------------------>| module L           |                  |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    67
     *                          |                    |------------------
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    68
     *                          | requires public O  |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    69
     *                          |                    |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    70
     *                          +--------------------+
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
    @Test
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    74
    public void diamond(Path base) throws Exception {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    75
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
    76
        Path modSrc = Files.createDirectories(base.resolve("modSrc"));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    77
        Path modules = Files.createDirectories(base.resolve("modules"));
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    78
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    79
        new ModuleBuilder(tb, "J")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    80
                .exports("openJ")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    81
                .classes("package openJ; public class J { }")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    82
                .classes("package closedJ; public class J { }")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    83
                .build(base.resolve("jar"));
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    84
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    85
        Path jarModules = Files.createDirectories(base.resolve("jarModules"));
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    86
        Path jar = jarModules.resolve("J.jar");
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    87
        new JarTask(tb, jar)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    88
                .baseDir(base.resolve("jar/J"))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    89
                .files(".")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    90
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    91
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    92
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    93
        new ModuleBuilder(tb, "O")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    94
                .exports("openO")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    95
                .requiresPublic("J", jarModules)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    96
                .classes("package openO; public class O { openJ.J j; }")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    97
                .classes("package closedO; public class O { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
    98
                .build(modSrc, modules);
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    99
        new ModuleBuilder(tb, "N")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   100
                .requiresPublic("O", modules, jarModules)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   101
                .exports("openN")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   102
                .classes("package openN; public class N { }")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   103
                .classes("package closedN; public class N { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   104
                .build(modSrc, modules);
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   105
        new ModuleBuilder(tb, "L")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   106
                .requiresPublic("O", modules, jarModules)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   107
                .exports("openL")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   108
                .classes("package openL; public class L { }")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   109
                .classes("package closedL; public class L { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   110
                .build(modSrc, modules);
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   111
        ModuleBuilder m = new ModuleBuilder(tb, "M");
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   112
        //positive case
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   113
        Path positiveSrc = m
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   114
                .requires("N", modules)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   115
                .requires("L", modules)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   116
                .classes("package p; public class Positive { openO.O o; openN.N n; openL.L l; }")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   117
                .write(base.resolve("positiveSrc"));
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   118
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   119
        new JavacTask(tb)
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   120
                .options("-XDrawDiagnostics", "-p", modules + File.pathSeparator + jarModules)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   121
                .outdir(Files.createDirectories(base.resolve("positive")))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   122
                .files(findJavaFiles(positiveSrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   123
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   124
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   125
        //negative case
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   126
        Path negativeSrc = m.classes("package p; public class Negative { closedO.O o; closedN.N n; closedL.L l; }")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   127
                .write(base.resolve("negativeSrc"));
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   128
        List<String> log = new JavacTask(tb)
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   129
                .options("-XDrawDiagnostics", "-p", modules + File.pathSeparator + jarModules)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   130
                .outdir(Files.createDirectories(base.resolve("negative")))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   131
                .files(findJavaFiles(negativeSrc))
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   132
                .run(Task.Expect.FAIL)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   133
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   134
                .getOutputLines(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   135
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   136
        List<String> expected = Arrays.asList(
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   137
                "Negative.java:1:43: compiler.err.doesnt.exist: closedO",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   138
                "Negative.java:1:56: compiler.err.doesnt.exist: closedN",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   139
                "Negative.java:1:69: compiler.err.doesnt.exist: closedL");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   140
        if (!log.containsAll(expected)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   141
            throw new Exception("Expected output not found");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   142
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   143
        //multi module mode
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   144
        m.write(modSrc);
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   145
        List<String> out = new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   146
                .options("-XDrawDiagnostics",
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   147
                        "--module-source-path", modSrc.toString(),
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   148
                        "-p", jarModules.toString()
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   149
                )
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   150
                .outdir(Files.createDirectories(base.resolve("negative")))
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   151
                .files(findJavaFiles(modSrc))
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   152
                .run(Task.Expect.FAIL)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   153
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   154
                .getOutputLines(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   155
        expected = Arrays.asList(
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   156
                "Negative.java:1:43: compiler.err.not.def.access.package.cant.access: closedO.O, closedO",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   157
                "Negative.java:1:56: compiler.err.not.def.access.package.cant.access: closedN.N, closedN",
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   158
                "Negative.java:1:69: compiler.err.not.def.access.package.cant.access: closedL.L, closedL");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   159
        if (!out.containsAll(expected)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   160
            throw new Exception("Expected output not found");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   161
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   162
        //checks if the output does not contain messages about exported packages.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   163
        Pattern regex = Pattern.compile("compiler\\.err.*(openO\\.O|openN\\.N|openL\\.L)");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   164
        for (String s : out) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   165
            if (regex.matcher(s).find()) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   166
                throw new Exception("Unexpected output: " + s);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   167
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   168
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   169
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   170
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   171
    /**
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   172
     * Tests graph where module M reexport package of N, but N export the package only to M.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   173
     *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   174
    +-------------+        +--------------------+        +---------------+
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   175
    | module L    |        | module M           |        | module N      |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   176
    |             | -----> |                    | -----> |               |
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   177
    |  requires M |        |  requires public N |        | exports P to M|
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   178
    +-------------+        |                    |        +---------------+
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   179
                           +--------------------+
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   180
    */
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   181
    @Test
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   182
    public void reexportOfQualifiedExport(Path base) throws Exception {
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   183
        Path modSrc = base.resolve("modSrc");
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   184
        new ModuleBuilder(tb, "M")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   185
                .requiresPublic("N")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   186
                .write(modSrc);
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   187
        new ModuleBuilder(tb, "N")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   188
                .exportsTo("pack", "M")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   189
                .classes("package pack; public class Clazz { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   190
                .write(modSrc);
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   191
        new ModuleBuilder(tb, "L")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   192
                .requires("M")
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   193
                .classes("package p; public class A { A(pack.Clazz cl){} } ")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   194
                .write(modSrc);
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   195
        String log = new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   196
                .options("-XDrawDiagnostics",
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   197
                        "-modulesourcepath", modSrc.toString())
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   198
                .outdir(Files.createDirectories(base.resolve("negative")))
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   199
                .files(findJavaFiles(modSrc))
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   200
                .run(Task.Expect.FAIL)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   201
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   202
                .getOutput(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   203
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   204
        String expected = "A.java:1:35: compiler.err.not.def.access.package.cant.access: pack.Clazz, pack";
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   205
        if (!log.contains(expected)) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   206
            throw new Exception("Expected output not found");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   207
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   208
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   209
}