jdk/test/tools/jar/mmrjar/Basic.java
author alanb
Fri, 10 Feb 2017 09:04:39 +0000
changeset 43712 5dfd0950317c
parent 43095 336dfda4ae89
child 43731 bc7110b230c1
permissions -rw-r--r--
8173393: Module system implementation refresh (2/2017) Reviewed-by: dfuchs, psandoz, mchung, alanb Contributed-by: alan.bateman@oracle.com, mandy.chung@oracle.com, claes.redestad@oracle.com, alex.buckley@oracle.com, mark.reinhold@oracle.com, john.r.rose@oracle.com
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     1
/*
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
     2
 * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     4
 *
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     7
 * published by the Free Software Foundation.
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     8
 *
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    13
 * accompanied this code).
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    14
 *
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    18
 *
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    21
 * questions.
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    22
 */
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    23
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    24
/*
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    25
 * @test
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    26
 * @bug 8146486 8172432
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    27
 * @summary Fail to create a MR modular JAR with a versioned entry in
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    28
 *          base-versioned empty package
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    29
 * @modules java.base/jdk.internal.module
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    30
 *          jdk.compiler
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
    31
 *          jdk.jartool
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    32
 * @library /lib/testlibrary
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    33
 * @build jdk.testlibrary.FileUtils
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    34
 * @run testng Basic
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    35
 */
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    36
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    37
import org.testng.Assert;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    38
import org.testng.annotations.AfterClass;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    39
import org.testng.annotations.Test;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    40
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    41
import java.io.ByteArrayInputStream;
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    42
import java.io.ByteArrayOutputStream;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    43
import java.io.IOException;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    44
import java.io.PrintStream;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    45
import java.io.UncheckedIOException;
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    46
import java.lang.module.ModuleDescriptor;
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    47
import java.lang.module.ModuleDescriptor.Version;
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    48
import java.nio.file.Files;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    49
import java.nio.file.Path;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    50
import java.nio.file.Paths;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    51
import java.util.Arrays;
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    52
import java.util.Optional;
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    53
import java.util.Set;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    54
import java.util.spi.ToolProvider;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    55
import java.util.stream.Collectors;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    56
import java.util.stream.Stream;
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    57
import java.util.zip.ZipFile;
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    58
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    59
import jdk.internal.module.ModuleInfoExtender;
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    60
import jdk.testlibrary.FileUtils;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    61
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    62
public class Basic {
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    63
    private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    64
           .orElseThrow(() -> new RuntimeException("jar tool not found"));
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    65
    private static final ToolProvider JAVAC_TOOL = ToolProvider.findFirst("javac")
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    66
            .orElseThrow(() -> new RuntimeException("javac tool not found"));
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    67
    private final String linesep = System.lineSeparator();
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
    68
    private final Path testsrc;
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    69
    private final Path userdir;
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    70
    private final ByteArrayOutputStream outbytes = new ByteArrayOutputStream();
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    71
    private final PrintStream out = new PrintStream(outbytes, true);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    72
    private final ByteArrayOutputStream errbytes = new ByteArrayOutputStream();
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    73
    private final PrintStream err = new PrintStream(errbytes, true);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    74
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
    75
    public Basic() throws IOException {
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
    76
        testsrc = Paths.get(System.getProperty("test.src"));
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    77
        userdir = Paths.get(System.getProperty("user.dir", "."));
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    78
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    79
        // compile the classes directory
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    80
        Path source = testsrc.resolve("src").resolve("classes");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    81
        Path destination = Paths.get("classes");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    82
        javac(source, destination);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    83
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    84
        // compile the mr9 directory including module-info.java
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    85
        source = testsrc.resolve("src").resolve("mr9");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    86
        destination = Paths.get("mr9");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    87
        javac(source, destination);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    88
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    89
        // move module-info.class for later use
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    90
        Files.move(destination.resolve("module-info.class"),
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    91
                Paths.get("module-info.class"));
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    92
    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    93
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    94
    private void javac(Path source, Path destination) throws IOException {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    95
        String[] args = Stream.concat(
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    96
                Stream.of("-d", destination.toString()),
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    97
                Files.walk(source)
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    98
                        .map(Path::toString)
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
    99
                        .filter(s -> s.endsWith(".java"))
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   100
        ).toArray(String[]::new);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   101
        JAVAC_TOOL.run(System.out, System.err, args);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   102
    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   103
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   104
    private int jar(String cmd) {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   105
        outbytes.reset();
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   106
        errbytes.reset();
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   107
        return JAR_TOOL.run(out, err, cmd.split(" +"));
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   108
    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   109
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   110
    @AfterClass
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   111
    public void cleanup() throws IOException {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   112
        Files.walk(userdir, 1)
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   113
                .filter(p -> !p.equals(userdir))
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   114
                .forEach(p -> {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   115
                    try {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   116
                        if (Files.isDirectory(p)) {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   117
                            FileUtils.deleteFileTreeWithRetry(p);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   118
                        } else {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   119
                            FileUtils.deleteFileIfExistsWithRetry(p);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   120
                        }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   121
                    } catch (IOException x) {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   122
                        throw new UncheckedIOException(x);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   123
                    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   124
                });
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   125
    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   126
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   127
    // updates a valid multi-release jar with a new public class in
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   128
    // versioned section and fails
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   129
    @Test
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   130
    public void test1() {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   131
        // successful build of multi-release jar
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   132
        int rc = jar("-cf mmr.jar -C classes . --release 9 -C mr9 p/Hi.class");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   133
        Assert.assertEquals(rc, 0);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   134
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   135
        jar("-tf mmr.jar");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   136
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   137
        Set<String> actual = lines(outbytes);
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   138
        Set<String> expected = Set.of(
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   139
                "META-INF/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   140
                "META-INF/MANIFEST.MF",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   141
                "p/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   142
                "p/Hi.class",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   143
                "META-INF/versions/9/p/Hi.class"
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   144
        );
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   145
        Assert.assertEquals(actual, expected);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   146
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   147
        // failed build because of new public class
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   148
        rc = jar("-uf mmr.jar --release 9 -C mr9 p/internal/Bar.class");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   149
        Assert.assertEquals(rc, 1);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   150
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   151
        String s = new String(errbytes.toByteArray());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   152
        Assert.assertTrue(Message.NOT_FOUND_IN_BASE_ENTRY.match(s, "p/internal/Bar.class"));
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   153
    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   154
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   155
    // updates a valid multi-release jar with a module-info class and new
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   156
    // concealed public class in versioned section and succeeds
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   157
    @Test
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   158
    public void test2() {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   159
        // successful build of multi-release jar
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   160
        int rc = jar("-cf mmr.jar -C classes . --release 9 -C mr9 p/Hi.class");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   161
        Assert.assertEquals(rc, 0);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   162
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   163
        // successful build because of module-info and new public class
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   164
        rc = jar("-uf mmr.jar module-info.class --release 9 -C mr9 p/internal/Bar.class");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   165
        Assert.assertEquals(rc, 0);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   166
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   167
        String s = new String(errbytes.toByteArray());
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   168
        Assert.assertTrue(Message.NEW_CONCEALED_PACKAGE_WARNING.match(s, "p/internal/Bar.class"));
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   169
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   170
        jar("-tf mmr.jar");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   171
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   172
        Set<String> actual = lines(outbytes);
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   173
        Set<String> expected = Set.of(
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   174
                "META-INF/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   175
                "META-INF/MANIFEST.MF",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   176
                "p/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   177
                "p/Hi.class",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   178
                "META-INF/versions/9/p/Hi.class",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   179
                "META-INF/versions/9/p/internal/Bar.class",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   180
                "module-info.class"
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   181
        );
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   182
        Assert.assertEquals(actual, expected);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   183
    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   184
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   185
    // jar tool fails building mmr.jar because of new public class
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   186
    @Test
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   187
    public void test3() {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   188
        int rc = jar("-cf mmr.jar -C classes . --release 9 -C mr9 .");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   189
        Assert.assertEquals(rc, 1);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   190
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   191
        String s = new String(errbytes.toByteArray());
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   192
        Assert.assertTrue(Message.NOT_FOUND_IN_BASE_ENTRY.match(s, "p/internal/Bar.class"));
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   193
    }
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   194
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   195
    // jar tool succeeds building mmr.jar because of concealed package
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   196
    @Test
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   197
    public void test4() {
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   198
        int rc = jar("-cf mmr.jar module-info.class -C classes . " +
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   199
                "--release 9 module-info.class -C mr9 .");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   200
        Assert.assertEquals(rc, 0);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   201
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   202
        String s = new String(errbytes.toByteArray());
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   203
        Assert.assertTrue(Message.NEW_CONCEALED_PACKAGE_WARNING.match(s, "p/internal/Bar.class"));
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   204
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   205
        jar("-tf mmr.jar");
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   206
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   207
        Set<String> actual = lines(outbytes);
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   208
        Set<String> expected = Set.of(
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   209
                "META-INF/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   210
                "META-INF/MANIFEST.MF",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   211
                "module-info.class",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   212
                "META-INF/versions/9/module-info.class",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   213
                "p/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   214
                "p/Hi.class",
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   215
                "META-INF/versions/9/",
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   216
                "META-INF/versions/9/p/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   217
                "META-INF/versions/9/p/Hi.class",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   218
                "META-INF/versions/9/p/internal/",
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   219
                "META-INF/versions/9/p/internal/Bar.class"
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   220
        );
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   221
        Assert.assertEquals(actual, expected);
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   222
    }
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   223
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   224
    // jar tool does two updates, no exported packages, all concealed
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   225
    @Test
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   226
    public void test5() throws IOException {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   227
        // compile the mr10 directory
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   228
        Path source = testsrc.resolve("src").resolve("mr10");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   229
        Path destination = Paths.get("mr10");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   230
        javac(source, destination);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   231
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   232
        // create a directory for this tests special files
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   233
        Files.createDirectory(Paths.get("test5"));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   234
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   235
        // create an empty module-info.java
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   236
        String hi = "module hi {" + linesep + "}" + linesep;
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   237
        Path modinfo = Paths.get("test5", "module-info.java");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   238
        Files.write(modinfo, hi.getBytes());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   239
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   240
        // and compile it
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   241
        javac(modinfo, Paths.get("test5"));
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   242
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   243
        int rc = jar("--create --file mr.jar -C classes .");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   244
        Assert.assertEquals(rc, 0);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   245
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   246
        rc = jar("--update --file mr.jar -C test5 module-info.class"
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   247
                + " --release 9 -C mr9 .");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   248
        Assert.assertEquals(rc, 0);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   249
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   250
        jar("tf mr.jar");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   251
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   252
        Set<String> actual = lines(outbytes);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   253
        Set<String> expected = Set.of(
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   254
                "META-INF/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   255
                "META-INF/MANIFEST.MF",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   256
                "p/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   257
                "p/Hi.class",
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   258
                "META-INF/versions/9/",
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   259
                "META-INF/versions/9/p/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   260
                "META-INF/versions/9/p/Hi.class",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   261
                "META-INF/versions/9/p/internal/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   262
                "META-INF/versions/9/p/internal/Bar.class",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   263
                "module-info.class"
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   264
        );
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   265
        Assert.assertEquals(actual, expected);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   266
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   267
        jar("-d --file mr.jar");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   268
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   269
        actual = lines(outbytes);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   270
        expected = Set.of(
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   271
                "hi",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   272
                "requires mandated java.base",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   273
                "contains p",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   274
                "contains p.internal"
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   275
        );
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   276
        Assert.assertEquals(actual, expected);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   277
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   278
        rc = jar("--update --file mr.jar --release 10 -C mr10 .");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   279
        Assert.assertEquals(rc, 0);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   280
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   281
        jar("tf mr.jar");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   282
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   283
        actual = lines(outbytes);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   284
        expected = Set.of(
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   285
                "META-INF/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   286
                "META-INF/MANIFEST.MF",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   287
                "p/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   288
                "p/Hi.class",
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   289
                "META-INF/versions/9/",
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   290
                "META-INF/versions/9/p/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   291
                "META-INF/versions/9/p/Hi.class",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   292
                "META-INF/versions/9/p/internal/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   293
                "META-INF/versions/9/p/internal/Bar.class",
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   294
                "META-INF/versions/10/",
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   295
                "META-INF/versions/10/p/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   296
                "META-INF/versions/10/p/internal/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   297
                "META-INF/versions/10/p/internal/bar/",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   298
                "META-INF/versions/10/p/internal/bar/Gee.class",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   299
                "module-info.class"
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   300
        );
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   301
        Assert.assertEquals(actual, expected);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   302
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   303
        jar("-d --file mr.jar");
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   304
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   305
        actual = lines(outbytes);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   306
        expected = Set.of(
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   307
                "hi",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   308
                "requires mandated java.base",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   309
                "contains p",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   310
                "contains p.internal",
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   311
                "contains p.internal.bar"
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   312
        );
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   313
        Assert.assertEquals(actual, expected);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   314
    }
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   315
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   316
    // root and versioned module-info entries have different main-class, version
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   317
    // attributes
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   318
    @Test
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   319
    public void test6() throws IOException {
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   320
        // create a directory for this tests special files
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   321
        Files.createDirectory(Paths.get("test6"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   322
        Files.createDirectory(Paths.get("test6-v9"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   323
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   324
        // compile the classes directory
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   325
        Path src = testsrc.resolve("src").resolve("classes");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   326
        Path dst = Paths.get("test6");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   327
        javac(src, dst);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   328
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   329
        byte[] mdBytes = Files.readAllBytes(Paths.get("module-info.class"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   330
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   331
        ModuleInfoExtender mie = ModuleInfoExtender.newExtender(
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   332
            new ByteArrayInputStream(mdBytes));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   333
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43095
diff changeset
   334
        mie.mainClass("p.Main");
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   335
        mie.version(Version.parse("1.0"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   336
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   337
        ByteArrayOutputStream baos = new ByteArrayOutputStream();
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   338
        mie.write(baos);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   339
        Files.write(Paths.get("test6", "module-info.class"), baos.toByteArray());
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   340
        Files.write(Paths.get("test6-v9", "module-info.class"), baos.toByteArray());
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   341
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   342
        int rc = jar("--create --file mmr.jar -C test6 . --release 9 -C test6-v9 .");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   343
        Assert.assertEquals(rc, 0);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   344
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   345
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   346
        // different main-class
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   347
        mie = ModuleInfoExtender.newExtender(new ByteArrayInputStream(mdBytes));
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43095
diff changeset
   348
        mie.mainClass("p.Main2");
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   349
        mie.version(Version.parse("1.0"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   350
        baos.reset();
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   351
        mie.write(baos);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   352
        Files.write(Paths.get("test6-v9", "module-info.class"), baos.toByteArray());
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   353
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   354
        rc = jar("--create --file mmr.jar -C test6 . --release 9 -C test6-v9 .");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   355
        Assert.assertEquals(rc, 1);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   356
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   357
        Assert.assertTrue(Message.CONTAINS_DIFFERENT_MAINCLASS.match(
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   358
            new String(errbytes.toByteArray()),
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   359
            "META-INF/versions/9/module-info.class"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   360
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   361
        // different version
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   362
        mie = ModuleInfoExtender.newExtender(new ByteArrayInputStream(mdBytes));
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43095
diff changeset
   363
        mie.mainClass("p.Main");
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   364
        mie.version(Version.parse("2.0"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   365
        baos.reset();
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   366
        mie.write(baos);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   367
        Files.write(Paths.get("test6-v9", "module-info.class"), baos.toByteArray());
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   368
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   369
        rc = jar("--create --file mmr.jar -C test6 . --release 9 -C test6-v9 .");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   370
        Assert.assertEquals(rc, 1);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   371
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   372
        Assert.assertTrue(Message.CONTAINS_DIFFERENT_VERSION.match(
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   373
            new String(errbytes.toByteArray()),
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   374
            "META-INF/versions/9/module-info.class"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   375
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   376
    }
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   377
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   378
    // versioned mmr without root module-info.class
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   379
    @Test
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   380
    public void test7() throws IOException {
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   381
        // create a directory for this tests special files
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   382
        Files.createDirectory(Paths.get("test7"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   383
        Files.createDirectory(Paths.get("test7-v9"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   384
        Files.createDirectory(Paths.get("test7-v10"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   385
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   386
        // compile the classes directory
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   387
        Path src = testsrc.resolve("src").resolve("classes");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   388
        Path dst = Paths.get("test7");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   389
        javac(src, dst);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   390
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   391
        // move module-info.class to v9 later use
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   392
        Files.copy(Paths.get("module-info.class"),
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   393
                   Paths.get("test7-v9", "module-info.class"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   394
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   395
        Files.copy(Paths.get("test7-v9", "module-info.class"),
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   396
                   Paths.get("test7-v10", "module-info.class"));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   397
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43095
diff changeset
   398
        int rc = jar("--create --file mmr.jar --main-class=p.Main -C test7 . --release 9 -C test7-v9 . --release 10 -C test7-v10 .");
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   399
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   400
System.out.println("-----------------------");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   401
System.out.println( new String(errbytes.toByteArray()));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   402
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   403
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   404
        Assert.assertEquals(rc, 0);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   405
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   406
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   407
        jar("-tf mmr.jar");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   408
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   409
System.out.println("-----------------------");
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   410
System.out.println( new String(outbytes.toByteArray()));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   411
43712
5dfd0950317c 8173393: Module system implementation refresh (2/2017)
alanb
parents: 43095
diff changeset
   412
        Optional<String> exp = Optional.of("p.Main");
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   413
        try (ZipFile zf = new ZipFile("mmr.jar")) {
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   414
            Assert.assertTrue(zf.getEntry("module-info.class") == null);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   415
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   416
            ModuleDescriptor md = ModuleDescriptor.read(
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   417
                zf.getInputStream(zf.getEntry("META-INF/versions/9/module-info.class")));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   418
            Assert.assertEquals(md.mainClass(), exp);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   419
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   420
            md = ModuleDescriptor.read(
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   421
                zf.getInputStream(zf.getEntry("META-INF/versions/10/module-info.class")));
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   422
            Assert.assertEquals(md.mainClass(), exp);
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   423
        }
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   424
    }
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   425
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   426
    private static Set<String> lines(ByteArrayOutputStream baos) {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   427
        String s = new String(baos.toByteArray());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   428
        return Arrays.stream(s.split("\\R"))
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   429
                     .map(l -> l.trim())
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   430
                     .filter(l -> l.length() > 0)
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   431
                     .collect(Collectors.toSet());
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   432
    }
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   433
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   434
    static enum Message {
43095
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   435
        CONTAINS_DIFFERENT_MAINCLASS(
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   436
          ": module-info.class in a versioned directory contains different \"main-class\""
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   437
        ),
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   438
        CONTAINS_DIFFERENT_VERSION(
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   439
          ": module-info.class in a versioned directory contains different \"version\""
336dfda4ae89 8172432: jar cleanup/update for module and mrm jar
sherman
parents: 42338
diff changeset
   440
        ),
42338
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   441
        NOT_FOUND_IN_BASE_ENTRY(
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   442
          ", contains a new public class not found in base entries"
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   443
        ),
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   444
        NEW_CONCEALED_PACKAGE_WARNING(
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   445
            " is a public class" +
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   446
            " in a concealed package, placing this jar on the class path will result" +
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   447
            " in incompatible public interfaces"
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   448
        );
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   449
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   450
        final String msg;
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   451
        Message(String msg) {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   452
            this.msg = msg;
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   453
        }
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   454
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   455
        /*
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   456
         * Test if the given output contains this message ignoring the line break.
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   457
         */
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   458
        boolean match(String output, String entry) {
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   459
            System.out.println("Expected: " + entry + msg);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   460
            System.out.println("Found: " + output);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   461
            return Arrays.stream(output.split("\\R"))
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   462
                         .collect(Collectors.joining(" "))
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   463
                         .contains(entry + msg);
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   464
        }
a60f280f803c 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41754
diff changeset
   465
    }
41754
8b7c8d5e9a0d 8164805: Fail to create a MR modular JAR with a versioned entry of a concealed package
sdrach
parents:
diff changeset
   466
}