test/jdk/tools/launcher/modules/addexports/AddExportsTest.java
author lancea
Fri, 12 Oct 2018 14:16:24 -0400
changeset 52111 367b2cd49ec5
parent 51675 b487c1e914d0
permissions -rw-r--r--
8212045: Add back tests removed from HashesTest.java and AddExportsTest.java Reviewed-by: rriggs
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
48841
0937e5f799df 8190378: Removal of CORBA and Java EE modules
lancea
parents: 47216
diff changeset
     2
 * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     4
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     7
 * published by the Free Software Foundation.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     8
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    13
 * accompanied this code).
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    14
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    18
 *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    21
 * questions.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    22
 */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    23
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    24
/**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    25
 * @test
51675
b487c1e914d0 8210112: remove jdk.testlibrary.ProcessTools
iignatyev
parents: 48841
diff changeset
    26
 * @library /test/lib
52111
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    27
 * @modules java.compiler
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    28
 *          jdk.compiler
51675
b487c1e914d0 8210112: remove jdk.testlibrary.ProcessTools
iignatyev
parents: 48841
diff changeset
    29
 * @build AddExportsTest jdk.test.lib.compiler.CompilerUtils
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    30
 * @run testng AddExportsTest
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
    31
 * @summary Basic tests for java --add-exports
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    32
 */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    33
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    34
import java.nio.file.Path;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    35
import java.nio.file.Paths;
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
    36
import java.util.stream.Stream;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    37
45393
de4e1efc8eec 8181335: remove packageless CompilerUtils
iignatyev
parents: 42338
diff changeset
    38
import jdk.test.lib.compiler.CompilerUtils;
51675
b487c1e914d0 8210112: remove jdk.testlibrary.ProcessTools
iignatyev
parents: 48841
diff changeset
    39
import jdk.test.lib.process.OutputAnalyzer;
b487c1e914d0 8210112: remove jdk.testlibrary.ProcessTools
iignatyev
parents: 48841
diff changeset
    40
