test/langtools/tools/javac/modules/CompileModulePatchTest.java
author jlahoda
Thu, 12 Apr 2018 09:23:34 +0200
changeset 49579 fce4252d5227
parent 47216 71c04702a3d5
permissions -rw-r--r--
8189765: Improve error reporting for compiling against package not visible due to modules Summary: When looking in other modules for an undefined Symbol, also look into the unnamed module. Reviewed-by: mcimadamore
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
44289
842ccb558d7d 8175057: module-info on patch path should not produce an error
jlahoda
parents: 43772
diff changeset
     2
 * Copyright (c) 2015, 2017, 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
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    26
 * @bug 8173777
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    27
 * @summary tests for multi-module mode compilation
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    28
 * @library /tools/lib
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    29
 * @modules
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    30
 *      jdk.compiler/com.sun.tools.javac.api
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    31
 *      jdk.compiler/com.sun.tools.javac.code
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    32
 *      jdk.compiler/com.sun.tools.javac.main
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    33
 *      jdk.compiler/com.sun.tools.javac.processing
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    34
 * @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    35
 * @run main CompileModulePatchTest
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    36
 */
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    37
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    38
import java.nio.file.Files;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    39
import java.nio.file.Path;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    40
import java.util.Arrays;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    41
import java.util.List;
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    42
import java.util.Set;
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    43
import java.util.stream.Collectors;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    44
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    45
import javax.annotation.processing.AbstractProcessor;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    46
import javax.annotation.processing.RoundEnvironment;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    47
import javax.annotation.processing.SupportedAnnotationTypes;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    48
import javax.lang.model.SourceVersion;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    49
import javax.lang.model.element.ModuleElement;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    50
import javax.lang.model.element.TypeElement;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    51
import javax.lang.model.util.Elements;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    52
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    53
import com.sun.tools.javac.code.Symtab;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    54
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    55
import toolbox.JavacTask;
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
    56
import toolbox.ModuleBuilder;
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    57
import toolbox.Task;
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
    58
