test/jdk/tools/jpackage/helpers/JPackageHelper.java
author herrick
Wed, 20 Nov 2019 10:17:37 -0500
branchJDK-8200758-branch
changeset 59160 e90068e7afa1
parent 58994 b09ba68c6a19
permissions -rw-r--r--
JDK-8234402: revert change that stopped providing JPackageToolProvider Reviewed-by: asemenyuk, almatvee, kcr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
     1
/*
57106
ea870b9ce89a 8216492: Update copyright of all new jpackage fils to 2019
kcr
parents: 57079
diff changeset
     2
 * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
57031
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;
57241
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
    25
import java.io.IOException;
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    26
import java.io.PrintWriter;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    27
import java.io.StringWriter;
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
    28
import java.io.BufferedWriter;
57241
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
    29
import java.nio.file.FileVisitResult;
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    30
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    31
import java.nio.file.Files;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    32
import java.nio.file.Path;
57241
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
    33
import java.nio.file.SimpleFileVisitor;
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
    34
import java.nio.file.attribute.BasicFileAttributes;
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    35
import java.util.ArrayList;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    36
import java.util.List;
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58360
diff changeset
    37
import java.util.stream.Collectors;
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58360
diff changeset
    38
import java.util.stream.Stream;
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    39
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    40
import java.util.spi.ToolProvider;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    41
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    42
public class JPackageHelper {
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    43
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    44
    private static final boolean VERBOSE = false;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    45
    private static final String OS = System.getProperty("os.name").toLowerCase();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    46
    private static final String JAVA_HOME = System.getProperty("java.home");
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
    47
    public static final String TEST_SRC_ROOT;
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    48
    public static final String TEST_SRC;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    49
    private static final Path BIN_DIR = Path.of(JAVA_HOME, "bin");
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    50
    private static final Path JPACKAGE;
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    51
    private static final Path JAVAC;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    52
    private static final Path JAR;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    53
    private static final Path JLINK;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    54
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    55
    public static class ModuleArgs {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    56
        private final String version;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    57
        private final String mainClass;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    58
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    59
        ModuleArgs(String version, String mainClass) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    60
            this.version = version;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    61
            this.mainClass = mainClass;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    62
        }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    63
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    64
        public String getVersion() {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    65
            return version;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    66
        }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    67
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    68
        public String getMainClass() {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    69
            return mainClass;
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    70
        }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    71
    }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
    72
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    73
    static {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    74
        if (OS.startsWith("win")) {
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    75
            JPACKAGE = BIN_DIR.resolve("jpackage.exe");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    76
            JAVAC = BIN_DIR.resolve("javac.exe");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    77
            JAR = BIN_DIR.resolve("jar.exe");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    78
            JLINK = BIN_DIR.resolve("jlink.exe");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    79
        } else {
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
    80
            JPACKAGE = BIN_DIR.resolve("jpackage");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    81
            JAVAC = BIN_DIR.resolve("javac");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    82
            JAR = BIN_DIR.resolve("jar");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    83
            JLINK = BIN_DIR.resolve("jlink");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    84
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    85
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    86
        // Figure out test src based on where we called
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    87
        TEST_SRC = System.getProperty("test.src");
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    88
        Path root = Path.of(TEST_SRC);
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    89
        Path apps = Path.of(TEST_SRC, "apps");
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    90
        if (apps.toFile().exists()) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    91
            // fine - test is at root
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
    92
        } else {
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    93
             apps = Path.of(TEST_SRC, "..", "apps");
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    94
             if (apps.toFile().exists()) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    95
                 root = apps.getParent().normalize(); // test is 1 level down
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    96
             } else {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    97
                 apps = Path.of(TEST_SRC, "..", "..", "apps");
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    98
                 if (apps.toFile().exists()) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
    99
                     root = apps.getParent().normalize(); // 2 levels down
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   100
                 } else {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   101
                     apps = Path.of(TEST_SRC, "..", "..", "..", "apps");
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   102
                     if (apps.toFile().exists()) {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   103
                         root = apps.getParent().normalize(); // 3 levels down
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   104
                     } else {
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   105
                         // if we ever have tests more than three levels
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   106
                         // down we need to add code here
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   107
                         throw new RuntimeException("we should never get here");
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   108
                     }
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   109
                 }
57031
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
        }
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   112
        TEST_SRC_ROOT = root.toString();
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   113
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   114
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   115
    static final ToolProvider JPACKAGE_TOOL =
59160
e90068e7afa1 JDK-8234402: revert change that stopped providing JPackageToolProvider
herrick
parents: 58994
diff changeset
   116
            ToolProvider.findFirst("jpackage").orElseThrow(
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   117
            () -> new RuntimeException("jpackage tool not found"));
57031
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
    public static int execute(File out, String... command) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   120
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   121
            System.out.print("Execute command: ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   122
            for (String c : command) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   123
                System.out.print(c);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   124
                System.out.print(" ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   125
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   126
            System.out.println();
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
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   129
        ProcessBuilder builder = new ProcessBuilder(command);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   130
        if (out != null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   131
            builder.redirectErrorStream(true);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   132
            builder.redirectOutput(out);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   133
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   134
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   135
        Process process = builder.start();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   136
        return process.waitFor();
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
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   139
    public static Process executeNoWait(File out, String... command) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   140
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   141
            System.out.print("Execute command: ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   142
            for (String c : command) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   143
                System.out.print(c);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   144
                System.out.print(" ");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   145
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   146
            System.out.println();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   147
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   148
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   149
        ProcessBuilder builder = new ProcessBuilder(command);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   150
        if (out != null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   151
            builder.redirectErrorStream(true);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   152
            builder.redirectOutput(out);
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
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   155
        return builder.start();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   156
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   157
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   158
    private static String[] getCommand(String... args) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   159
        String[] command;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   160
        if (args == null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   161
            command = new String[1];
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   162
        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   163
            command = new String[args.length + 1];
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
        int index = 0;
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   167
        command[index] = JPACKAGE.toString();
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   168
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   169
        if (args != null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   170
            for (String arg : args) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   171
                index++;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   172
                command[index] = arg;
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
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   176
        return command;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   177
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   178
57314
23da9e6f446f 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57241
diff changeset
   179
    public static void deleteRecursive(File path) throws IOException {
57241
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   180
        if (!path.exists()) {
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   181
            return;
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   182
        }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   183
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   184
        Path directory = path.toPath();
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   185
        Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   186
            @Override
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   187
            public FileVisitResult visitFile(Path file,
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   188
                    BasicFileAttributes attr) throws IOException {
57438
4a31db8d42bd 8226599: use code coverage results to remove dead code
herrick
parents: 57419
diff changeset
   189
                file.toFile().setWritable(true);
57241
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   190
                if (OS.startsWith("win")) {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   191
                    try {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   192
                        Files.setAttribute(file, "dos:readonly", false);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   193
                    } catch (Exception ioe) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   194
                        // just report and try to contune
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   195
                        System.err.println("IOException: " + ioe);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   196
                        ioe.printStackTrace(System.err);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   197
                    }
57241
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   198
                }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   199
                Files.delete(file);
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   200
                return FileVisitResult.CONTINUE;
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   201
            }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   202
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   203
            @Override
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   204
            public FileVisitResult preVisitDirectory(Path dir,
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   205
                    BasicFileAttributes attr) throws IOException {
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   206
                if (OS.startsWith("win")) {
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   207
                    Files.setAttribute(dir, "dos:readonly", false);
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   208
                }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   209
                return FileVisitResult.CONTINUE;
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   210
            }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   211
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   212
            @Override
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   213
            public FileVisitResult postVisitDirectory(Path dir, IOException e)
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   214
                    throws IOException {
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   215
                Files.delete(dir);
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   216
                return FileVisitResult.CONTINUE;
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   217
            }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   218
        });
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   219
    }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   220
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   221
    public static void deleteOutputFolder(String output) throws IOException {
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   222
        File outputFolder = new File(output);
57405
539d8b3f9e1e 8224597: create automated tests for platform create-app-image options
herrick
parents: 57395
diff changeset
   223
        System.out.println("deleteOutputFolder: " + outputFolder.getAbsolutePath());
57314
23da9e6f446f 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57241
diff changeset
   224
        try {
23da9e6f446f 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57241
diff changeset
   225
            deleteRecursive(outputFolder);
23da9e6f446f 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57241
diff changeset
   226
        } catch (IOException ioe) {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   227
            System.err.println("IOException: " + ioe);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   228
            ioe.printStackTrace(System.err);
57314
23da9e6f446f 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57241
diff changeset
   229
            deleteRecursive(outputFolder);
23da9e6f446f 8221641: Follow up code clean up for JDK-8221582
herrick
parents: 57241
diff changeset
   230
        }
57241
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   231
    }
e11f3bf34083 8219889: Update jpackage tests for JDK-8219678 changes
herrick
parents: 57151
diff changeset
   232
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   233
    public static String executeCLI(boolean retValZero, String... args) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   234
        int retVal;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   235
        File outfile = new File("output.log");
57414
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57405
diff changeset
   236
        String[] command = getCommand(args);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   237
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   238
            retVal = execute(outfile, command);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   239
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   240
            if (outfile.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   241
                System.err.println(Files.readString(outfile.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   242
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   243
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   244
        }
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
        String output = Files.readString(outfile.toPath());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   247
        if (retValZero) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   248
            if (retVal != 0) {
57414
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57405
diff changeset
   249
                System.err.println("command run:");
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57405
diff changeset
   250
                for (String s : command) { System.err.println(s); }
6eda749d3117 8225428: CLI change to remove "mode", rename to "package", and build only one target
herrick
parents: 57405
diff changeset
   251
                System.err.println("command output:");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   252
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   253
                throw new AssertionError("jpackage exited with error: " + retVal);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   254
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   255
        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   256
            if (retVal == 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   257
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   258
                throw new AssertionError("jpackage exited without error: " + retVal);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   259
            }
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
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   262
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   263
            System.out.println("output =");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   264
            System.out.println(output);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   265
        }
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
        return output;
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
    public static String executeToolProvider(boolean retValZero, String... args) throws Exception {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   271
        StringWriter writer = new StringWriter();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   272
        PrintWriter pw = new PrintWriter(writer);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   273
        int retVal = JPACKAGE_TOOL.run(pw, pw, args);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   274
        String output = writer.toString();
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
        if (retValZero) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   277
            if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   278
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   279
                throw new AssertionError("jpackage exited with error: " + retVal);
57031
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
        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   282
            if (retVal == 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   283
                System.err.println(output);
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   284
                throw new AssertionError("jpackage exited without error");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   285
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   286
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   287
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   288
        if (VERBOSE) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   289
            System.out.println("output =");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   290
            System.out.println(output);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   291
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   292
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   293
        return output;
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
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   296
    public static boolean isWindows() {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   297
        return (OS.contains("win"));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   298
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   299
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   300
    public static boolean isOSX() {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   301
        return (OS.contains("mac"));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   302
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   303
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   304
    public static boolean isLinux() {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   305
        return ((OS.contains("nix") || OS.contains("nux")));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   306
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   307
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   308
    public static void createHelloImageJar(String inputDir) throws Exception {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   309
        createJar(false, "Hello", "image", inputDir);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   310
    }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   311
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   312
    public static void createHelloImageJar() throws Exception {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   313
        createJar(false, "Hello", "image", "input");
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   314
    }
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   315
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   316
    public static void createHelloImageJarWithMainClass() throws Exception {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   317
        createJar(true, "Hello", "image", "input");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   318
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   319
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   320
    public static void createHelloInstallerJar() throws Exception {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   321
        createJar(false, "Hello", "installer", "input");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   322
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   323
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   324
    public static void createHelloInstallerJarWithMainClass() throws Exception {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   325
        createJar(true, "Hello", "installer", "input");
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   326
    }
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   327
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   328
    private static void createJar(boolean mainClassAttribute, String name,
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   329
        String testType, String inputDir) throws Exception {
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   330
        int retVal;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   331
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   332
        File input = new File(inputDir);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   333
        if (!input.exists()) {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   334
            input.mkdirs();
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   335
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   336
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   337
        Path src = Path.of(TEST_SRC_ROOT + File.separator + "apps"
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   338
                + File.separator + testType + File.separator + name + ".java");
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   339
        Path dst = Path.of(name + ".java");
57405
539d8b3f9e1e 8224597: create automated tests for platform create-app-image options
herrick
parents: 57395
diff changeset
   340
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   341
        if (dst.toFile().exists()) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   342
            Files.delete(dst);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   343
        }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   344
        Files.copy(src, dst);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   345
57031
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
        File javacLog = new File("javac.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   348
        try {
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   349
            retVal = execute(javacLog, JAVAC.toString(), name + ".java");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   350
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   351
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   352
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   353
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   354
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   355
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   356
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   357
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   358
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   359
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   360
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   361
            throw new AssertionError("javac exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   362
        }
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
        File jarLog = new File("jar.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   365
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   366
            List<String> args = new ArrayList<>();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   367
            args.add(JAR.toString());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   368
            args.add("-c");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   369
            args.add("-v");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   370
            args.add("-f");
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   371
            args.add(inputDir + File.separator + name.toLowerCase() + ".jar");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   372
            if (mainClassAttribute) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   373
                args.add("-e");
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   374
                args.add(name);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   375
            }
57079
c53a2eca0f57 8215036: Create initial set of tests for jpackage create-installer mode
herrick
parents: 57039
diff changeset
   376
            args.add(name + ".class");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   377
            retVal = execute(jarLog, args.stream().toArray(String[]::new));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   378
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   379
            if (jarLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   380
                System.err.println(Files.readString(jarLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   381
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   382
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   383
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   384
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   385
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   386
            if (jarLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   387
                System.err.println(Files.readString(jarLog.toPath()));
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
            throw new AssertionError("jar exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   390
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   391
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   392
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   393
    public static void createHelloModule() throws Exception {
58305
d42b1f6960aa 8230651: Use version string from main module
herrick
parents: 57438
diff changeset
   394
        createModule("Hello.java", "input", "hello", null, true);
d42b1f6960aa 8230651: Use version string from main module
herrick
parents: 57438
diff changeset
   395
    }
d42b1f6960aa 8230651: Use version string from main module
herrick
parents: 57438
diff changeset
   396
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   397
    public static void createHelloModule(ModuleArgs moduleArgs) throws Exception {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   398
        createModule("Hello.java", "input", "hello", moduleArgs, true);
57031
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
57324
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   401
    public static void createOtherModule() throws Exception {
58305
d42b1f6960aa 8230651: Use version string from main module
herrick
parents: 57438
diff changeset
   402
        createModule("Other.java", "input-other", "other", null, false);
57324
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   403
    }
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   404
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   405
    private static void createModule(String javaFile, String inputDir, String aName,
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   406
            ModuleArgs moduleArgs, boolean createModularJar) throws Exception {
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   407
        int retVal;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   408
57324
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   409
        File input = new File(inputDir);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   410
        if (!input.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   411
            input.mkdir();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   412
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   413
57324
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   414
        File module = new File("module" + File.separator + "com." + aName);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   415
        if (!module.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   416
            module.mkdirs();
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
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   419
        File javacLog = new File("javac.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   420
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   421
            List<String> args = new ArrayList<>();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   422
            args.add(JAVAC.toString());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   423
            args.add("-d");
57324
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   424
            args.add("module" + File.separator + "com." + aName);
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   425
            args.add(TEST_SRC_ROOT + File.separator + "apps" + File.separator
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   426
                    + "com." + aName + File.separator + "module-info.java");
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   427
            args.add(TEST_SRC_ROOT + File.separator + "apps"
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   428
                    + File.separator + "com." + aName + File.separator + "com"
c1d3935fbb79 8222406: Multiple arguments for the same option - aggragation broken
herrick
parents: 57314
diff changeset
   429
                    + File.separator + aName + File.separator + javaFile);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   430
            retVal = execute(javacLog, args.stream().toArray(String[]::new));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   431
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   432
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   433
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   434
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   435
            throw ex;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   436
        }
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
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   439
            if (javacLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   440
                System.err.println(Files.readString(javacLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   441
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   442
            throw new AssertionError("javac exited with error: " + retVal);
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
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   445
        if (createModularJar) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   446
            File jarLog = new File("jar.log");
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   447
            try {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   448
                List<String> args = new ArrayList<>();
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   449
                args.add(JAR.toString());
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   450
                args.add("--create");
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   451
                args.add("--file");
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   452
                args.add(inputDir + File.separator + "com." + aName + ".jar");
58360
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   453
                if (moduleArgs != null) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   454
                    if (moduleArgs.getVersion() != null) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   455
                        args.add("--module-version");
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   456
                        args.add(moduleArgs.getVersion());
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   457
                    }
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   458
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   459
                    if (moduleArgs.getMainClass()!= null) {
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   460
                        args.add("--main-class");
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   461
                        args.add(moduleArgs.getMainClass());
fd45b7e2c027 8231382: Use main class from main module if available
herrick
parents: 58359
diff changeset
   462
                    }
58305
d42b1f6960aa 8230651: Use version string from main module
herrick
parents: 57438
diff changeset
   463
                }
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   464
                args.add("-C");
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   465
                args.add("module" + File.separator + "com." + aName);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   466
                args.add(".");
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   467
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   468
                retVal = execute(jarLog, args.stream().toArray(String[]::new));
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   469
            } catch (Exception ex) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   470
                if (jarLog.exists()) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   471
                    System.err.println(Files.readString(jarLog.toPath()));
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   472
                }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   473
                throw ex;
57031
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
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   476
            if (retVal != 0) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   477
                if (jarLog.exists()) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   478
                    System.err.println(Files.readString(jarLog.toPath()));
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   479
                }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   480
                throw new AssertionError("jar exited with error: " + retVal);
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   481
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   482
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   483
    }
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
    public static void createRuntime() throws Exception {
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   486
        List<String> moreArgs = new ArrayList<>();
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   487
        createRuntime(moreArgs);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   488
    }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   489
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   490
    public static void createRuntime(List<String> moreArgs) throws Exception {
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   491
        int retVal;
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
        File jlinkLog = new File("jlink.log");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   494
        try {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   495
            List<String> args = new ArrayList<>();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   496
            args.add(JLINK.toString());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   497
            args.add("--output");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   498
            args.add("runtime");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   499
            args.add("--add-modules");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   500
            args.add("java.base");
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   501
            args.addAll(moreArgs);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   502
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   503
            retVal = execute(jlinkLog, args.stream().toArray(String[]::new));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   504
        } catch (Exception ex) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   505
            if (jlinkLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   506
                System.err.println(Files.readString(jlinkLog.toPath()));
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
            throw ex;
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
        if (retVal != 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   512
            if (jlinkLog.exists()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   513
                System.err.println(Files.readString(jlinkLog.toPath()));
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   514
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   515
            throw new AssertionError("jlink exited with error: " + retVal);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   516
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   517
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   518
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   519
    public static String listToArgumentsMap(List<String> arguments, boolean toolProvider) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   520
        if (arguments.isEmpty()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   521
            return "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   522
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   523
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   524
        String argsStr = "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   525
        for (int i = 0; i < arguments.size(); i++) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   526
            String arg = arguments.get(i);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   527
            argsStr += quote(arg, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   528
            if ((i + 1) != arguments.size()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   529
                argsStr += " ";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   530
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   531
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   532
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   533
        if (!toolProvider && isWindows()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   534
            if (argsStr.contains(" ")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   535
                if (argsStr.contains("\"")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   536
                    argsStr = escapeQuote(argsStr, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   537
                }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   538
                argsStr = "\"" + argsStr + "\"";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   539
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   540
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   541
        return argsStr;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   542
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   543
57395
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   544
    public static String[] cmdWithAtFilename(String [] cmd, int ndx, int len)
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   545
                throws IOException {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   546
        ArrayList<String> newAList = new ArrayList<>();
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   547
        String fileString = null;
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   548
        for (int i=0; i<cmd.length; i++) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   549
            if (i == ndx) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   550
                newAList.add("@argfile.cmds");
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   551
                fileString = cmd[i];
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   552
            } else if (i > ndx && i < ndx + len) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   553
                fileString += " " + cmd[i];
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   554
            } else {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   555
                newAList.add(cmd[i]);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   556
            }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   557
        }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   558
        if (fileString != null) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   559
            Path path = new File("argfile.cmds").toPath();
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   560
            try (BufferedWriter bw = Files.newBufferedWriter(path);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   561
                    PrintWriter out = new PrintWriter(bw)) {
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   562
                out.println(fileString);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   563
            }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   564
        }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   565
        return newAList.toArray(new String[0]);
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   566
    }
521c02b9eed0 8224130: create additional automated tests for create-app-image
herrick
parents: 57324
diff changeset
   567
57419
44c2481650ce 8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents: 57414
diff changeset
   568
    public static String [] splitAndFilter(String output) {
44c2481650ce 8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents: 57414
diff changeset
   569
        if (output == null) {
44c2481650ce 8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents: 57414
diff changeset
   570
            return null;
44c2481650ce 8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents: 57414
diff changeset
   571
        }
44c2481650ce 8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents: 57414
diff changeset
   572
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58360
diff changeset
   573
        return Stream.of(output.split("\\R"))
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58360
diff changeset
   574
                .filter(str -> !str.startsWith("Picked up"))
58994
b09ba68c6a19 8233636 : Make jpackage an incubator and remove tool provider implementation
herrick
parents: 58888
diff changeset
   575
                .filter(str -> !str.startsWith("WARNING: Using incubator"))
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58360
diff changeset
   576
                .filter(str -> !str.startsWith("hello: "))
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58360
diff changeset
   577
                .collect(Collectors.toList()).toArray(String[]::new);
57419
44c2481650ce 8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents: 57414
diff changeset
   578
    }
44c2481650ce 8225092: Several jpackage tests failes when run with jcov enabled
herrick
parents: 57414
diff changeset
   579
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   580
    private static String quote(String in, boolean toolProvider) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   581
        if (in == null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   582
            return null;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   583
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   584
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   585
        if (in.isEmpty()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   586
            return "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   587
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   588
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   589
        if (!in.contains("=")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   590
            // Not a property
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   591
            if (in.contains(" ")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   592
                in = escapeQuote(in, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   593
                return "\"" + in + "\"";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   594
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   595
            return in;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   596
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   597
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   598
        if (!in.contains(" ")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   599
            return in; // No need to quote
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   600
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   601
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   602
        int paramIndex = in.indexOf("=");
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   603
        if (paramIndex <= 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   604
            return in; // Something wrong, just skip quoting
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   605
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   606
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   607
        String param = in.substring(0, paramIndex);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   608
        String value = in.substring(paramIndex + 1);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   609
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   610
        if (value.length() == 0) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   611
            return in; // No need to quote
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   612
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   613
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   614
        value = escapeQuote(value, toolProvider);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   615
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   616
        return param + "=" + "\"" + value + "\"";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   617
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   618
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   619
    private static String escapeQuote(String in, boolean toolProvider) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   620
        if (in == null) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   621
            return null;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   622
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   623
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   624
        if (in.isEmpty()) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   625
            return "";
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   626
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   627
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   628
        if (in.contains("\"")) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   629
            // Use code points to preserve non-ASCII chars
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   630
            StringBuilder sb = new StringBuilder();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   631
            int codeLen = in.codePointCount(0, in.length());
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   632
            for (int i = 0; i < codeLen; i++) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   633
                int code = in.codePointAt(i);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   634
                // Note: No need to escape '\' on Linux or OS X
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   635
                // jpackage expects us to pass arguments and properties with
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   636
                // quotes and spaces as a map
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   637
                // with quotes being escaped with additional \ for
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   638
                // internal quotes.
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   639
                // So if we want two properties below:
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   640
                // -Djnlp.Prop1=Some "Value" 1
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   641
                // -Djnlp.Prop2=Some Value 2
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   642
                // jpackage will need:
57031
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   643
                // "-Djnlp.Prop1=\"Some \\"Value\\" 1\" -Djnlp.Prop2=\"Some Value 2\""
57039
98d3963b0b7b 8214051: rename jpackager tool to jpackage
herrick
parents: 57031
diff changeset
   644
                // 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
   645
                // 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
   646
                // "-Djnlp.Prop1=\\\"Some \\\\\\\"Value\\\\\\\" 1\\\" -Djnlp.Prop2=\\\"Some Value 2\\\""
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   647
                switch (code) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   648
                    case '"':
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   649
                        // " -> \" -> \\\"
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   650
                        if (i == 0 || in.codePointAt(i - 1) != '\\') {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   651
                            sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   652
                            sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   653
                        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   654
                        break;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   655
                    case '\\':
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   656
                        // We need to escape already escaped symbols as well
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   657
                        if ((i + 1) < codeLen) {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   658
                            int nextCode = in.codePointAt(i + 1);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   659
                            if (nextCode == '"') {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   660
                                // \" -> \\\"
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   661
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   662
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   663
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   664
                                sb.appendCodePoint(nextCode);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   665
                            } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   666
                                sb.appendCodePoint('\\');
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   667
                                sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   668
                            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   669
                        } else {
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   670
                            sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   671
                        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   672
                        break;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   673
                    default:
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   674
                        sb.appendCodePoint(code);
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   675
                        break;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   676
                }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   677
            }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   678
            return sb.toString();
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   679
        }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   680
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   681
        return in;
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   682
    }
ea4755429ed8 8214021: Create additional automated tests for jpackager
herrick
parents:
diff changeset
   683
}