test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java
author herrick
Fri, 04 Oct 2019 14:53:39 -0400
branchJDK-8200758-branch
changeset 58463 4e71249f291c
parent 58416 f09bf58c1f17
child 58466 47f0d21c7e8d
permissions -rw-r--r--
8231850: BasicTest test fails in jcov build Submitted-by: asemenyuk Reviewed-by: almatvee, herrick
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     1
/*
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     2
 * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     4
 *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     8
 *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    13
 * accompanied this code).
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    14
 *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    18
 *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    21
 * questions.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    22
 */
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    23
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    24
package jdk.jpackage.tests;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    25
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    26
import java.io.IOException;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    27
import java.nio.file.Files;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    28
import java.nio.file.Path;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    29
import java.util.List;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    30
import java.util.ArrayList;
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
    31
import java.util.regex.Pattern;
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    32
import java.util.stream.Collectors;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    33
import jdk.jpackage.test.Executor;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    34
import jdk.jpackage.test.JPackageCommand;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    35
import jdk.jpackage.test.TKit;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    36
import jdk.jpackage.test.JavaTool;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    37
import jdk.jpackage.test.HelloApp;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    38
import jdk.jpackage.test.Annotations.*;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    39
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    40
/*
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    41
 * @test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    42
 * @summary jpackage basic testing
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    43
 * @library ../../../../helpers
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    44
 * @build jdk.jpackage.test.*
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    45
 * @modules jdk.jpackage
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    46
 * @compile BasicTest.java
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    47
 * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    48
 *  --jpt-run=jdk.jpackage.tests.BasicTest
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    49
 */
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    50
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    51
public class BasicTest {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    52
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    53
    public void testNoArgs() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    54
        List<String> output = JPackageCommand.filterOutput(
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
    55
                getJPackageToolProvider().executeAndGetOutput());
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    56
        TKit.assertStringListEquals(List.of("Usage: jpackage <mode> <options>",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    57
                "Use jpackage --help (or -h) for a list of possible options"),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    58
                output, "Check jpackage output");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    59
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    60
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    61
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    62
    public void testVersion() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    63
        List<String> output = JPackageCommand.filterOutput(
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
    64
                getJPackageToolProvider()
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    65
                        .addArgument("--version")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    66
                        .executeAndGetOutput());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    67
        TKit.assertStringListEquals(List.of(System.getProperty("java.version")),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    68
                output, "Check jpackage output");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    69
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    70
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    71
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    72
    public void testNoName() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    73
        final String mainClassName = "Greetings";
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    74
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    75
        JPackageCommand cmd = new JPackageCommand()
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    76
                .helloAppImage(mainClassName)
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    77
                .removeArgumentWithValue("--name");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    78
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    79
        Path expectedImageDir = cmd.outputDir().resolve(mainClassName);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    80
        if (TKit.isOSX()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    81
            expectedImageDir = expectedImageDir.getParent().resolve(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    82
                    expectedImageDir.getFileName().toString() + ".app");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    83
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    84
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    85
        cmd.executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    86
        TKit.assertEquals(expectedImageDir.toAbsolutePath().normalize().toString(),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    87
                cmd.appImage().toAbsolutePath().normalize().toString(),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    88
                String.format(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    89
                        "Check [%s] directory is filled with application image data",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    90
                        expectedImageDir));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    91
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    92
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    93
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    94
    public void testApp() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    95
        new JPackageCommand()
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    96
        .helloAppImage()
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    97
        .executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    98
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    99
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   100
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   101
    public void testModularApp() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   102
        new JPackageCommand()
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   103
        .helloAppImage("com.other/com.other.Hello")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   104
        .executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   105
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   106
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   107
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   108
//    @Parameter("ALL-MODULE-PATH") ; This test fails
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   109
    @Parameter("ALL-DEFAULT")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   110
    public void testAddModules(String addModulesArg) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   111
        JPackageCommand cmd = new JPackageCommand()
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   112
            .helloAppImage("com.other/com.other.Hello");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   113
        if (!addModulesArg.isEmpty()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   114
            cmd.addArguments("--add-modules", addModulesArg);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   115
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   116
        cmd.executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   117
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   118
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   119
    /**
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   120
     * Test --temp option. Doesn't make much sense for app image as temporary
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   121
     * directory is used only on Windows.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   122
     * @throws IOException
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   123
     */
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   124
//    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   125
    public void testTemp() throws IOException {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   126
        JPackageCommand cmd = new JPackageCommand().helloAppImage();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   127
        TKit.withTempDirectory("temp-root", tempDir -> {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   128
            cmd.addArguments("--temp", tempDir);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   129
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   130
            cmd.executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   131
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   132
            // Check jpackage actually used the supplied directory.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   133
            TKit.assertNotEquals(0, tempDir.toFile().list().length,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   134
                    String.format(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   135
                            "Check jpackage wrote some data in the supplied temporary directory [%s]",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   136
                            tempDir));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   137
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   138
            // Temporary directory should not be empty,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   139
            // jpackage should exit with error.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   140
            cmd.execute().assertExitCodeIs(1);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   141
        });
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   142
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   143
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   144
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   145
    public void testAtFile() throws IOException {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   146
        JPackageCommand cmd = new JPackageCommand().helloAppImage();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   147
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   148
        // Init options file with the list of options configured
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   149
        // for JPackageCommand instance.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   150
        final Path optionsFile = TKit.workDir().resolve("options");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   151
        Files.write(optionsFile,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   152
                List.of(String.join(" ", cmd.getAllArguments())));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   153
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   154
        // Build app jar file.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   155
        cmd.executePrerequisiteActions();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   156
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   157
        // Make sure output directory is empty. Normally JPackageCommand would
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   158
        // do this automatically.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   159
        TKit.deleteDirectoryContentsRecursive(cmd.outputDir());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   160
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   161
        // Instead of running jpackage command through configured
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   162
        // JPackageCommand instance, run vanilla jpackage command with @ file.
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   163
        getJPackageToolProvider()
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   164
                .addArgument(String.format("@%s", optionsFile))
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   165
                .execute().assertExitCodeIsZero();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   166
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   167
        // Verify output of jpackage command.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   168
        cmd.assertImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   169
        HelloApp.executeLauncherAndVerifyOutput(cmd);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   170
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   171
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   172
    @Parameter("Hello")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   173
    @Parameter("com.foo/com.foo.main.Aloha")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   174
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   175
    public void testJLinkRuntime(String javaAppDesc) {
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   176
        JPackageCommand cmd = JPackageCommand.helloAppImage(javaAppDesc);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   177
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   178
        // If `--module` parameter was set on jpackage command line, get its
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   179
        // value and extract module name.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   180
        // E.g.: foo.bar2/foo.bar.Buz -> foo.bar2
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   181
        // Note: HelloApp class manages `--module` parameter on jpackage command line
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   182
        final String moduleName = cmd.getArgumentValue("--module", () -> null,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   183
                (v) -> v.split("/", 2)[0]);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   184
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   185
        if (moduleName != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   186
            // Build module jar.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   187
            cmd.executePrerequisiteActions();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   188
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   189
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   190
        TKit.withTempDirectory("runtime", runtimeDir -> {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   191
            TKit.deleteDirectoryRecursive(runtimeDir, String.format(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   192
                    "Delete [%s] output directory for jlink command", runtimeDir));
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   193
            Executor jlink = getToolProvider(JavaTool.JLINK)
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   194
            .saveOutput(false)
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   195
            .addArguments(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   196
                    "--add-modules", "java.base",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   197
                    "--output", runtimeDir.toString(),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   198
                    "--strip-debug",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   199
                    "--no-header-files",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   200
                    "--no-man-pages");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   201
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   202
            if (moduleName != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   203
                jlink.addArguments("--add-modules", moduleName, "--module-path",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   204
                        Path.of(cmd.getArgumentValue("--module-path")).resolve(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   205
                                "hello.jar").toString());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   206
            }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   207
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   208
            jlink.execute().assertExitCodeIsZero();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   209
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   210
            cmd.addArguments("--runtime-image", runtimeDir);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   211
            cmd.executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   212
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   213
            final Path appImageRuntimePath = cmd.appImage().resolve(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   214
                    cmd.appRuntimeDirectoryInAppImage());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   215
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   216
            //
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   217
            // This is an overkill to list modules in jlink output as we have
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   218
            // already verified that Java app is functional and thus app's runtime
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   219
            // is likely to be OK, but let's double check.
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   220
            //
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   221
            // Filter out all first strings with whitespace. They are java
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   222
            // launcher output like `Picked up ...` unrelated to module names.
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   223
            //
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   224
            Pattern whitespaceChar = Pattern.compile("\\s");
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   225
            List<String> moduleList = new Executor().dumpOutput().setExecutable(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   226
                    appImageRuntimePath.resolve(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   227
                            JPackageCommand.relativePathInRuntime(JavaTool.JAVA))).addArguments(
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   228
                    "--list-modules").executeAndGetOutput().stream().dropWhile(
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   229
                            s -> whitespaceChar.matcher(s).find()).sorted().collect(
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   230
                            Collectors.toList());
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   231
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   232
            List<String> expectedModules = new ArrayList<>();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   233
            expectedModules.add(String.format("java.base@%s",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   234
                    System.getProperty("java.version")));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   235
            if (moduleName != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   236
                expectedModules.add(moduleName);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   237
            }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   238
            expectedModules = expectedModules.stream().sorted().collect(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   239
                    Collectors.toList());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   240
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   241
            TKit.assertStringListEquals(expectedModules, moduleList,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   242
                    String.format(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   243
                            "Check modules in application image runtime directory at [%s]",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   244
                            appImageRuntimePath));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   245
        });
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   246
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   247
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   248
    private static Executor getJPackageToolProvider() {
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   249
        return getToolProvider(JavaTool.JPACKAGE);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   250
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   251
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   252
    private static Executor getToolProvider(JavaTool tool) {
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   253
        return new Executor()
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   254
                .dumpOutput().saveOutput()
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   255
                .setToolProvider(tool.asToolProvider());
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   256
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   257
}