test/jdk/tools/jpackage/helpers/JPackageHelper.java
author herrick
Fri, 23 Nov 2018 09:02:17 -0500
branchJDK-8200758-branch
changeset 57039 98d3963b0b7b
parent 57031 test/jdk/tools/jpackager/helpers/JPackagerHelper.java@ea4755429ed8
child 57079 c53a2eca0f57
permissions -rw-r--r--
8214051: rename jpackager tool to jpackage Reviewed-by: almatvee
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     1
/*
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     2
 * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     4
 *
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     8
 *
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    13
 * accompanied this code).
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    14
 *
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    18
 *
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    21
 * questions.
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    22
 */
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    23
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    24
import java.io.File;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    25
import java.io.PrintWriter;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    26
import java.io.StringWriter;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    27
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    28
import java.nio.file.Files;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    29
import java.nio.file.Path;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    30
import java.util.ArrayList;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    31
import java.util.List;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    32
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    33
import java.util.spi.ToolProvider;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    34
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    35
public class JPackageHelper {
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    36
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    37
    private static final boolean VERBOSE = false;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    38
    private static final String OS = System.getProperty("os.name").toLowerCase();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    39
    private static final String JAVA_HOME = System.getProperty("java.home");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    40
    public static final String TEST_SRC;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    41
    private static final Path BIN_DIR = Path.of(JAVA_HOME, "bin");
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    42
    private static final Path JPACKAGE;
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    43
    private static final Path JAVAC;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    44
    private static final Path JAR;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    45
    private static final Path JLINK;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    46
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    47
    static {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    48
        if (OS.startsWith("win")) {
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    49
            JPACKAGE = BIN_DIR.resolve("jpackage.exe");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    50
            JAVAC = BIN_DIR.resolve("javac.exe");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    51
            JAR = BIN_DIR.resolve("jar.exe");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    52
            JLINK = BIN_DIR.resolve("jlink.exe");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    53
        } else {
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    54
            JPACKAGE = BIN_DIR.resolve("jpackage");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    55
            JAVAC = BIN_DIR.resolve("javac");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    56
            JAR = BIN_DIR.resolve("jar");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    57
            JLINK = BIN_DIR.resolve("jlink");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    58
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    59
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    60
        // Figure out test src based on where we called
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    61
        File testSrc = new File(System.getProperty("test.src") + File.separator + ".."
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    62
                + File.separator + "apps");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    63
        if (testSrc.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    64
            TEST_SRC = System.getProperty("test.src") + File.separator + "..";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    65
        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    66
            testSrc = new File(System.getProperty("test.src") + File.separator
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    67
                    + ".." + File.separator + ".." + File.separator + "apps");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    68
            if (testSrc.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    69
                TEST_SRC = System.getProperty("test.src") + File.separator + ".."
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    70
                        + File.separator + "..";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    71
            } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    72
                TEST_SRC = System.getProperty("test.src");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    73
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    74
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    75
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    76
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    77
    static final ToolProvider JPACKAGE_TOOL =
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    78
            ToolProvider.findFirst("jpackage").orElseThrow(
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    79
            () -> new RuntimeException("jpackage tool not found"));
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    80
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    81
    public static int execute(File out, String... command) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    82
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    83
            System.out.print("Execute command: ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    84
            for (String c : command) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    85
                System.out.print(c);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    86
                System.out.print(" ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    87
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    88
            System.out.println();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    89
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    90
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    91
        ProcessBuilder builder = new ProcessBuilder(command);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    92
        if (out != null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    93
            builder.redirectErrorStream(true);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    94
            builder.redirectOutput(out);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    95
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    96
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    97
        Process process = builder.start();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    98
        return process.waitFor();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    99
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   100
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   101
    public static Process executeNoWait(File out, String... command) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   102
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   103
            System.out.print("Execute command: ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   104
            for (String c : command) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   105
                System.out.print(c);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   106
                System.out.print(" ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   107
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   108
            System.out.println();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   109
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   110
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   111
        ProcessBuilder builder = new ProcessBuilder(command);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   112
        if (out != null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   113
            builder.redirectErrorStream(true);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   114
            builder.redirectOutput(out);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   115
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   116
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   117
        return builder.start();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   118
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   119
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   120
    private static String[] getCommand(String... args) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   121
        String[] command;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   122
        if (args == null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   123
            command = new String[1];
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   124
        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   125
            command = new String[args.length + 1];
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   126
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   127
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   128
        int index = 0;
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   129
        command[index] = JPACKAGE.toString();
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   130
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   131
        if (args != null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   132
            for (String arg : args) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   133
                index++;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   134
                command[index] = arg;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   135
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   136
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   137
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   138
        return command;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   139
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   140
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   141
    public static String executeCLI(boolean retValZero, String... args) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   142
        int retVal;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   143
        File outfile = new File("output.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   144
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   145
            String[] command = getCommand(args);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   146
            retVal = execute(outfile, command);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   147
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   148
            if (outfile.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   149
                System.err.println(Files.readString(outfile.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   150
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   151
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   152
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   153
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   154
        String output = Files.readString(outfile.toPath());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   155
        if (retValZero) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   156
            if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   157
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   158
                throw new AssertionError("jpackage exited with error: " + retVal);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   159
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   160
        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   161
            if (retVal == 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   162
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   163
                throw new AssertionError("jpackage exited without error: " + retVal);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   164
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   165
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   166
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   167
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   168
            System.out.println("output =");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   169
            System.out.println(output);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   170
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   171
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   172
        return output;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   173
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   174
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   175
    public static String executeToolProvider(boolean retValZero, String... args) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   176
        StringWriter writer = new StringWriter();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   177
        PrintWriter pw = new PrintWriter(writer);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   178
        int retVal = JPACKAGE_TOOL.run(pw, pw, args);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   179
        String output = writer.toString();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   180
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   181
        if (retValZero) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   182
            if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   183
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   184
                throw new AssertionError("jpackage exited with error: " + retVal);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   185
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   186
        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   187
            if (retVal == 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   188
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   189
                throw new AssertionError("jpackage exited without error");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   190
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   191
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   192
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   193
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   194
            System.out.println("output =");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   195
            System.out.println(output);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   196
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   197
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   198
        return output;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   199
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   200
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   201
    public static boolean isWindows() {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   202
        return (OS.contains("win"));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   203
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   204
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   205
    public static boolean isOSX() {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   206
        return (OS.contains("mac"));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   207
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   208
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   209
    public static boolean isLinux() {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   210
        return ((OS.contains("nix") || OS.contains("nux")));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   211
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   212
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   213
    public static void createHelloJar() throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   214
        createJar(false);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   215
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   216
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   217
    public static void createHelloJarWithMainClass() throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   218
        createJar(true);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   219
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   220
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   221
    private static void createJar(boolean mainClassAttribute) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   222
        int retVal;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   223
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   224
        File input = new File("input");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   225
        if (!input.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   226
            input.mkdir();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   227
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   228
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   229
        Files.copy(Path.of(TEST_SRC + File.separator + "apps" + File.separator
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   230
                + "Hello.java"), Path.of("Hello.java"));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   231
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   232
        File javacLog = new File("javac.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   233
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   234
            retVal = execute(javacLog, JAVAC.toString(), "Hello.java");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   235
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   236
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   237
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   238
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   239
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   240
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   241
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   242
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   243
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   244
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   245
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   246
            throw new AssertionError("javac exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   247
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   248
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   249
        File jarLog = new File("jar.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   250
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   251
            List<String> args = new ArrayList<>();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   252
            args.add(JAR.toString());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   253
            args.add("-c");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   254
            args.add("-v");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   255
            args.add("-f");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   256
            args.add("input" + File.separator + "hello.jar");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   257
            if (mainClassAttribute) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   258
                args.add("-e");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   259
                args.add("Hello");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   260
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   261
            args.add("Hello.class");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   262
            retVal = execute(jarLog, args.stream().toArray(String[]::new));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   263
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   264
            if (jarLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   265
                System.err.println(Files.readString(jarLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   266
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   267
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   268
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   269
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   270
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   271
            if (jarLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   272
                System.err.println(Files.readString(jarLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   273
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   274
            throw new AssertionError("jar exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   275
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   276
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   277
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   278
    public static void createHelloModule() throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   279
        createModule("Hello.java");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   280
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   281
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   282
    private static void createModule(String javaFile) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   283
        int retVal;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   284
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   285
        File input = new File("input");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   286
        if (!input.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   287
            input.mkdir();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   288
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   289
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   290
        File module = new File("module" + File.separator + "com.hello");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   291
        if (!module.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   292
            module.mkdirs();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   293
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   294
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   295
        File javacLog = new File("javac.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   296
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   297
            List<String> args = new ArrayList<>();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   298
            args.add(JAVAC.toString());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   299
            args.add("-d");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   300
            args.add("module" + File.separator + "com.hello");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   301
            args.add(TEST_SRC + File.separator + "apps" + File.separator + "com.hello"
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   302
                    + File.separator + "module-info.java");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   303
            args.add(TEST_SRC + File.separator + "apps" + File.separator + "com.hello"
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   304
                    + File.separator + "com" + File.separator + "hello" + File.separator
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   305
                    + javaFile);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   306
            retVal = execute(javacLog, args.stream().toArray(String[]::new));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   307
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   308
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   309
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   310
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   311
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   312
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   313
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   314
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   315
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   316
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   317
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   318
            throw new AssertionError("javac exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   319
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   320
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   321
        File jarLog = new File("jar.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   322
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   323
            List<String> args = new ArrayList<>();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   324
            args.add(JAR.toString());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   325
            args.add("--create");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   326
            args.add("--file");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   327
            args.add("input" + File.separator + "com.hello.jar");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   328
            args.add("-C");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   329
            args.add("module" + File.separator + "com.hello");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   330
            args.add(".");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   331
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   332
            retVal = execute(jarLog, args.stream().toArray(String[]::new));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   333
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   334
            if (jarLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   335
                System.err.println(Files.readString(jarLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   336
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   337
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   338
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   339
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   340
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   341
            if (jarLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   342
                System.err.println(Files.readString(jarLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   343
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   344
            throw new AssertionError("jar exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   345
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   346
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   347
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   348
    public static void createRuntime() throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   349
        int retVal;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   350
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   351
        File jlinkLog = new File("jlink.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   352
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   353
            List<String> args = new ArrayList<>();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   354
            args.add(JLINK.toString());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   355
            args.add("--output");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   356
            args.add("runtime");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   357
            args.add("--add-modules");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   358
            args.add("java.base");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   359
            retVal = execute(jlinkLog, args.stream().toArray(String[]::new));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   360
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   361
            if (jlinkLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   362
                System.err.println(Files.readString(jlinkLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   363
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   364
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   365
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   366
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   367
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   368
            if (jlinkLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   369
                System.err.println(Files.readString(jlinkLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   370
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   371
            throw new AssertionError("jlink exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   372
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   373
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   374
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   375
    public static String listToArgumentsMap(List<String> arguments, boolean toolProvider) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   376
        if (arguments.isEmpty()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   377
            return "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   378
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   379
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   380
        String argsStr = "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   381
        for (int i = 0; i < arguments.size(); i++) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   382
            String arg = arguments.get(i);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   383
            argsStr += quote(arg, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   384
            if ((i + 1) != arguments.size()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   385
                argsStr += " ";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   386
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   387
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   388
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   389
        if (!toolProvider && isWindows()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   390
            if (argsStr.contains(" ")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   391
                if (argsStr.contains("\"")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   392
                    argsStr = escapeQuote(argsStr, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   393
                }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   394
                argsStr = "\"" + argsStr + "\"";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   395
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   396
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   397
        return argsStr;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   398
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   399
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   400
    private static String quote(String in, boolean toolProvider) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   401
        if (in == null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   402
            return null;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   403
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   404
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   405
        if (in.isEmpty()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   406
            return "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   407
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   408
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   409
        if (!in.contains("=")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   410
            // Not a property
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   411
            if (in.contains(" ")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   412
                in = escapeQuote(in, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   413
                return "\"" + in + "\"";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   414
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   415
            return in;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   416
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   417
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   418
        if (!in.contains(" ")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   419
            return in; // No need to quote
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   420
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   421
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   422
        int paramIndex = in.indexOf("=");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   423
        if (paramIndex <= 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   424
            return in; // Something wrong, just skip quoting
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   425
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   426
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   427
        String param = in.substring(0, paramIndex);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   428
        String value = in.substring(paramIndex + 1);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   429
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   430
        if (value.length() == 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   431
            return in; // No need to quote
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   432
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   433
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   434
        value = escapeQuote(value, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   435
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   436
        return param + "=" + "\"" + value + "\"";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   437
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   438
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   439
    private static String escapeQuote(String in, boolean toolProvider) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   440
        if (in == null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   441
            return null;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   442
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   443
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   444
        if (in.isEmpty()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   445
            return "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   446
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   447
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   448
        if (in.contains("\"")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   449
            // Use code points to preserve non-ASCII chars
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   450
            StringBuilder sb = new StringBuilder();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   451
            int codeLen = in.codePointCount(0, in.length());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   452
            for (int i = 0; i < codeLen; i++) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   453
                int code = in.codePointAt(i);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   454
                // Note: No need to escape '\' on Linux or OS X
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   455
                // jpackage expects us to pass arguments and properties with
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   456
                // quotes and spaces as a map
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   457
                // with quotes being escaped with additional \ for
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   458
                // internal quotes.
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   459
                // So if we want two properties below:
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   460
                // -Djnlp.Prop1=Some "Value" 1
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   461
                // -Djnlp.Prop2=Some Value 2
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   462
                // jpackage will need:
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   463
                // "-Djnlp.Prop1=\"Some \\"Value\\" 1\" -Djnlp.Prop2=\"Some Value 2\""
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   464
                // but since we using ProcessBuilder to run jpackage we will need to escape
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   465
                // our escape symbols as well, so we will need to pass string below to ProcessBuilder:
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   466
                // "-Djnlp.Prop1=\\\"Some \\\\\\\"Value\\\\\\\" 1\\\" -Djnlp.Prop2=\\\"Some Value 2\\\""
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   467
                switch (code) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   468
                    case '"':
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   469
                        // " -> \" -> \\\"
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   470
                        if (i == 0 || in.codePointAt(i - 1) != '\\') {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   471
                            if (!toolProvider && isWindows()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   472
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   473
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   474
                            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   475
                            sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   476
                            sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   477
                        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   478
                        break;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   479
                    case '\\':
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   480
                        // We need to escape already escaped symbols as well
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   481
                        if ((i + 1) < codeLen) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   482
                            int nextCode = in.codePointAt(i + 1);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   483
                            if (nextCode == '"') {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   484
                                // \" -> \\\"
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   485
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   486
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   487
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   488
                                sb.appendCodePoint(nextCode);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   489
                            } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   490
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   491
                                sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   492
                            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   493
                        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   494
                            if (isWindows()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   495
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   496
                            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   497
                            sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   498
                        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   499
                        break;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   500
                    default:
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   501
                        sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   502
                        break;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   503
                }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   504
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   505
            return sb.toString();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   506
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   507
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   508
        return in;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   509
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   510
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   511
}