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