import toolbox.Task.Expect;
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    59
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    60
public class CompileModulePatchTest extends ModuleTestBase {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    61
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    62
    public static void main(String... args) throws Exception {
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    63
        new CompileModulePatchTest().runTests();
36526
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
    @Test
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    67
    public void testCorrectModulePatch(Path base) throws Exception {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    68
        //note: avoiding use of java.base, as that gets special handling on some places:
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    69
        Path src = base.resolve("src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    70
        tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element { }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    71
        Path classes = base.resolve("classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    72
        tb.createDirectories(classes);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    73
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    74
        String log = new JavacTask(tb)
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    75
                .options("--patch-module", "java.compiler=" + src.toString())
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    76
                .outdir(classes)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    77
                .files(findJavaFiles(src))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    78
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    79
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    80
                .getOutput(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    81
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    82
        if (!log.isEmpty())
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    83
            throw new Exception("expected output not found: " + log);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    84
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    85
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    86
    @Test
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    87
    public void testCorrectModulePatchMultiModule(Path base) throws Exception {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    88
        //note: avoiding use of java.base, as that gets special handling on some places:
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    89
        Path src = base.resolve("src");
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    90
        Path m1 = src.resolve("m1");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    91
        tb.writeJavaFiles(m1, "package javax.lang.model.element; public interface Extra extends Element { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    92
        Path m2 = src.resolve("m2");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    93
        tb.writeJavaFiles(m2, "package com.sun.source.tree; public interface Extra extends Tree { }");
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    94
        Path classes = base.resolve("classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    95
        tb.createDirectories(classes);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    96
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
    97
        String log = new JavacTask(tb)
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    98
                .options("--patch-module", "java.compiler=" + m1.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
    99
                         "--patch-module", "jdk.compiler=" + m2.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   100
                         "--module-source-path", "dummy")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   101
                .outdir(classes)
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   102
                .files(findJavaFiles(src))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   103
                .run()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   104
                .writeAll()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   105
                .getOutput(Task.OutputKind.DIRECT);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   106
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   107
        if (!log.isEmpty())
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   108
            throw new Exception("expected output not found: " + log);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   109
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   110
        checkFileExists(classes, "java.compiler/javax/lang/model/element/Extra.class");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   111
        checkFileExists(classes, "jdk.compiler/com/sun/source/tree/Extra.class");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   112
    }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   113
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   114
    @Test
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   115
    public void testCorrectModulePatchMultiModule2(Path base) throws Exception {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   116
        //note: avoiding use of java.base, as that gets special handling on some places:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   117
        Path src = base.resolve("src");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   118
        Path m1 = src.resolve("m1");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   119
        tb.writeJavaFiles(m1,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   120
                          "package javax.lang.model.element; public interface Extra extends Element { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   121
        Path m2 = src.resolve("m2");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   122
        tb.writeJavaFiles(m2,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   123
                          "package com.sun.source.tree; public interface Extra extends Tree { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   124
        Path msp = base.resolve("msp");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   125
        Path m3 = msp.resolve("m3x");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   126
        tb.writeJavaFiles(m3,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   127
                          "module m3x { }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   128
                          "package m3; public class Test { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   129
        Path m4 = msp.resolve("m4x");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   130
        tb.writeJavaFiles(m4,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   131
                          "module m4x { }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   132
                          "package m4; public class Test { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   133
        Path classes = base.resolve("classes");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   134
        tb.createDirectories(classes);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   135
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   136
        String log = new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   137
                .options("--patch-module", "java.compiler=" + m1.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   138
                         "--patch-module", "jdk.compiler=" + m2.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   139
                         "--module-source-path", msp.toString())
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   140
                .outdir(classes)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   141
                .files(findJavaFiles(src, msp))
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   142
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   143
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   144
                .getOutput(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   145
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   146
        if (!log.isEmpty())
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   147
            throw new Exception("expected output not found: " + log);
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   148
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   149
        checkFileExists(classes, "java.compiler/javax/lang/model/element/Extra.class");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   150
        checkFileExists(classes, "jdk.compiler/com/sun/source/tree/Extra.class");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   151
        checkFileExists(classes, "m3x/m3/Test.class");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   152
        checkFileExists(classes, "m4x/m4/Test.class");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   153
    }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   154
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   155
    @Test
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   156
    public void testPatchModuleModuleSourcePathConflict(Path base) throws Exception {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   157
        //note: avoiding use of java.base, as that gets special handling on some places:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   158
        Path src = base.resolve("src");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   159
        Path m1 = src.resolve("m1x");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   160
        tb.writeJavaFiles(m1,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   161
                          "module m1x { }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   162
                          "package m1; public class Test { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   163
        Path m2 = src.resolve("m2x");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   164
        tb.writeJavaFiles(m2,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   165
                          "module m2x { }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   166
                          "package m2; public class Test { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   167
        Path classes = base.resolve("classes");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   168
        tb.createDirectories(classes);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   169
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   170
        List<String> log = new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   171
                .options("--patch-module", "m1x=" + m2.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   172
                         "--module-source-path", src.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   173
                         "-XDrawDiagnostics")
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   174
                .outdir(classes)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   175
                .files(findJavaFiles(src.resolve("m1x").resolve("m1"),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   176
                                     src.resolve("m2x").resolve("m2")))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   177
                .run(Expect.FAIL)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   178
                .writeAll()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   179
                .getOutputLines(Task.OutputKind.DIRECT);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   180
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   181
        List<String> expectedOut = Arrays.asList(
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   182
                "Test.java:1:1: compiler.err.file.patched.and.msp: m1x, m2x",
44289
842ccb558d7d 8175057: module-info on patch path should not produce an error
jlahoda
parents: 43772
diff changeset
   183
                "module-info.java:1:1: compiler.err.module.name.mismatch: m2x, m1x",
842ccb558d7d 8175057: module-info on patch path should not produce an error
jlahoda
parents: 43772
diff changeset
   184
                "- compiler.err.cant.access: m1x.module-info, (compiler.misc.cant.resolve.modules)",
842ccb558d7d 8175057: module-info on patch path should not produce an error
jlahoda
parents: 43772
diff changeset
   185
                "3 errors"
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   186
        );
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   187
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   188
        if (!expectedOut.equals(log))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   189
            throw new Exception("expected output not found: " + log);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   190
    }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   191
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   192
    @Test
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   193
    public void testSourcePath(Path base) throws Exception {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   194
        //note: avoiding use of java.base, as that gets special handling on some places:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   195
        Path src = base.resolve("src");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   196
        tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, Other { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   197
        Path srcPath = base.resolve("src-path");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   198
        tb.writeJavaFiles(srcPath, "package javax.lang.model.element; interface Other { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   199
        Path classes = base.resolve("classes");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   200
        tb.createDirectories(classes);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   201
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   202
        List<String> log = new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   203
                .options("--patch-module", "java.compiler=" + src.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   204
                         "-sourcepath", srcPath.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   205
                         "-XDrawDiagnostics")
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   206
                .outdir(classes)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   207
                .files(src.resolve("javax/lang/model/element/Extra.java"))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   208
                .run(Expect.FAIL)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   209
                .writeAll()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   210
                .getOutputLines(Task.OutputKind.DIRECT);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   211
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   212
        List<String> expectedOut = Arrays.asList(
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   213
                "Extra.java:1:75: compiler.err.cant.resolve: kindname.class, Other, , ",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   214
                "1 error"
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   215
        );
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   216
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   217
        if (!expectedOut.equals(log))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   218
            throw new Exception("expected output not found: " + log);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   219
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   220
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   221
    @Test
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   222
    public void testClassPath(Path base) throws Exception {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   223
        Path cpSrc = base.resolve("cpSrc");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   224
        tb.writeJavaFiles(cpSrc, "package p; public interface Other { }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   225
        Path cpClasses = base.resolve("cpClasses");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   226
        tb.createDirectories(cpClasses);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   227
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   228
        String cpLog = new JavacTask(tb)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   229
                .outdir(cpClasses)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   230
                .files(findJavaFiles(cpSrc))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   231
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   232
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   233
                .getOutput(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   234
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   235
        if (!cpLog.isEmpty())
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   236
            throw new Exception("expected output not found: " + cpLog);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   237
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   238
        Path src = base.resolve("src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   239
        //note: avoiding use of java.base, as that gets special handling on some places:
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   240
        tb.writeJavaFiles(src, "package javax.lang.model.element; public interface Extra extends Element, p.Other { }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   241
        Path classes = base.resolve("classes");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   242
        tb.createDirectories(classes);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   243
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   244
        List<String> log = new JavacTask(tb)
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   245
                .options("--patch-module", "java.compiler=" + src.toString(),
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   246
                         "--class-path", cpClasses.toString(),
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   247
                         "-XDrawDiagnostics")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   248
                .outdir(classes)
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   249
                .files(src.resolve("javax/lang/model/element/Extra.java"))
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   250
                .run(Expect.FAIL)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   251
                .writeAll()
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   252
                .getOutputLines(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   253
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   254
        List<String> expectedOut = Arrays.asList(
49579
fce4252d5227 8189765: Improve error reporting for compiling against package not visible due to modules
jlahoda
parents: 47216
diff changeset
   255
                "Extra.java:1:75: compiler.err.package.not.visible: p, (compiler.misc.not.def.access.does.not.read.unnamed: p, java.compiler)",
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   256
                "1 error"
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   257
        );
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   258
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   259
        if (!expectedOut.equals(log))
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   260
            throw new Exception("expected output not found: " + log);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   261
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   262
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   263
    @Test
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   264
    public void testWithModulePath(Path base) throws Exception {
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   265
        Path modSrc = base.resolve("modSrc");
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   266
        Path modules = base.resolve("modules");
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   267
        new ModuleBuilder(tb, "m1")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   268
                .classes("package pkg1; public interface E { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   269
                .build(modSrc, modules);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   270
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   271
        Path src = base.resolve("src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   272
        tb.writeJavaFiles(src, "package p; interface A extends pkg1.E { }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   273
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   274
        new JavacTask(tb, Task.Mode.CMDLINE)
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   275
                .options("--module-path", modules.toString(),
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   276
                        "--patch-module", "m1=" + src.toString())
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   277
                .files(findJavaFiles(src))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   278
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   279
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   280
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   281
        //checks module bounds still exist
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   282
        new ModuleBuilder(tb, "m2")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   283
                .classes("package pkg2; public interface D { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   284
                .build(modSrc, modules);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   285
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   286
        Path src2 = base.resolve("src2");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   287
        tb.writeJavaFiles(src2, "package p; interface A extends pkg2.D { }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   288
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   289
        List<String> log = new JavacTask(tb, Task.Mode.CMDLINE)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   290
                .options("-XDrawDiagnostics",
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   291
                        "--module-path", modules.toString(),
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   292
                        "--patch-module", "m1=" + src2.toString())
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   293
                .files(findJavaFiles(src2))
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   294
                .run(Task.Expect.FAIL)
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   295
                .writeAll()
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   296
                .getOutputLines(Task.OutputKind.DIRECT);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   297
43138
680d378b9d64 8169197: Improve error reporting for compiling against unexported package
jlahoda
parents: 41938
diff changeset
   298
        List<String> expected = Arrays.asList("A.java:1:32: compiler.err.package.not.visible: pkg2, (compiler.misc.not.def.access.does.not.read: m1, pkg2, m2)",
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   299
                "1 error");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   300
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   301
        if (!expected.equals(log))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   302
            throw new Exception("expected output not found: " + log);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   303
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   304
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   305
    @Test
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   306
    public void testWithUpgradeModulePath(Path base) throws Exception {
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   307
        Path modSrc = base.resolve("modSrc");
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   308
        Path modules = base.resolve("modules");
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   309
        new ModuleBuilder(tb, "m1")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   310
                .classes("package pkg1; public interface E { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   311
                .build(modSrc, modules);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   312
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   313
        Path upgrSrc = base.resolve("upgradeSrc");
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   314
        Path upgrade = base.resolve("upgrade");
37758
3ecf9b414e05 8155774: move code from ModuleTestBase to toolbox
jjg
parents: 36778
diff changeset
   315
        new ModuleBuilder(tb, "m1")
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   316
                .classes("package pkg1; public interface D { }")
39103
91a64ec5b970 8159749: Update toolbox ModuleBuilder for doc comments
jjg
parents: 37758
diff changeset
   317
                .build(upgrSrc, upgrade);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   318
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   319
        Path src = base.resolve("src");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   320
        tb.writeJavaFiles(src, "package p; interface A extends pkg1.D { }");
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   321
36778
e04318f39f92 8152897: refactor ToolBox to allow reduced documented dependencies
jjg
parents: 36526
diff changeset
   322
        new JavacTask(tb, Task.Mode.CMDLINE)
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   323
                .options("--module-path", modules.toString(),
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 39103
diff changeset
   324
                        "--upgrade-module-path", upgrade.toString(),
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   325
                        "--patch-module", "m1=" + src.toString())
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   326
                .files(findJavaFiles(src))
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   327
                .run()
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   328
                .writeAll();
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   329
    }
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   330
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   331
    @Test
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   332
    public void testUnnamedIsolation(Path base) throws Exception {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   333
        //note: avoiding use of java.base, as that gets special handling on some places:
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   334
        Path sourcePath = base.resolve("source-path");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   335
        tb.writeJavaFiles(sourcePath, "package src; public class Src {}");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   336
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   337
        Path classPathSrc = base.resolve("class-path-src");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   338
        tb.writeJavaFiles(classPathSrc, "package cp; public class CP { }");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   339
        Path classPath = base.resolve("classPath");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   340
        tb.createDirectories(classPath);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   341
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   342
        String cpLog = new JavacTask(tb)
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   343
                .outdir(classPath)
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   344
                .files(findJavaFiles(classPathSrc))
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   345
                .run()
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   346
                .writeAll()
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   347
                .getOutput(Task.OutputKind.DIRECT);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   348
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   349
        if (!cpLog.isEmpty())
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   350
            throw new Exception("expected output not found: " + cpLog);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   351
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   352
        Path modulePathSrc = base.resolve("module-path-src");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   353
        tb.writeJavaFiles(modulePathSrc,
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   354
                          "module m {}",
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   355
                          "package m; public class M {}");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   356
        Path modulePath = base.resolve("modulePath");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   357
        tb.createDirectories(modulePath.resolve("m"));
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   358
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   359
        String modLog = new JavacTask(tb)
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   360
                .outdir(modulePath.resolve("m"))
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   361
                .files(findJavaFiles(modulePathSrc))
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   362
                .run()
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   363
                .writeAll()
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   364
                .getOutput(Task.OutputKind.DIRECT);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   365
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   366
        if (!modLog.isEmpty())
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   367
            throw new Exception("expected output not found: " + modLog);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   368
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   369
        Path src = base.resolve("src");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   370
        tb.writeJavaFiles(src, "package m; public class Extra { }");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   371
        Path classes = base.resolve("classes");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   372
        tb.createDirectories(classes);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   373
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   374
        String log = new JavacTask(tb)
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   375
                .options("--patch-module", "m=" + sourcePath.toString(),
40768
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   376
                         "--class-path", classPath.toString(),
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   377
                         "--source-path", sourcePath.toString(),
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   378
                         "--module-path", modulePath.toString(),
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   379
                         "--processor-path", System.getProperty("test.classes"),
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   380
                         "-XDaccessInternalAPI=true",
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   381
                         "-processor", CheckModuleContentProcessing.class.getName())
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   382
                .outdir(classes)
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   383
                .files(findJavaFiles(sourcePath))
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   384
                .run()
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   385
                .writeAll()
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   386
                .getOutput(Task.OutputKind.DIRECT);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   387
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   388
        if (!log.isEmpty())
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   389
            throw new Exception("expected output not found: " + log);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   390
    }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   391
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   392
    @SupportedAnnotationTypes("*")
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   393
    public static final class CheckModuleContentProcessing extends AbstractProcessor {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   394
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   395
        @Override
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   396
        public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   397
            Symtab syms = Symtab.instance(((JavacProcessingEnvironment) processingEnv).getContext());
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   398
            Elements elements = processingEnv.getElementUtils();
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   399
            ModuleElement unnamedModule = syms.unnamedModule;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   400
            ModuleElement mModule = elements.getModuleElement("m");
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   401
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   402
            assertNonNull("mModule found", mModule);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   403
            assertNonNull("src.Src from m", elements.getTypeElement(mModule, "src.Src"));
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   404
            assertNull("cp.CP not from m", elements.getTypeElement(mModule, "cp.CP"));
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   405
            assertNull("src.Src not from unnamed", elements.getTypeElement(unnamedModule, "src.Src"));
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   406
            assertNonNull("cp.CP from unnamed", elements.getTypeElement(unnamedModule, "cp.CP"));
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   407
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   408
            return false;
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   409
        }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   410
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   411
        @Override
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   412
        public SourceVersion getSupportedSourceVersion() {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   413
            return SourceVersion.latest();
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   414
        }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   415
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   416
        private static void assertNonNull(String msg, Object val) {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   417
            if (val == null) {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   418
                throw new AssertionError(msg);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   419
            }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   420
        }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   421
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   422
        private static void assertNull(String msg, Object val) {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   423
            if (val != null) {
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   424
                throw new AssertionError(msg);
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   425
            }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   426
        }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   427
    }
8b6a878d8773 8165008: javac -Xmodule compiles the module in a way that reads the unnamed module
jlahoda
parents: 40604
diff changeset
   428
43772
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   429
    @Test
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   430
    public void testSingleModeIncremental(Path base) throws Exception {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   431
        //note: avoiding use of java.base, as that gets special handling on some places:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   432
        Path src = base.resolve("src");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   433
        tb.writeJavaFiles(src,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   434
                          "package javax.lang.model.element; public interface Extra extends Element { }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   435
                          "package javax.lang.model.element; public interface Extra2 extends Extra { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   436
        Path classes = base.resolve("classes");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   437
        tb.createDirectories(classes);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   438
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   439
        Thread.sleep(2000); //ensure newer timestamps on classfiles:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   440
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   441
        new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   442
            .options("--patch-module", "java.compiler=" + src.toString())
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   443
            .outdir(classes)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   444
            .files(findJavaFiles(src))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   445
            .run()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   446
            .writeAll()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   447
            .getOutput(Task.OutputKind.DIRECT);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   448
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   449
        List<String> log = new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   450
            .options("--patch-module", "java.compiler=" + src.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   451
                     "-verbose")
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   452
            .outdir(classes)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   453
            .files(findJavaFiles(src.resolve("javax/lang/model/element/Extra2.java"
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   454
                                    .replace("/", src.getFileSystem().getSeparator()))))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   455
            .run()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   456
            .writeAll()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   457
            .getOutputLines(Task.OutputKind.DIRECT)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   458
            .stream()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   459
            .filter(l -> l.contains("parsing"))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   460
            .collect(Collectors.toList());
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   461
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   462
        boolean parsesExtra2 = log.stream()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   463
                                  .anyMatch(l -> l.contains("Extra2.java"));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   464
        boolean parsesExtra = log.stream()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   465
                              .anyMatch(l -> l.contains("Extra.java"));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   466
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   467
        if (!parsesExtra2 || parsesExtra) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   468
            throw new AssertionError("Unexpected output: " + log);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   469
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   470
    }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   471
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   472
    @Test
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   473
    public void testComplexMSPAndPatch(Path base) throws Exception {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   474
        //note: avoiding use of java.base, as that gets special handling on some places:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   475
        Path src1 = base.resolve("src1");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   476
        Path src1ma = src1.resolve("ma");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   477
        tb.writeJavaFiles(src1ma,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   478
                          "module ma { exports ma; }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   479
                          "package ma; public class C1 { public static void method() { } }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   480
                          "package ma.impl; public class C2 { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   481
        Path src1mb = src1.resolve("mb");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   482
        tb.writeJavaFiles(src1mb,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   483
                          "module mb { requires ma; }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   484
                          "package mb.impl; public class C2 { public static void method() { } }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   485
        Path src1mc = src1.resolve("mc");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   486
        tb.writeJavaFiles(src1mc,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   487
                          "module mc { }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   488
        Path classes1 = base.resolve("classes1");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   489
        tb.createDirectories(classes1);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   490
        tb.cleanDirectory(classes1);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   491
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   492
        new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   493
            .options("--module-source-path", src1.toString())
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   494
            .files(findJavaFiles(src1))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   495
            .outdir(classes1)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   496
            .run()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   497
            .writeAll();
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   498
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   499
        //patching:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   500
        Path src2 = base.resolve("src2");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   501
        Path src2ma = src2.resolve("ma");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   502
        tb.writeJavaFiles(src2ma,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   503
                          "package ma.impl; public class C2 { public static void extra() { ma.C1.method(); } }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   504
                          "package ma.impl; public class C3 { public void test() { C2.extra(); } }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   505
        Path src2mb = src2.resolve("mb");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   506
        tb.writeJavaFiles(src2mb,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   507
                          "package mb.impl; public class C3 { public void test() { C2.method(); ma.C1.method(); ma.impl.C2.extra(); } }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   508
        Path src2mc = src2.resolve("mc");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   509
        tb.writeJavaFiles(src2mc,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   510
                          "package mc.impl; public class C2 { public static void test() { } }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   511
                          //will require --add-reads ma:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   512
                          "package mc.impl; public class C3 { public static void test() { ma.impl.C2.extra(); } }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   513
        Path src2mt = src2.resolve("mt");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   514
        tb.writeJavaFiles(src2mt,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   515
                          "module mt { requires ma; requires mb; }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   516
                          "package mt.impl; public class C2 { public static void test() { mb.impl.C2.method(); ma.impl.C2.extra(); } }",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   517
                          "package mt.impl; public class C3 { public static void test() { C2.test(); mc.impl.C2.test(); } }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   518
        Path classes2 = base.resolve("classes2");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   519
        tb.createDirectories(classes2);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   520
        tb.cleanDirectory(classes2);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   521
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   522
        Thread.sleep(2000); //ensure newer timestamps on classfiles:
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   523
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   524
        new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   525
            .options("--module-path", classes1.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   526
                     "--patch-module", "ma=" + src2ma.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   527
                     "--patch-module", "mb=" + src2mb.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   528
                     "--add-exports", "ma/ma.impl=mb",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   529
                     "--patch-module", "mc=" + src2mc.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   530
                     "--add-reads", "mc=ma",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   531
                     "--add-exports", "ma/ma.impl=mc",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   532
                     "--add-exports", "ma/ma.impl=mt",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   533
                     "--add-exports", "mb/mb.impl=mt",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   534
                     "--add-exports", "mc/mc.impl=mt",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   535
                     "--add-reads", "mt=mc",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   536
                     "--module-source-path", src2.toString())
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   537
            .outdir(classes2)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   538
            .files(findJavaFiles(src2))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   539
            .run()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   540
            .writeAll();
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   541
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   542
        //incremental compilation (C2 mustn't be compiled, C3 must):
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   543
        tb.writeJavaFiles(src2ma,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   544
                          "package ma.impl; public class C3 { public void test() { ma.C1.method(); C2.extra(); } }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   545
        tb.writeJavaFiles(src2mt,
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   546
                          "package mt.impl; public class C3 { public static void test() { mc.impl.C2.test(); C2.test(); } }");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   547
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   548
        List<String> log = new JavacTask(tb)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   549
            .options("--module-path", classes1.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   550
                     "--patch-module", "ma=" + src2ma.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   551
                     "--patch-module", "mb=" + src2mb.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   552
                     "--add-exports", "ma/ma.impl=mb",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   553
                     "--patch-module", "mc=" + src2mc.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   554
                     "--add-reads", "mc=ma",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   555
                     "--add-exports", "ma/ma.impl=mc",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   556
                     "--add-exports", "ma/ma.impl=mt",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   557
                     "--add-exports", "mb/mb.impl=mt",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   558
                     "--add-exports", "mc/mc.impl=mt",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   559
                     "--add-reads", "mt=mc",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   560
                     "--module-source-path", src2.toString(),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   561
                     "--add-modules", "mc",
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   562
                     "-verbose")
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   563
            .outdir(classes2)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   564
            .files(src2ma.resolve("ma").resolve("impl").resolve("C3.java"),
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   565
                   src2mt.resolve("mt").resolve("impl").resolve("C3.java"))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   566
            .run()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   567
            .writeAll()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   568
            .getOutputLines(Task.OutputKind.DIRECT)
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   569
            .stream()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   570
            .filter(l -> l.contains("parsing"))
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   571
            .collect(Collectors.toList());
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   572
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   573
        boolean parsesC3 = log.stream()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   574
                              .anyMatch(l -> l.contains("C3.java"));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   575
        boolean parsesC2 = log.stream()
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   576
                              .anyMatch(l -> l.contains("C2.java"));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   577
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   578
        if (!parsesC3 || parsesC2) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   579
            throw new AssertionError("Unexpected output: " + log);
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   580
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   581
    }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   582
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   583
    private void checkFileExists(Path dir, String path) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   584
        Path toCheck = dir.resolve(path.replace("/", dir.getFileSystem().getSeparator()));
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   585
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   586
        if (!Files.exists(toCheck)) {
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   587
            throw new AssertionError(toCheck.toString() + " does not exist!");
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   588
        }
4e5350b7be75 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 43138
diff changeset
   589
    }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   590
}