test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java
author herrick
Wed, 23 Oct 2019 10:37:54 -0400
branchJDK-8200758-branch
changeset 58762 0fe62353385b
parent 58671 3b578a5976df
child 58888 d802578912f3
permissions -rw-r--r--
8232281: jpackage is not always reporting an error when no main class specified Reviewed-by: asemenyuk, asemenuk
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;
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    31
import java.util.function.Function;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    32
import java.util.function.Predicate;
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
    33
import java.util.regex.Pattern;
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    34
import java.util.stream.Collectors;
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    35
import java.util.stream.Stream;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    36
import jdk.jpackage.test.*;
58671
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
    37
import jdk.jpackage.test.Functional.ThrowingConsumer;
58416
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.*
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    45
 * @modules jdk.jpackage/jdk.jpackage.internal
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
    46
 * @compile BasicTest.java
58762
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
    47
 * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
58416
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
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    51
public final class BasicTest {
58416
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
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    72
    public void testHelp() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    73
        List<String> hOutput = getJPackageToolProvider()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    74
                .addArgument("-h").executeAndGetOutput();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    75
        List<String> helpOutput = getJPackageToolProvider()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    76
                .addArgument("--help").executeAndGetOutput();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    77
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    78
        TKit.assertStringListEquals(hOutput, helpOutput,
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    79
                "Check -h and --help parameters produce the same output");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    80
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    81
        final String windowsPrefix = "--win-";
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    82
        final String linuxPrefix = "--linux-";
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    83
        final String osxPrefix = "--mac-";
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    84
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    85
        final String expectedPrefix;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    86
        final List<String> unexpectedPrefixes;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    87
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    88
        if (TKit.isWindows()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    89
            expectedPrefix = windowsPrefix;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    90
            unexpectedPrefixes = List.of(osxPrefix, linuxPrefix);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    91
        } else if (TKit.isLinux()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    92
            expectedPrefix = linuxPrefix;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    93
            unexpectedPrefixes = List.of(windowsPrefix, osxPrefix);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    94
        } else if (TKit.isOSX()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    95
            expectedPrefix = osxPrefix;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    96
            unexpectedPrefixes = List.of(linuxPrefix,  windowsPrefix);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    97
        } else {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    98
            throw TKit.throwUnknownPlatformError();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
    99
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   100
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   101
        Function<String, Predicate<String>> createPattern = (prefix) -> {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   102
            return Pattern.compile("^  " + prefix).asPredicate();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   103
        };
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   104
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   105
        Function<List<String>, Long> countStrings = (prefixes) -> {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   106
            return hOutput.stream().filter(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   107
                    prefixes.stream().map(createPattern).reduce(x -> false,
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   108
                            Predicate::or)).peek(TKit::trace).count();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   109
        };
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   110
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   111
        TKit.trace("Check parameters in help text");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   112
        TKit.assertNotEquals(0, countStrings.apply(List.of(expectedPrefix)),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   113
                "Check help text contains plaform specific parameters");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   114
        TKit.assertEquals(0, countStrings.apply(unexpectedPrefixes),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   115
                "Check help text doesn't contain unexpected parameters");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   116
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   117
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   118
    @Test
58762
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   119
    @SuppressWarnings("unchecked")
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   120
    public void testVerbose() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   121
        JPackageCommand cmd = JPackageCommand.helloAppImage()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   122
                .setFakeRuntime().executePrerequisiteActions();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   123
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   124
        List<String> expectedVerboseOutputStrings = new ArrayList<>();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   125
        expectedVerboseOutputStrings.add("Creating app package:");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   126
        if (TKit.isWindows()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   127
            expectedVerboseOutputStrings.add("Result application bundle:");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   128
            expectedVerboseOutputStrings.add(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   129
                    "Succeeded in building Windows Application Image package");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   130
        } else if (TKit.isLinux()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   131
            expectedVerboseOutputStrings.add(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   132
                    "Succeeded in building Linux Application Image package");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   133
        } else if (TKit.isOSX()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   134
            expectedVerboseOutputStrings.add("Preparing Info.plist:");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   135
            expectedVerboseOutputStrings.add(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   136
                    "Succeeded in building Mac Application Image package");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   137
        } else {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   138
            TKit.throwUnknownPlatformError();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   139
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   140
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   141
        TKit.deleteDirectoryContentsRecursive(cmd.outputDir());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   142
        List<String> nonVerboseOutput = cmd.createExecutor().executeAndGetOutput();
58762
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   143
        List<String>[] verboseOutput = (List<String>[])new List<?>[1];
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   144
58762
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   145
        // Directory clean up is not 100% reliable on Windows because of
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   146
        // antivirus software that can lock .exe files. Setup
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   147
        // diffreent output directory instead of cleaning the default one for
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   148
        // verbose jpackage run.
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   149
        TKit.withTempDirectory("verbose-output", tempDir -> {
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   150
            cmd.setArgumentValue("--dest", tempDir);
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   151
            verboseOutput[0] = cmd.createExecutor().addArgument(
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   152
                    "--verbose").executeAndGetOutput();
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   153
        });
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   154
58762
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   155
        TKit.assertTrue(nonVerboseOutput.size() < verboseOutput[0].size(),
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   156
                "Check verbose output is longer than regular");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   157
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   158
        expectedVerboseOutputStrings.forEach(str -> {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   159
            TKit.assertTextStream(str).label("regular output")
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   160
                    .predicate(String::contains).negate()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   161
                    .apply(nonVerboseOutput.stream());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   162
        });
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   163
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   164
        expectedVerboseOutputStrings.forEach(str -> {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   165
            TKit.assertTextStream(str).label("verbose output")
58762
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58671
diff changeset
   166
                    .apply(verboseOutput[0].stream());
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   167
        });
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   168
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   169
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   170
    @Test
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   171
    public void testNoName() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   172
        final String mainClassName = "Greetings";
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   173
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   174
        JPackageCommand cmd = JPackageCommand.helloAppImage(mainClassName)
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   175
                .removeArgumentWithValue("--name");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   176
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   177
        Path expectedImageDir = cmd.outputDir().resolve(mainClassName);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   178
        if (TKit.isOSX()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   179
            expectedImageDir = expectedImageDir.getParent().resolve(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   180
                    expectedImageDir.getFileName().toString() + ".app");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   181
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   182
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   183
        cmd.executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   184
        TKit.assertEquals(expectedImageDir.toAbsolutePath().normalize().toString(),
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   185
                cmd.outputBundle().toAbsolutePath().normalize().toString(),
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   186
                String.format(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   187
                        "Check [%s] directory is filled with application image data",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   188
                        expectedImageDir));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   189
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   190
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   191
    @Test
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   192
     // Regular app
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   193
    @Parameter("Hello")
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   194
    // Modular app
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   195
    @Parameter("com.other/com.other.Hello")
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   196
    public void testApp(String javaAppDesc) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   197
        JPackageCommand.helloAppImage(javaAppDesc)
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   198
        .executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   199
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   200
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   201
    @Test
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   202
    public void testWhitespaceInPaths() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   203
        JPackageCommand.helloAppImage("a/b c.jar:Hello")
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   204
        .setArgumentValue("--input", TKit.workDir().resolve("The quick brown fox"))
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   205
        .setArgumentValue("--dest", TKit.workDir().resolve("jumps over the lazy dog"))
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   206
        .executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   207
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   208
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   209
    @Test
58466
47f0d21c7e8d 8231882: --add-modules ALL-MODULE-PATH is not handled properly
herrick
parents: 58463
diff changeset
   210
    @Parameter("ALL-MODULE-PATH")
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   211
    @Parameter("ALL-DEFAULT")
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   212
    @Parameter("java.desktop")
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   213
    @Parameter("java.desktop,jdk.jartool")
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   214
    @Parameter({ "java.desktop", "jdk.jartool" })
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   215
    public void testAddModules(String... addModulesArg) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   216
        JPackageCommand cmd = JPackageCommand
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   217
                .helloAppImage("goodbye.jar:com.other/com.other.Hello");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   218
        Stream.of(addModulesArg).map(v -> Stream.of("--add-modules", v)).flatMap(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   219
                s -> s).forEachOrdered(cmd::addArgument);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   220
        cmd.executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   221
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   222
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   223
    /**
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   224
     * Test --temp option. Doesn't make much sense for app image as temporary
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   225
     * directory is used only on Windows. Test it in packaging mode.
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   226
     * @throws IOException
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   227
     */
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   228
    @Test
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   229
    public void testTemp() throws IOException {
58671
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   230
        TKit.withTempDirectory("temp-root", tempRoot -> {
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   231
            Function<JPackageCommand, Path> getTempDir = cmd -> {
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   232
                return tempRoot.resolve(cmd.outputBundle().getFileName());
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   233
            };
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   234
58671
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   235
            ThrowingConsumer<JPackageCommand> addTempDir = cmd -> {
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   236
                Path tempDir = getTempDir.apply(cmd);
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   237
                Files.createDirectories(tempDir);
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   238
                cmd.addArguments("--temp", tempDir);
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   239
            };
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   240
58671
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   241
            new PackageTest().configureHelloApp().addInitializer(addTempDir)
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   242
            .addBundleVerifier(cmd -> {
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   243
                // Check jpackage actually used the supplied directory.
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   244
                Path tempDir = getTempDir.apply(cmd);
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   245
                TKit.assertNotEquals(0, tempDir.toFile().list().length,
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   246
                        String.format(
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   247
                                "Check jpackage wrote some data in the supplied temporary directory [%s]",
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   248
                                tempDir));
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   249
            })
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   250
            .run();
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   251
58671
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   252
            new PackageTest().configureHelloApp().addInitializer(addTempDir)
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   253
            .addInitializer(cmd -> {
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   254
                // Clean output from the previus jpackage run.
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   255
                Files.delete(cmd.outputBundle());
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   256
            })
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   257
            // Temporary directory should not be empty,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   258
            // jpackage should exit with error.
58671
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   259
            .setExpectedExitCode(1)
3b578a5976df 8232387 : tools/jpackage/share/jdk/jpackage/tests/BasicTest.java fails
herrick
parents: 58648
diff changeset
   260
            .run();
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   261
        });
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   262
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   263
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   264
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   265
    public void testAtFile() throws IOException {
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   266
        JPackageCommand cmd = JPackageCommand.helloAppImage();
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   267
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   268
        // Init options file with the list of options configured
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   269
        // for JPackageCommand instance.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   270
        final Path optionsFile = TKit.workDir().resolve("options");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   271
        Files.write(optionsFile,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   272
                List.of(String.join(" ", cmd.getAllArguments())));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   273
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   274
        // Build app jar file.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   275
        cmd.executePrerequisiteActions();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   276
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   277
        // Make sure output directory is empty. Normally JPackageCommand would
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   278
        // do this automatically.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   279
        TKit.deleteDirectoryContentsRecursive(cmd.outputDir());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   280
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   281
        // Instead of running jpackage command through configured
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   282
        // JPackageCommand instance, run vanilla jpackage command with @ file.
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   283
        getJPackageToolProvider()
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   284
                .addArgument(String.format("@%s", optionsFile))
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   285
                .execute().assertExitCodeIsZero();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   286
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   287
        // Verify output of jpackage command.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   288
        cmd.assertImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   289
        HelloApp.executeLauncherAndVerifyOutput(cmd);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   290
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   291
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   292
    @Parameter("Hello")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   293
    @Parameter("com.foo/com.foo.main.Aloha")
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   294
    @Test
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   295
    public void testJLinkRuntime(String javaAppDesc) {
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   296
        JPackageCommand cmd = JPackageCommand.helloAppImage(javaAppDesc);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   297
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   298
        // If `--module` parameter was set on jpackage command line, get its
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   299
        // value and extract module name.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   300
        // E.g.: foo.bar2/foo.bar.Buz -> foo.bar2
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   301
        // Note: HelloApp class manages `--module` parameter on jpackage command line
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   302
        final String moduleName = cmd.getArgumentValue("--module", () -> null,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   303
                (v) -> v.split("/", 2)[0]);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   304
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   305
        if (moduleName != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   306
            // Build module jar.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   307
            cmd.executePrerequisiteActions();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   308
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   309
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   310
        TKit.withTempDirectory("runtime", runtimeDir -> {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   311
            TKit.deleteDirectoryRecursive(runtimeDir, String.format(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   312
                    "Delete [%s] output directory for jlink command", runtimeDir));
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   313
            Executor jlink = getToolProvider(JavaTool.JLINK)
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   314
            .saveOutput(false)
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   315
            .addArguments(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   316
                    "--add-modules", "java.base",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   317
                    "--output", runtimeDir.toString(),
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   318
                    "--strip-debug",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   319
                    "--no-header-files",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   320
                    "--no-man-pages");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   321
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   322
            if (moduleName != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   323
                jlink.addArguments("--add-modules", moduleName, "--module-path",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   324
                        Path.of(cmd.getArgumentValue("--module-path")).resolve(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   325
                                "hello.jar").toString());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   326
            }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   327
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   328
            jlink.execute().assertExitCodeIsZero();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   329
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   330
            cmd.addArguments("--runtime-image", runtimeDir);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   331
            cmd.executeAndAssertHelloAppImageCreated();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   332
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   333
            final Path appImageRuntimePath = cmd.appRuntimeDirectory();
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   334
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   335
            //
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   336
            // This is an overkill to list modules in jlink output as we have
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   337
            // already verified that Java app is functional and thus app's runtime
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   338
            // is likely to be OK, but let's double check.
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   339
            //
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   340
            // Filter out all first strings with whitespace. They are java
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   341
            // launcher output like `Picked up ...` unrelated to module names.
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   342
            //
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   343
            Pattern whitespaceChar = Pattern.compile("\\s");
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   344
            List<String> moduleList = new Executor().dumpOutput().setExecutable(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   345
                    appImageRuntimePath.resolve(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   346
                            JPackageCommand.relativePathInRuntime(JavaTool.JAVA))).addArguments(
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   347
                    "--list-modules").executeAndGetOutput().stream().dropWhile(
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   348
                            s -> whitespaceChar.matcher(s).find()).sorted().collect(
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   349
                            Collectors.toList());
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   350
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   351
            List<String> expectedModules = new ArrayList<>();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   352
            expectedModules.add(String.format("java.base@%s",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   353
                    System.getProperty("java.version")));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   354
            if (moduleName != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   355
                expectedModules.add(moduleName);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   356
            }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   357
            expectedModules = expectedModules.stream().sorted().collect(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   358
                    Collectors.toList());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   359
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   360
            TKit.assertStringListEquals(expectedModules, moduleList,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   361
                    String.format(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   362
                            "Check modules in application image runtime directory at [%s]",
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   363
                            appImageRuntimePath));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   364
        });
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   365
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   366
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   367
    private static Executor getJPackageToolProvider() {
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   368
        return getToolProvider(JavaTool.JPACKAGE);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   369
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   370
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58416
diff changeset
   371
    private static Executor getToolProvider(JavaTool tool) {
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58466
diff changeset
   372
        return new Executor().dumpOutput().saveOutput().setToolProvider(tool);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   373
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents:
diff changeset
   374
}