test/langtools/tools/javac/modules/JavaBaseTest.java
author darcy
Fri, 02 Feb 2018 10:29:25 -0800
changeset 48723 6cb86bf0b51e
parent 48427 b08405cc467a
child 50566 c0b896fc3f08
permissions -rw-r--r--
8196623: Update JavaBaseTest.java to be version agnostic Reviewed-by: vromero
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     1
/*
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     2
 * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     4
 *
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     7
 * published by the Free Software Foundation.
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     8
 *
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    13
 * accompanied this code).
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    14
 *
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    18
 *
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    21
 * questions.
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    22
 */
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    23
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    24
/**
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    25
 * @test
48723
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
    26
 * @bug 8193125 8196623
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    27
 * @summary test modifiers with java.base
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    28
 * @library /tools/lib
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    29
 * @modules
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    30
 *      jdk.compiler/com.sun.tools.javac.api
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    31
 *      jdk.compiler/com.sun.tools.javac.main
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    32
 *      jdk.jdeps/com.sun.tools.classfile
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    33
 * @build toolbox.ToolBox toolbox.JavacTask
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    34
 * @run main JavaBaseTest
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    35
 */
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    36
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    37
import java.nio.file.Files;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    38
import java.nio.file.Path;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    39
import java.nio.file.Paths;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    40
import java.util.Arrays;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    41
import java.util.LinkedHashMap;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    42
import java.util.List;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    43
import java.util.Map;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    44
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    45
import com.sun.tools.classfile.Attribute;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    46
import com.sun.tools.classfile.Attributes;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    47
import com.sun.tools.classfile.ClassFile;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    48
import com.sun.tools.classfile.ClassWriter;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    49
import com.sun.tools.classfile.Module_attribute;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    50
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    51
import toolbox.JavacTask;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    52
import toolbox.Task;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    53
import toolbox.Task.Expect;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    54
import toolbox.ToolBox;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    55
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    56
public class JavaBaseTest {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    57
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    58
    public static void main(String... args) throws Exception {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    59
        JavaBaseTest t = new JavaBaseTest();
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    60
        t.run();
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    61
    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    62
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    63
    final List<List<String>> modifiers = List.of(
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    64
        List.of("static"),
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    65
        List.of("transitive"),
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    66
        List.of("static", "transitive")
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    67
    );
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    68
48723
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
    69
    final List<String> targets = List.of("9", "10", "current");
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    70
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    71
    enum Mode { SOURCE, CLASS };
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    72
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    73
    ToolBox tb = new ToolBox();
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    74
    int testCount = 0;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    75
    int errorCount = 0;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    76
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    77
    void run() throws Exception {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    78
        for (List<String> mods : modifiers) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    79
            for (String target : targets) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    80
                for (Mode mode : Mode.values()) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    81
                    test(mods, target, mode);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    82
                }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    83
            }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    84
        }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    85
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    86
        System.err.println(testCount + " tests");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    87
        if (errorCount > 0) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    88
            throw new Exception(errorCount + " errors found");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    89
        }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    90
    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    91
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    92
    void test(List<String> mods, String target, Mode mode) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    93
        System.err.println("Test " + mods + " " + target + " " + mode);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    94
        testCount++;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    95
        try {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    96
            Path base = Paths.get(String.join("-", mods))
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    97
                    .resolve(target).resolve(mode.name().toLowerCase());
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    98
            Files.createDirectories(base);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
    99
            switch (mode) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   100
                case SOURCE:
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   101
                    testSource(base, mods, target);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   102
                    break;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   103
                case CLASS:
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   104
                    testClass(base, mods, target);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   105
                    break;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   106
            }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   107
        } catch (Exception e) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   108
            error("Exception: " + e);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   109
            e.printStackTrace();
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   110
        }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   111
        System.err.println();
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   112
    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   113
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   114
    void testSource(Path base, List<String> mods, String target) throws Exception {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   115
        Path src = base.resolve("src");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   116
        tb.writeJavaFiles(src,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   117
                "module m { requires " + String.join(" ", mods) + " java.base; }");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   118
        Path modules = Files.createDirectories(base.resolve("modules"));
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   119
        boolean expectOK = target.equals("9");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   120
48723
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   121
        JavacTask jct = new JavacTask(tb)
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   122
            .outdir(modules);
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   123
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   124
        if (target.equals("current"))
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   125
            jct.options("-XDrawDiagnostics");
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   126
        else
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   127
            jct.options("-XDrawDiagnostics", "--release", target);
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   128
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   129
        String log = jct.files(tb.findJavaFiles(src))
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   130
            .run(expectOK ? Task.Expect.SUCCESS : Task.Expect.FAIL)
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   131
            .writeAll()
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   132
            .getOutput(Task.OutputKind.DIRECT);
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   133
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   134
        if (!expectOK) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   135
            boolean foundErrorMessage = false;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   136
            for (String mod : mods) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   137
                String key = mod.equals("static")
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   138
                    ? "compiler.err.mod.not.allowed.here"
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   139
                    : "compiler.err.modifier.not.allowed.here";
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   140
                String message = "module-info.java:1:12: " + key + ": " + mod;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   141
                if (log.contains(message)) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   142
                    foundErrorMessage = true;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   143
                }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   144
            }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   145
            if (!foundErrorMessage) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   146
                throw new Exception("expected error message not found");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   147
            }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   148
        }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   149
    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   150
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   151
    void testClass(Path base, List<String> mods, String target) throws Exception {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   152
        createClass(base, mods, target);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   153
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   154
        Path src = base.resolve("src");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   155
        tb.writeJavaFiles(src,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   156
                "module mx { requires m; }");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   157
        Path modules = Files.createDirectories(base.resolve("modules"));
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   158
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   159
        boolean expectOK = target.equals("9");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   160
        String log = new JavacTask(tb)
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   161
                .outdir(modules)
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   162
                .options("-XDrawDiagnostics",
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   163
                        "--module-path", base.resolve("test-modules").toString())
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   164
                .files(tb.findJavaFiles(src))
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   165
                .run(expectOK ? Task.Expect.SUCCESS : Task.Expect.FAIL)
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   166
                .writeAll()
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   167
                .getOutput(Task.OutputKind.DIRECT);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   168
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   169
        if (!expectOK) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   170
            boolean foundErrorMessage = false;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   171
            for (String mod : mods) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   172
                String flag = mod.equals("static")
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   173
                    ? "ACC_STATIC_PHASE (0x0040)"
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   174
                    : "ACC_TRANSITIVE (0x0020)";
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   175
                String message = "- compiler.err.cant.access: m.module-info,"
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   176
                        + " (compiler.misc.bad.class.file.header: module-info.class,"
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   177
                        + " (compiler.misc.bad.requires.flag: " + flag + ")";
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   178
                if (log.contains(message)) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   179
                    foundErrorMessage = true;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   180
                }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   181
            }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   182
            if (!foundErrorMessage) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   183
                throw new Exception("expected error message not found");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   184
            }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   185
        }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   186
    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   187
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   188
    void createClass(Path base, List<String> mods, String target) throws Exception {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   189
        Path src1 = base.resolve("interim-src");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   190
        tb.writeJavaFiles(src1,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   191
                "module m { requires java.base; }");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   192
        Path modules1 = Files.createDirectories(base.resolve("interim-modules"));
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   193
48723
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   194
        JavacTask jct = new JavacTask(tb)
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   195
            .outdir(modules1);
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   196
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   197
        if (!target.equals("current")) {
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   198
            jct.options("--release", target);
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   199
        }
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   200
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   201
        jct.files(tb.findJavaFiles(src1))
6cb86bf0b51e 8196623: Update JavaBaseTest.java to be version agnostic
darcy
parents: 48427
diff changeset
   202
            .run(Task.Expect.SUCCESS);
48427
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   203
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   204
        ClassFile cf1 = ClassFile.read(modules1.resolve("module-info.class"));
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   205
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   206
        Map<String,Attribute> attrMap = new LinkedHashMap<>(cf1.attributes.map);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   207
        Module_attribute modAttr1 = (Module_attribute) attrMap.get("Module");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   208
        Module_attribute.RequiresEntry[] requires =
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   209
                new Module_attribute.RequiresEntry[modAttr1.requires_count];
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   210
        for (int i = 0; i < modAttr1.requires_count; i++) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   211
            Module_attribute.RequiresEntry e1 = modAttr1.requires[i];
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   212
            int flags = e1.requires_flags;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   213
            Module_attribute.RequiresEntry e2;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   214
            if (e1.getRequires(cf1.constant_pool).equals("java.base")) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   215
                for (String mod : mods) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   216
                    switch (mod) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   217
                        case "static":
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   218
                            flags |= Module_attribute.ACC_STATIC_PHASE;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   219
                            break;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   220
                        case "transitive":
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   221
                            flags |= Module_attribute.ACC_TRANSITIVE;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   222
                            break;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   223
                    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   224
                }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   225
                e2 = new Module_attribute.RequiresEntry(
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   226
                        e1.requires_index,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   227
                        flags,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   228
                        e1.requires_version_index);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   229
            } else {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   230
                e2 = e1;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   231
            }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   232
            requires[i] = e2;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   233
        }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   234
        Module_attribute modAttr2 = new Module_attribute(
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   235
                modAttr1.attribute_name_index,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   236
                modAttr1.module_name,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   237
                modAttr1.module_flags,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   238
                modAttr1.module_version_index,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   239
                requires,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   240
                modAttr1.exports,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   241
                modAttr1.opens,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   242
                modAttr1.uses_index,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   243
                modAttr1.provides);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   244
        attrMap.put("Module", modAttr2);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   245
        Attributes attributes = new Attributes(attrMap);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   246
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   247
        ClassFile cf2 = new ClassFile(
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   248
                cf1.magic, cf1.minor_version, cf1.major_version,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   249
                cf1.constant_pool, cf1.access_flags,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   250
                cf1.this_class, cf1.super_class, cf1.interfaces,
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   251
                cf1.fields, cf1.methods, attributes);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   252
        Path modInfo = base.resolve("test-modules").resolve("module-info.class");
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   253
        Files.createDirectories(modInfo.getParent());
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   254
        new ClassWriter().write(cf2, modInfo.toFile());
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   255
    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   256
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   257
    private void error(String message) {
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   258
        System.err.println("Error: " + message);
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   259
        errorCount++;
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   260
    }
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   261
}
b08405cc467a 8193125: javac should not compile a module if it requires java.base with modifiers
jjg
parents:
diff changeset
   262