test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Executor.java
author herrick
Wed, 16 Oct 2019 10:32:08 -0400
branchJDK-8200758-branch
changeset 58648 3bf53ffa9ae7
parent 58463 4e71249f291c
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:
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     1
/*
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     2
 * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     4
 *
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     8
 *
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    13
 * accompanied this code).
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    14
 *
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    18
 *
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    21
 * questions.
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    22
 */
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    23
package jdk.jpackage.test;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    24
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    25
import java.io.BufferedReader;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    26
import java.io.ByteArrayOutputStream;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    27
import java.io.IOException;
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    28
import java.io.InputStreamReader;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    29
import java.io.OutputStream;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    30
import java.io.PrintStream;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    31
import java.io.StringReader;
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    32
import java.nio.file.Path;
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
    33
import java.util.*;
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
    34
import java.util.regex.Pattern;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    35
import java.util.spi.ToolProvider;
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
    36
import java.util.stream.Collectors;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    37
import java.util.stream.Stream;
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    38
import jdk.jpackage.test.Functional.ThrowingSupplier;
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    39
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    40
public final class Executor extends CommandArguments<Executor> {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    41
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    42
    public Executor() {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    43
        saveOutputType = new HashSet<>(Set.of(SaveOutputType.NONE));
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    44
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    45
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    46
    public Executor setExecutable(String v) {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    47
        return setExecutable(Path.of(v));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    48
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    49
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    50
    public Executor setExecutable(Path v) {
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
    51
        executable = Objects.requireNonNull(v);
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
    52
        toolProvider = null;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    53
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    54
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    55
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    56
    public Executor setToolProvider(ToolProvider v) {
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
    57
        toolProvider = Objects.requireNonNull(v);
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
    58
        executable = null;
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    59
        return this;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    60
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    61
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
    62
    public Executor setToolProvider(JavaTool v) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
    63
        return setToolProvider(v.asToolProvider());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
    64
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
    65
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    66
    public Executor setDirectory(Path v) {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    67
        directory = v;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    68
        return this;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    69
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    70
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    71
    public Executor setExecutable(JavaTool v) {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    72
        return setExecutable(v.getPath());
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    73
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    74
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    75
    /**
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    76
     * Configures this instance to save full output that command will produce.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    77
     * This function is mutual exclusive with
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    78
     * saveFirstLineOfOutput() function.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    79
     *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    80
     * @return this
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    81
     */
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    82
    public Executor saveOutput() {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    83
        saveOutputType.remove(SaveOutputType.FIRST_LINE);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    84
        saveOutputType.add(SaveOutputType.FULL);
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    85
        return this;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    86
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
    87
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    88
    /**
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    89
     * Configures how to save output that command will produce. If
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    90
     * <code>v</code> is <code>true</code>, the function call is equivalent to
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    91
     * <code>saveOutput()</code> call. If <code>v</code> is <code>false</code>,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    92
     * the function will result in not preserving command output.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    93
     *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    94
     * @return this
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    95
     */
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    96
    public Executor saveOutput(boolean v) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    97
        if (v) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    98
            saveOutput();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
    99
        } else {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   100
            saveOutputType.remove(SaveOutputType.FIRST_LINE);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   101
            saveOutputType.remove(SaveOutputType.FULL);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   102
        }
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   103
        return this;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   104
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   105
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   106
    /**
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   107
     * Configures this instance to save only the first line out output that
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   108
     * command will produce. This function is mutual exclusive with
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   109
     * saveOutput() function.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   110
     *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   111
     * @return this
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   112
     */
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   113
    public Executor saveFirstLineOfOutput() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   114
        saveOutputType.add(SaveOutputType.FIRST_LINE);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   115
        saveOutputType.remove(SaveOutputType.FULL);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   116
        return this;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   117
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   118
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   119
    /**
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   120
     * Configures this instance to dump all output that command will produce to
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   121
     * System.out and System.err. Can be used together with saveOutput() and
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   122
     * saveFirstLineOfOutput() to save command output and also copy it in the
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   123
     * default output streams.
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   124
     *
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   125
     * @return this
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   126
     */
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   127
    public Executor dumpOutput() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   128
        return dumpOutput(true);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   129
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   130
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   131
    public Executor dumpOutput(boolean v) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   132
        if (v) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   133
            saveOutputType.add(SaveOutputType.DUMP);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   134
        } else {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   135
            saveOutputType.remove(SaveOutputType.DUMP);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   136
        }
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   137
        return this;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   138
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   139
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   140
    public class Result {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   141
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   142
        Result(int exitCode) {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   143
            this.exitCode = exitCode;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   144
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   145
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   146
        public String getFirstLineOfOutput() {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   147
            return output.get(0);
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   148
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   149
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   150
        public List<String> getOutput() {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   151
            return output;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   152
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   153
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   154
        public String getPrintableCommandLine() {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   155
            return Executor.this.getPrintableCommandLine();
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   156
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   157
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   158
        public Result assertExitCodeIs(int expectedExitCode) {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   159
            TKit.assertEquals(expectedExitCode, exitCode, String.format(
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   160
                    "Check command %s exited with %d code",
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   161
                    getPrintableCommandLine(), expectedExitCode));
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   162
            return this;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   163
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   164
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   165
        public Result assertExitCodeIsZero() {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   166
            return assertExitCodeIs(0);
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   167
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   168
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   169
        final int exitCode;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   170
        private List<String> output;
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   171
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   172
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   173
    public Result execute() {
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   174
        if (toolProvider != null && directory != null) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   175
            throw new IllegalArgumentException(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   176
                    "Can't change directory when using tool provider");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   177
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   178
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   179
        return ThrowingSupplier.toSupplier(() -> {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   180
            if (toolProvider != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   181
                return runToolProvider();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   182
            }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   183
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   184
            if (executable != null) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   185
                return runExecutable();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   186
            }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   187
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   188
            throw new IllegalStateException("No command to execute");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   189
        }).get();
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   190
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   191
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   192
    public String executeAndGetFirstLineOfOutput() {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   193
        return saveFirstLineOfOutput().execute().assertExitCodeIsZero().getFirstLineOfOutput();
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   194
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   195
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   196
    public List<String> executeAndGetOutput() {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   197
        return saveOutput().execute().assertExitCodeIsZero().getOutput();
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   198
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   199
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   200
    private boolean withSavedOutput() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   201
        return saveOutputType.contains(SaveOutputType.FULL) || saveOutputType.contains(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   202
                SaveOutputType.FIRST_LINE);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   203
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   204
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   205
    private Path executablePath() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   206
        if (directory == null || executable.isAbsolute()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   207
            return executable;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   208
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   209
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   210
        // If relative path to executable is used it seems to be broken when
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   211
        // ProcessBuilder changes the directory. On Windows it changes the
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   212
        // directory first and on Linux it looks up for executable before
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   213
        // changing the directory. So to stay of safe side, use absolute path
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   214
        // to executable.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   215
        return executable.toAbsolutePath();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   216
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   217
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   218
    private Result runExecutable() throws IOException, InterruptedException {
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   219
        List<String> command = new ArrayList<>();
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   220
        command.add(executablePath().toString());
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   221
        command.addAll(args);
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   222
        ProcessBuilder builder = new ProcessBuilder(command);
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   223
        StringBuilder sb = new StringBuilder(getPrintableCommandLine());
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   224
        if (withSavedOutput()) {
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   225
            builder.redirectErrorStream(true);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   226
            sb.append("; save output");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   227
        } else if (saveOutputType.contains(SaveOutputType.DUMP)) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   228
            builder.inheritIO();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   229
            sb.append("; inherit I/O");
58417
67ffaf3a2b75 8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents: 58416
diff changeset
   230
        } else {
67ffaf3a2b75 8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents: 58416
diff changeset
   231
            builder.redirectError(ProcessBuilder.Redirect.DISCARD);
67ffaf3a2b75 8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents: 58416
diff changeset
   232
            builder.redirectOutput(ProcessBuilder.Redirect.DISCARD);
67ffaf3a2b75 8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents: 58416
diff changeset
   233
            sb.append("; discard I/O");
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   234
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   235
        if (directory != null) {
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   236
            builder.directory(directory.toFile());
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   237
            sb.append(String.format("; in directory [%s]", directory));
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   238
        }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   239
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   240
        TKit.trace("Execute " + sb.toString() + "...");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   241
        Process process = builder.start();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   242
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   243
        List<String> outputLines = null;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   244
        if (withSavedOutput()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   245
            try (BufferedReader outReader = new BufferedReader(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   246
                    new InputStreamReader(process.getInputStream()))) {
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
   247
                if (saveOutputType.contains(SaveOutputType.DUMP)
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
   248
                        || saveOutputType.contains(SaveOutputType.FULL)) {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   249
                    outputLines = outReader.lines().collect(Collectors.toList());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   250
                } else {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   251
                    outputLines = Arrays.asList(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   252
                            outReader.lines().findFirst().orElse(null));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   253
                }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   254
            } finally {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   255
                if (saveOutputType.contains(SaveOutputType.DUMP) && outputLines != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   256
                    outputLines.stream().forEach(System.out::println);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   257
                    if (saveOutputType.contains(SaveOutputType.FIRST_LINE)) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   258
                        // Pick the first line of saved output if there is one
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   259
                        for (String line: outputLines) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   260
                            outputLines = List.of(line);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   261
                            break;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   262
                        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   263
                    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   264
                }
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   265
            }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   266
        }
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   267
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   268
        Result reply = new Result(process.waitFor());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   269
        TKit.trace("Done. Exit code: " + reply.exitCode);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   270
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   271
        if (outputLines != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   272
            reply.output = Collections.unmodifiableList(outputLines);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   273
        }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   274
        return reply;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   275
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   276
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   277
    private Result runToolProvider(PrintStream out, PrintStream err) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   278
        TKit.trace("Execute " + getPrintableCommandLine() + "...");
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   279
        Result reply = new Result(toolProvider.run(out, err, args.toArray(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   280
                String[]::new)));
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   281
        TKit.trace("Done. Exit code: " + reply.exitCode);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   282
        return reply;
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   283
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   284
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   285
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   286
    private Result runToolProvider() throws IOException {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   287
        if (!withSavedOutput()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   288
            if (saveOutputType.contains(SaveOutputType.DUMP)) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   289
                return runToolProvider(System.out, System.err);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   290
            }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   291
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   292
            PrintStream nullPrintStream = new PrintStream(new OutputStream() {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   293
                @Override
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   294
                public void write(int b) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   295
                    // Nop
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   296
                }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   297
            });
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   298
            return runToolProvider(nullPrintStream, nullPrintStream);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   299
        }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   300
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   301
        try (ByteArrayOutputStream buf = new ByteArrayOutputStream();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   302
                PrintStream ps = new PrintStream(buf)) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   303
            Result reply = runToolProvider(ps, ps);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   304
            ps.flush();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   305
            try (BufferedReader bufReader = new BufferedReader(new StringReader(
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   306
                    buf.toString()))) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   307
                if (saveOutputType.contains(SaveOutputType.FIRST_LINE)) {
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
   308
                    String firstLine = bufReader.lines().findFirst().orElse(null);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   309
                    if (firstLine != null) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   310
                        reply.output = List.of(firstLine);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   311
                    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   312
                } else if (saveOutputType.contains(SaveOutputType.FULL)) {
58463
4e71249f291c 8231850: BasicTest test fails in jcov build
herrick
parents: 58417
diff changeset
   313
                    reply.output = bufReader.lines().collect(
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   314
                            Collectors.toUnmodifiableList());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   315
                }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   316
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   317
                if (saveOutputType.contains(SaveOutputType.DUMP)) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   318
                    Stream<String> lines;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   319
                    if (saveOutputType.contains(SaveOutputType.FULL)) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   320
                        lines = reply.output.stream();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   321
                    } else {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   322
                        lines = bufReader.lines();
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   323
                    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   324
                    lines.forEach(System.out::println);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   325
                }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   326
            }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   327
            return reply;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   328
        }
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   329
    }
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   330
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   331
    public String getPrintableCommandLine() {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   332
        final String exec;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   333
        String format = "[%s](%d)";
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   334
        if (toolProvider == null && executable == null) {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   335
            exec = "<null>";
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   336
        } else if (toolProvider != null) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   337
            format = "tool provider " + format;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   338
            exec = toolProvider.name();
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   339
        } else {
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58463
diff changeset
   340
            exec = executablePath().toString();
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   341
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   342
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   343
        return String.format(format, printCommandLine(exec, args),
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   344
                args.size() + 1);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   345
    }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   346
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   347
    private static String printCommandLine(String executable, List<String> args) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   348
        // Want command line printed in a way it can be easily copy/pasted
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   349
        // to be executed manally
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   350
        Pattern regex = Pattern.compile("\\s");
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   351
        return Stream.concat(Stream.of(executable), args.stream()).map(
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   352
                v -> (v.isEmpty() || regex.matcher(v).find()) ? "\"" + v + "\"" : v).collect(
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   353
                        Collectors.joining(" "));
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   354
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   355
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   356
    private ToolProvider toolProvider;
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   357
    private Path executable;
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58301
diff changeset
   358
    private Set<SaveOutputType> saveOutputType;
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   359
    private Path directory;
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   360
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   361
    private static enum SaveOutputType {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58113
diff changeset
   362
        NONE, FULL, FIRST_LINE, DUMP
58036
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   363
    };
f7f10023f7c0 8229840 : Add jtreg test for --linux-app-category option
herrick
parents:
diff changeset
   364
}