import static jdk.test.lib.process.ProcessTools.*;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    41
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    42
import org.testng.annotations.BeforeTest;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    43
import org.testng.annotations.DataProvider;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    44
import org.testng.annotations.Test;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    45
import static org.testng.Assert.*;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    46
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    47
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    48
@Test
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    49
public class AddExportsTest {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    50
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    51
    private static final String TEST_SRC = System.getProperty("test.src");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    52
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    53
    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    54
    private static final Path MODS_DIR = Paths.get("mods");
52111
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    55
    private static final Path UPGRADE_MODS_DIRS = Paths.get("upgrademods");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    56
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    57
    // test module m1 that uses Unsafe
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    58
    private static final String TEST1_MODULE = "m1";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    59
    private static final String TEST1_MAIN_CLASS = "jdk.test1.Main";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    60
52111
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    61
    // test module m2 uses java.compiler internals
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    62
    private static final String TEST2_MODULE = "m2";
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    63
    private static final String TEST2_MAIN_CLASS = "jdk.test2.Main";
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    64
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    65
    // test module m3 uses m4 internals
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    66
    private static final String TEST3_MODULE = "m3";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    67
    private static final String TEST3_MAIN_CLASS = "jdk.test3.Main";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    68
    private static final String TEST4_MODULE = "m4";
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    69
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    70
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    71
    @BeforeTest
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    72
    public void compileTestModules() throws Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    73
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    74
        // javac -d mods/m1 src/m1/**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    75
        boolean compiled = CompilerUtils.compile(
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    76
                SRC_DIR.resolve(TEST1_MODULE),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    77
                MODS_DIR.resolve(TEST1_MODULE),
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
    78
                "--add-exports", "java.base/jdk.internal.misc=m1");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    79
        assertTrue(compiled, "module " + TEST1_MODULE + " did not compile");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    80
52111
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    81
        // javac -d upgrademods/java.compiler src/java.compiler/**
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    82
        compiled = CompilerUtils.compile(
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    83
                SRC_DIR.resolve("java.compiler"),
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    84
                UPGRADE_MODS_DIRS.resolve("java.compiler"));
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    85
        assertTrue(compiled, "module java.compiler did not compile");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    86
52111
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    87
        // javac --upgrade-module-path upgrademods -d mods/m2 src/m2/**
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    88
        compiled = CompilerUtils.compile(
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    89
                SRC_DIR.resolve(TEST2_MODULE),
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    90
                MODS_DIR.resolve(TEST2_MODULE),
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    91
                "--upgrade-module-path", UPGRADE_MODS_DIRS.toString(),
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    92
                "--add-exports", "java.compiler/javax.tools.internal=m2");
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
    93
        assertTrue(compiled, "module " + TEST2_MODULE + " did not compile");
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    94
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    95
        // javac -d mods/m3 src/m3/**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    96
        compiled = CompilerUtils.compile(
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    97
                SRC_DIR.resolve(TEST3_MODULE),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    98
                MODS_DIR.resolve(TEST3_MODULE));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    99
        assertTrue(compiled, "module " + TEST3_MODULE + " did not compile");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   100
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   101
        // javac -d mods/m4 src/m4/**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   102
        compiled = CompilerUtils.compile(
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   103
                SRC_DIR.resolve(TEST4_MODULE),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   104
                MODS_DIR.resolve(TEST4_MODULE));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   105
        assertTrue(compiled, "module " + TEST4_MODULE + " did not compile");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   106
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   107
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   108
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   109
     * Sanity check with -version
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   110
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   111
    public void testSanity() throws Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   112
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   113
        int exitValue
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   114
            =  executeTestJava("--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   115
                               "-version")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   116
                .outputTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   117
                .errorTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   118
                .getExitValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   119
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   120
        assertTrue(exitValue == 0);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   121
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   122
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   123
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   124
    /**
36966
4209c9e19c45 8153737: Unsupported Module
chegar
parents: 36511
diff changeset
   125
     * Run class path application that uses jdk.internal.misc.Unsafe
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   126
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   127
    public void testUnnamedModule() throws Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   128
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   129
        // java --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   130
        //      -cp mods/$TESTMODULE jdk.test.UsesUnsafe
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   131
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   132
        String classpath = MODS_DIR.resolve(TEST1_MODULE).toString();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   133
        int exitValue
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   134
            = executeTestJava("--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED",
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   135
                              "-cp", classpath,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   136
                              TEST1_MAIN_CLASS)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   137
                .outputTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   138
                .errorTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   139
                .getExitValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   140
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   141
        assertTrue(exitValue == 0);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   142
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   143
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   144
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   145
    /**
36966
4209c9e19c45 8153737: Unsupported Module
chegar
parents: 36511
diff changeset
   146
     * Run named module that uses jdk.internal.misc.Unsafe
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   147
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   148
    public void testNamedModule() throws Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   149
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   150
        //  java --add-exports java.base/jdk.internal.misc=test \
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   151
        //       --module-path mods -m $TESTMODULE/$MAIN_CLASS
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   152
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   153
        String mid = TEST1_MODULE + "/" + TEST1_MAIN_CLASS;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   154
        int exitValue =
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   155
            executeTestJava("--add-exports", "java.base/jdk.internal.misc=" + TEST1_MODULE,
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   156
                            "--module-path", MODS_DIR.toString(),
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   157
                            "-m", mid)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   158
                .outputTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   159
                .errorTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   160
                .getExitValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   161
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   162
        assertTrue(exitValue == 0);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   163
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   164
52111
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   165
    /**
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   166
     * Test --add-exports with upgraded module
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   167
     */
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   168
    public void testWithUpgradedModule() throws Exception {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   169
52111
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   170
        // java --add-exports java.compiler/javax.tools.internal=m2
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   171
        //      --upgrade-module-path upgrademods --module-path mods -m ...
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   172
        String mid = TEST2_MODULE + "/" + TEST2_MAIN_CLASS;
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   173
        int exitValue = executeTestJava(
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   174
                "--add-exports", "java.compiler/javax.tools.internal=m2",
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   175
                "--upgrade-module-path", UPGRADE_MODS_DIRS.toString(),
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   176
                "--module-path", MODS_DIR.toString(),
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   177
                "-m", mid)
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   178
                .outputTo(System.out)
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   179
                .errorTo(System.out)
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   180
                .getExitValue();
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   181
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   182
        assertTrue(exitValue == 0);
367b2cd49ec5 8212045: Add back tests removed from HashesTest.java and AddExportsTest.java
lancea
parents: 51675
diff changeset
   183
    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   184
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   185
    /**
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   186
     * Test --add-exports with module that is added to the set of root modules
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   187
     * with --add-modules.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   188
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   189
    public void testWithAddMods() throws Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   190
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   191
        // java --add-exports m4/jdk.test4=m3 --module-path mods -m ...
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   192
        String mid = TEST3_MODULE + "/" + TEST3_MAIN_CLASS;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   193
        int exitValue = executeTestJava(
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   194
                "--add-exports", "m4/jdk.test4=m3",
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   195
                "--module-path", MODS_DIR.toString(),
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   196
                "--add-modules", TEST4_MODULE,
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   197
                "-m", mid)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   198
                .outputTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   199
                .errorTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   200
                .getExitValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   201
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   202
        assertTrue(exitValue == 0);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   203
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   204
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   205
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   206
    /**
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   207
     * --add-exports and --add-opens allows duplicates
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   208
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   209
    public void testWithDuplicateOption() throws Exception {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   210
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   211
        int exitValue
40261
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   212
            =  executeTestJava("--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
86a49ba76f52 8136930: Simplify use of module-system options by custom launchers
mchung
parents: 37363
diff changeset
   213
                               "--add-exports", "java.base/jdk.internal.reflect=ALL-UNNAMED",
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   214
                               "--add-opens", "java.base/java.util=ALL-UNNAMED",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   215
                               "--add-opens", "java.base/java.util=ALL-UNNAMED",
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   216
                               "-version")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   217
                .outputTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   218
                .errorTo(System.out)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   219
                .getExitValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   220
41414
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   221
        assertTrue(exitValue == 0);
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   222
    }
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   223
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   224
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   225
    private OutputAnalyzer execJava(String... options) {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   226
        try {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   227
            return executeTestJava(options);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   228
        } catch (Exception e) {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   229
            throw new Error(e);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   230
        }
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   231
    }
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   232
41414
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   233
    /**
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   234
     * Exercise --add-exports and --add-opens with unknown values.
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   235
     * Warning is emitted.
41414
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   236
     */
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   237
    @Test(dataProvider = "unknownvalues")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   238
    public void testWithUnknownValue(String value, String ignore) {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   239
        Stream.of("--add-exports", "--add-opens")
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   240
            .forEach(option -> {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   241
                //  --add-exports $VALUE -version
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   242
                int exitValue = execJava(option, value, "-version")
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   243
                    .stderrShouldMatch("WARNING: .*.monkey.*")
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   244
                    .outputTo(System.out)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   245
                    .errorTo(System.out)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   246
                    .getExitValue();
41414
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   247
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   248
                assertTrue(exitValue == 0);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   249
            });
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   250
    }
41414
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   251
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   252
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   253
    @DataProvider(name = "unknownvalues")
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   254
    public Object[][] unknownValues() {
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   255
        return new Object[][]{
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   256
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   257
            { "java.base/jdk.internal.misc=sun.monkey", null }, // unknown target
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   258
            { "java.monkey/sun.monkey=ALL-UNNAMED",     null }, // unknown module
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   259
            { "java.base/sun.monkey=ALL-UNNAMED",       null }, // unknown package
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   260
            { "java.monkey/sun.monkey=ALL-UNNAMED",     null }, // unknown module/package
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   261
7fd4548e9733 8162401: Support multiple --add-exports and --add-reads with the same module/package
mchung
parents: 40261
diff changeset
   262
        };
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   263
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   264
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   265
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   266
    /**
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   267
     * Exercise --add-exports and --add-opens with bad values
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   268
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   269
    @Test(dataProvider = "badvalues")
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   270
    public void testWithBadValue(String value, String ignore) {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   271
        Stream.of("--add-exports", "--add-opens")
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   272
            .forEach(option -> {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   273
                //  --add-exports $VALUE -version
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   274
                int exitValue = execJava(option, value, "-version")
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   275
                    .outputTo(System.out)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   276
                    .errorTo(System.out)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   277
                    .getExitValue();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   278
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   279
        assertTrue(exitValue != 0);
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41414
diff changeset
   280
            });
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   281
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   282
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   283
    @DataProvider(name = "badvalues")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   284
    public Object[][] badValues() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   285
        return new Object[][]{
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   286
36966
4209c9e19c45 8153737: Unsupported Module
chegar
parents: 36511
diff changeset
   287
            { "java.base/jdk.internal.misc",            null }, // missing target
4209c9e19c45 8153737: Unsupported Module
chegar
parents: 36511
diff changeset
   288
            { "java.base=ALL-UNNAMED",                  null }, // missing package
4209c9e19c45 8153737: Unsupported Module
chegar
parents: 36511
diff changeset
   289
            { "java.base/=ALL-UNNAMED",                 null }  // missing package
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   290
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   291
        };
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   292
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   293
}