jdk/test/tools/launcher/modules/patch/basic/PatchTestWarningError.java
author alanb
Wed, 22 Mar 2017 16:26:27 +0000
changeset 44359 c6761862ca0b
parent 43734 64b58fc82d90
child 45393 de4e1efc8eec
permissions -rw-r--r--
8174823: Module system implementation refresh (3/2017) Reviewed-by: chegar, mchung, alanb Contributed-by: alan.bateman@oracle.com, mandy.chung@oracle.com, sundararajan.athijegannathan@oracle.com, peter.levart@gmail.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
42774
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     1
/*
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     2
 * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     4
 *
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     7
 * published by the Free Software Foundation.
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     8
 *
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    13
 * accompanied this code).
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    14
 *
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    18
 *
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    21
 * questions.
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    22
 */
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    23
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    24
/**
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    25
 * @test
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    26
 * @bug 8168836
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    27
 * @summary Basic argument validation for --patch-module
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    28
 * @library /lib/testlibrary
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    29
 * @modules jdk.compiler
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    30
 * @build PatchTestWarningError CompilerUtils JarUtils jdk.testlibrary.*
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    31
 * @run testng PatchTestWarningError
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    32
 */
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    33
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    34
import java.io.File;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    35
import java.nio.file.Files;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    36
import java.nio.file.Path;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    37
import java.nio.file.Paths;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    38
import java.util.stream.Collectors;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    39
import java.util.stream.Stream;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    40
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    41
import static jdk.testlibrary.ProcessTools.*;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    42
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    43
import org.testng.annotations.BeforeTest;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    44
import org.testng.annotations.DataProvider;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    45
import org.testng.annotations.Test;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    46
import static org.testng.Assert.*;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    47
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    48
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    49
/**
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    50
 * This test
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    51
 * See PatchTestWarningError for test description.
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    52
 */
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    53
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    54
@Test
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    55
public class PatchTestWarningError {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    56
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    57
    // top-level source directory
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    58
    private static final String TEST_SRC = System.getProperty("test.src");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    59
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    60
    // source/destination tree for the test module
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    61
    private static final Path SRC_DIR = Paths.get(TEST_SRC, "src");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    62
    private static final Path MODS_DIR = Paths.get("mods");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    63
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    64
    // source/destination tree for patch tree 1
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    65
    private static final Path SRC1_DIR = Paths.get(TEST_SRC, "src1");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    66
    private static final Path PATCHES1_DIR = Paths.get("patches1");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    67
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    68
    // source/destination tree for patch tree 2
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    69
    private static final Path SRC2_DIR = Paths.get(TEST_SRC, "src2");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    70
    private static final Path PATCHES2_DIR = Paths.get("patches2");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    71
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    72
    // patch path for java.base
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    73
    private static final String PATCHES_PATH =
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    74
        PATCHES1_DIR.resolve("java.base") + File.pathSeparator +
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    75
            PATCHES2_DIR.resolve("java.base");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    76
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    77
    // the classes overridden or added with --patch-module
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    78
    private static final String[] CLASSES = {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    79
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    80
        // java.base = boot loader
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    81
        "java.base/java.text.Annotation",           // override class
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    82
        "java.base/java.text.AnnotationBuddy",      // add class to package
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    83
        "java.base/java.lang2.Object",              // new package
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    84
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    85
    };
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    86
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    87
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    88
    @BeforeTest
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    89
    public void setup() throws Exception {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    90
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    91
        // javac -d mods/test src/test/**
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    92
        boolean compiled= CompilerUtils.compile(SRC_DIR.resolve("test"),
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    93
                                                MODS_DIR.resolve("test"));
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    94
        assertTrue(compiled, "classes did not compile");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    95
43734
64b58fc82d90 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42774
diff changeset
    96
        // javac --patch-module $MODULE=patches1/$MODULE -d patches1/$MODULE patches1/$MODULE/**
42774
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    97
        Path src = SRC1_DIR.resolve("java.base");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    98
        Path output = PATCHES1_DIR.resolve(src.getFileName());
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
    99
        Files.createDirectories(output);
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   100
        String mn = src.getFileName().toString();
43734
64b58fc82d90 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42774
diff changeset
   101
        compiled  = CompilerUtils.compile(src, output,
64b58fc82d90 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42774
diff changeset
   102
                                          "--patch-module", mn + "=" + src.toString());
42774
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   103
        assertTrue(compiled, "classes did not compile");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   104
43734
64b58fc82d90 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42774
diff changeset
   105
        // javac --patch-module $MODULE=patches2/$MODULE -d patches2/$MODULE patches2/$MODULE/**
42774
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   106
        src = SRC2_DIR.resolve("java.base");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   107
        output = PATCHES2_DIR.resolve(src.getFileName());
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   108
        Files.createDirectories(output);
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   109
        mn = src.getFileName().toString();
43734
64b58fc82d90 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42774
diff changeset
   110
        compiled  = CompilerUtils.compile(src, output,
64b58fc82d90 8173777: Merge javac -Xmodule into javac--patch-module
jlahoda
parents: 42774
diff changeset
   111
                                          "--patch-module", mn + "=" + src.toString());
42774
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   112
        assertTrue(compiled, "classes did not compile");
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   113
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   114
    }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   115
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   116
    /**
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   117
     * Test with --patch-module options patching the same module
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   118
     */
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   119
    public void testDuplicateModule() throws Exception {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   120
        int exitValue =
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   121
            executeTestJava("--patch-module", "java.base=" + PATCHES1_DIR.resolve("java.base"),
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   122
                            "--patch-module", "java.base=" + PATCHES2_DIR.resolve("java.base"),
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   123
                            "--module-path", MODS_DIR.toString(),
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   124
                            "-m", "test/jdk.test.Main")
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   125
                .outputTo(System.out)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   126
                .errorTo(System.out)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   127
                // error output by VM
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   128
                .shouldContain("Cannot specify java.base more than once to --patch-module")
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   129
                .getExitValue();
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   130
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   131
        assertTrue(exitValue != 0);
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   132
    }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   133
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   134
    @DataProvider(name = "emptyItem")
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   135
    public Object[][] emptyItems() {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   136
        String patch1 = PATCHES1_DIR.resolve("java.base").toString();
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   137
        String patch2 = PATCHES2_DIR.resolve("java.base").toString();
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   138
        String pathSep = File.pathSeparator;
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   139
        return new Object[][]{
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   140
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   141
            { "java.base="+ pathSep + patch1 + pathSep + patch2,            null },
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   142
            { "java.base="+ patch1 + pathSep + pathSep + patch2,            null },
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   143
            { "java.base="+ patch1 + pathSep + patch2 + pathSep + pathSep,  null },
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   144
        };
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   145
    }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   146
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   147
    /**
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   148
     * Empty item in a non-empty path list
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   149
     */
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   150
    @Test(dataProvider = "emptyItem")
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   151
    public void testEmptyItem(String value, String msg) throws Exception {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   152
        // the argument to the test is the list of classes overridden or added
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   153
        String arg = Stream.of(CLASSES).collect(Collectors.joining(","));
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   154
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   155
        int exitValue =
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   156
            executeTestJava("--patch-module", value,
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   157
                            "--add-exports", "java.base/java.lang2=test",
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   158
                            "--module-path", MODS_DIR.toString(),
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   159
                            "-m", "test/jdk.test.Main", arg)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   160
                .outputTo(System.out)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   161
                .errorTo(System.out)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   162
                .getExitValue();
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   163
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   164
        assertTrue(exitValue == 0);
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   165
    }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   166
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   167
    /**
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   168
     * Test bad module name that should emit a warning
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   169
     */
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   170
    public void testBadName() throws Exception {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   171
        // the argument to the test is the list of classes overridden or added
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   172
        String arg = Stream.of(CLASSES).collect(Collectors.joining(","));
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   173
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   174
        int exitValue =
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   175
            executeTestJava("--patch-module", "DoesNotExist=tmp",
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   176
                            "--patch-module", "java.base=" + PATCHES_PATH,
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   177
                            "--add-exports", "java.base/java.lang2=test",
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   178
                            "--module-path", MODS_DIR.toString(),
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   179
                            "-m", "test/jdk.test.Main", arg)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   180
                .outputTo(System.out)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   181
                .errorTo(System.out)
44359
c6761862ca0b 8174823: Module system implementation refresh (3/2017)
alanb
parents: 43734
diff changeset
   182
                .shouldContain("WARNING: Unknown module: DoesNotExist specified to --patch-module")
42774
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   183
                .getExitValue();
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   184
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   185
        assertTrue(exitValue == 0);
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   186
    }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   187
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   188
    @DataProvider(name = "badArguments")
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   189
    public Object[][] badArguments() {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   190
        return new Object[][]{
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   191
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   192
            // source not found
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   193
            { "=tmp",            "Unable to parse --patch-module <module>=<value>: =tmp" },
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   194
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   195
            // target not found: check by VM
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   196
            { "java.base",       "Missing '=' in --patch-module specification" },
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   197
            { "foo",             "Missing '=' in --patch-module specification" },
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   198
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   199
            // target not found
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   200
            { "java.base=",      "Unable to parse --patch-module <module>=<value>: java.base="  },
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   201
            { "java.base=" + File.pathSeparator,
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   202
              "Target must be specified: --patch-module java.base=" + File.pathSeparator }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   203
        };
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   204
    }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   205
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   206
    /**
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   207
     * Test ill-formed argument to --patch-module
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   208
     */
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   209
    @Test(dataProvider = "badArguments")
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   210
    public void testBadArgument(String value, String msg) throws Exception {
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   211
        int exitValue =
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   212
            executeTestJava("--patch-module", value,
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   213
                            "--module-path", MODS_DIR.toString(),
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   214
                            "-m", "test/jdk.test.Main")
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   215
                .outputTo(System.out)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   216
                .errorTo(System.out)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   217
                .shouldContain(msg)
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   218
                .getExitValue();
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   219
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   220
        assertTrue(exitValue != 0);
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   221
    }
74bcf37d15d8 8168836: Minor clean up on warning/error messages on --add-exports and --add-reads
mchung
parents:
diff changeset
   222
}