jdk/test/tools/jlink/multireleasejar/JLinkMultiReleaseJarTest.java
author sdrach
Tue, 01 Nov 2016 14:36:26 -0700
changeset 41828 0436ea0c6099
child 44669 1f2cfb3b2d3c
permissions -rw-r--r--
8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs Reviewed-by: alanb, mchung
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
41828
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     1
/*
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     2
 * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     4
 *
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     7
 * published by the Free Software Foundation.
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     8
 *
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    13
 * accompanied this code).
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    14
 *
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    18
 *
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    21
 * questions.
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    22
 */
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    23
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    24
/*
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    25
 * @test
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    26
 * @bug 8156499
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    27
 * @summary Test image creation from Multi-Release JAR
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    28
 * @author Steve Drach
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    29
 * @library /lib/testlibrary /test/lib
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    30
 * @modules java.base/jdk.internal.jimage
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    31
 *          java.base/jdk.internal.module
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    32
 * @build jdk.testlibrary.FileUtils jdk.test.lib.process.*
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    33
 * @run testng JLinkMultiReleaseJarTest
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    34
*/
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    35
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    36
import java.io.ByteArrayInputStream;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    37
import java.io.IOException;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    38
import java.io.UncheckedIOException;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    39
import java.lang.invoke.MethodHandle;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    40
import java.lang.invoke.MethodHandles;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    41
import java.lang.invoke.MethodType;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    42
import java.lang.module.ModuleDescriptor;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    43
import java.nio.file.Files;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    44
import java.nio.file.Path;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    45
import java.nio.file.Paths;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    46
import java.nio.file.StandardCopyOption;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    47
import java.util.Arrays;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    48
import java.util.Set;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    49
import java.util.jar.JarFile;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    50
import java.util.spi.ToolProvider;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    51
import java.util.stream.Collectors;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    52
import java.util.stream.Stream;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    53
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    54
import jdk.internal.jimage.BasicImageReader;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    55
import jdk.test.lib.process.ProcessTools;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    56
import jdk.test.lib.process.OutputAnalyzer;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    57
import jdk.testlibrary.FileUtils;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    58
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    59
import org.testng.Assert;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    60
import org.testng.annotations.AfterClass;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    61
import org.testng.annotations.BeforeClass;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    62
import org.testng.annotations.Test;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    63
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    64
public class JLinkMultiReleaseJarTest {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    65
    private static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar")
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    66
            .orElseThrow(() -> new RuntimeException("jar tool not found"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    67
    private static final ToolProvider JAVAC_TOOL = ToolProvider.findFirst("javac")
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    68
            .orElseThrow(() -> new RuntimeException("javac tool not found"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    69
    private static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink")
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    70
            .orElseThrow(() -> new RuntimeException("jlink tool not found"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    71
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    72
    private final Path userdir = Paths.get(System.getProperty("user.dir", "."));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    73
    private final Path javahome = Paths.get(System.getProperty("java.home"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    74
    private final Path jmodsdir = javahome.resolve("jmods");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    75
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    76
    private final String pathsep = System.getProperty("path.separator");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    77
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    78
    private byte[] resource = (Runtime.version().major() + " resource file").getBytes();
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    79
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    80
    @BeforeClass
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    81
    public void initialize() throws IOException {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    82
        Path srcdir = Paths.get(System.getProperty("test.src"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    83
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    84
        // create class files from source
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    85
        Path base = srcdir.resolve("base");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    86
        Path basemods = userdir.resolve("basemods");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    87
        javac(base, basemods, base.toString());
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    88
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    89
        Path rt = srcdir.resolve("rt");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    90
        Path rtmods = userdir.resolve("rtmods");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    91
        javac(rt, rtmods, rt.toString());
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    92
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    93
        // create resources in basemods and rtmods
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    94
        Path dest = basemods.resolve("m1").resolve("resource.txt");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    95
        byte[] text = "base resource file".getBytes();
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    96
        ByteArrayInputStream is = new ByteArrayInputStream(text);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    97
        Files.copy(is, dest);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    98
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
    99
        dest = rtmods.resolve("m1").resolve("resource.txt");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   100
        is = new ByteArrayInputStream(resource);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   101
        Files.copy(is, dest);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   102
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   103
        // build multi-release jar file with different module-infos
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   104
        String[] args = {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   105
                "-cf", "m1.jar",
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   106
                "-C", basemods.resolve("m1").toString(), ".",
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   107
                "--release ", String.valueOf(JarFile.runtimeVersion().major()),
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   108
                "-C", rtmods.resolve("m1").toString(), "."
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   109
        };
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   110
        JAR_TOOL.run(System.out, System.err, args);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   111
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   112
        // now move the module-info that requires logging to temporary place
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   113
        Files.move(rtmods.resolve("m1").resolve("module-info.class"),
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   114
                userdir.resolve("module-info.class"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   115
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   116
        // and build another jar
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   117
        args[1] = "m1-no-logging.jar";
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   118
        JAR_TOOL.run(System.out, System.err, args);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   119
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   120
        // replace the no logging module-info with the logging module-info
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   121
        Files.move(userdir.resolve("module-info.class"),
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   122
                basemods.resolve("m1").resolve("module-info.class"),
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   123
                StandardCopyOption.REPLACE_EXISTING);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   124
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   125
        // and build another jar
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   126
        args[1] = "m1-logging.jar";
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   127
        JAR_TOOL.run(System.out, System.err, args);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   128
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   129
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   130
    private void javac(Path source, Path destination, String srcpath) throws IOException {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   131
        String[] args = Stream.concat(
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   132
                Stream.of("-d", destination.toString(), "--module-source-path", srcpath),
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   133
                Files.walk(source)
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   134
                        .map(Path::toString)
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   135
                        .filter(s -> s.endsWith(".java"))
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   136
        ).toArray(String[]::new);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   137
        int rc = JAVAC_TOOL.run(System.out, System.err, args);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   138
        Assert.assertEquals(rc, 0);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   139
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   140
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   141
    @AfterClass
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   142
    public void close() throws IOException {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   143
        Files.walk(userdir, 1)
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   144
                .filter(p -> !p.equals(userdir))
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   145
                .forEach(p -> {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   146
                    try {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   147
                        if (Files.isDirectory(p)) {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   148
                            FileUtils.deleteFileTreeWithRetry(p);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   149
                        } else {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   150
                            FileUtils.deleteFileIfExistsWithRetry(p);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   151
                        }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   152
                    } catch (IOException x) {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   153
                        throw new UncheckedIOException(x);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   154
                    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   155
                });
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   156
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   157
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   158
    @Test
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   159
    public void basicTest() throws Throwable {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   160
        if (ignoreTest()) return;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   161
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   162
        // use jlink to build image from multi-release jar
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   163
       jlink("m1.jar", "myimage");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   164
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   165
        // validate image
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   166
        Path jimage = userdir.resolve("myimage").resolve("lib").resolve("modules");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   167
        try (BasicImageReader reader = BasicImageReader.open(jimage)) {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   168
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   169
            // do we have the right entry names?
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   170
            Set<String> names = Arrays.stream(reader.getEntryNames())
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   171
                    .filter(n -> n.startsWith("/m1"))
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   172
                    .collect(Collectors.toSet());
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   173
            Assert.assertEquals(names, Set.of(
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   174
                    "/m1/module-info.class",
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   175
                    "/m1/p/Main.class",
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   176
                    "/m1/p/Type.class",
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   177
                    "/m1/q/PublicClass.class",
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   178
                    "/m1/META-INF/MANIFEST.MF",
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   179
                    "/m1/resource.txt"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   180
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   181
            // do we have the right module-info.class?
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   182
            byte[] b = reader.getResource("/m1/module-info.class");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   183
            Set<String> requires = ModuleDescriptor
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   184
                    .read(new ByteArrayInputStream(b))
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   185
                    .requires()
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   186
                    .stream()
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   187
                    .map(mdr -> mdr.name())
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   188
                    .filter(nm -> !nm.equals("java.base"))
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   189
                    .collect(Collectors.toSet());
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   190
            Assert.assertEquals(requires, Set.of("java.logging"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   191
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   192
            // do we have the right resource?
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   193
            b = reader.getResource("/m1/resource.txt");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   194
            Assert.assertEquals(b, resource);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   195
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   196
            // do we have the right class?
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   197
            b = reader.getResource("/m1/p/Main.class");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   198
            Class<?> clazz = (new ByteArrayClassLoader()).loadClass("p.Main", b);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   199
            MethodHandle getVersion = MethodHandles.lookup()
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   200
                    .findVirtual(clazz, "getVersion", MethodType.methodType(int.class));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   201
            int version = (int) getVersion.invoke(clazz.getConstructor().newInstance());
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   202
            Assert.assertEquals(version, JarFile.runtimeVersion().major());
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   203
        }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   204
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   205
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   206
    @Test
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   207
    public void noLoggingTest() throws Throwable {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   208
        if (ignoreTest()) return;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   209
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   210
        jlink("m1-no-logging.jar", "no-logging-image");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   211
        runImage("no-logging-image", false);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   212
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   213
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   214
    @Test
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   215
    public void loggingTest() throws Throwable {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   216
        if (ignoreTest()) return;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   217
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   218
        jlink("m1-logging.jar", "logging-image");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   219
        runImage("logging-image", true);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   220
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   221
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   222
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   223
    // java.base.jmod must exist for this test to make sense
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   224
    private boolean ignoreTest() {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   225
        if (Files.isRegularFile(jmodsdir.resolve("java.base.jmod"))) {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   226
            return false;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   227
        }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   228
        System.err.println("Test skipped. NO jmods/java.base.jmod");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   229
        return true;
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   230
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   231
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   232
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   233
    private void jlink(String jar, String image) {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   234
        String args = "--output " + image + " --add-modules m1 --module-path " +
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   235
                jar + pathsep + jmodsdir.toString();
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   236
        int exitCode = JLINK_TOOL.run(System.out, System.err, args.split(" +"));
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   237
        Assert.assertEquals(exitCode, 0);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   238
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   239
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   240
    public void runImage(String image, boolean expected) throws Throwable {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   241
        Path java = Paths.get(image, "bin", "java");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   242
        OutputAnalyzer oa = ProcessTools.executeProcess(java.toString(), "-m", "m1/p.Main");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   243
        String sout = oa.getStdout();
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   244
        boolean actual = sout.contains("logging found");
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   245
        Assert.assertEquals(actual, expected);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   246
        System.out.println(sout);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   247
        System.err.println(oa.getStderr());
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   248
        Assert.assertEquals(oa.getExitValue(), 0);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   249
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   250
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   251
    private static class ByteArrayClassLoader extends ClassLoader {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   252
        public Class<?> loadClass(String name, byte[] bytes) {
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   253
            return defineClass(name, bytes, 0, bytes.length);
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   254
        }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   255
    }
0436ea0c6099 8156499: Update jlink to support creating images with modules that are packaged as multi-release JARs
sdrach
parents:
diff changeset
   256
}