test/jdk/tools/jpackage/helpers/jdk/jpackage/test/PackageTest.java
author herrick
Fri, 08 Nov 2019 14:53:03 -0500
branchJDK-8200758-branch
changeset 58994 b09ba68c6a19
parent 58888 d802578912f3
permissions -rw-r--r--
8233636 : Make jpackage an incubator and remove tool provider implementation Reviewed-by: asemenyuk, almatvee, kcr
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     1
/*
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     2
 * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     4
 *
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     7
 * published by the Free Software Foundation.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     8
 *
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    13
 * accompanied this code).
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    14
 *
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    18
 *
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    21
 * questions.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    22
 */
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    23
package jdk.jpackage.test;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    24
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
    25
import java.awt.Desktop;
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    26
import java.awt.GraphicsEnvironment;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    27
import java.io.File;
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
    28
import java.nio.file.Files;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    29
import java.nio.file.Path;
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
    30
import java.util.*;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    31
import java.util.function.BiConsumer;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    32
import java.util.function.Consumer;
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    33
import java.util.function.Predicate;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    34
import java.util.function.Supplier;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    35
import java.util.stream.Collectors;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    36
import java.util.stream.Stream;
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
    37
import jdk.jpackage.test.Functional.ThrowingConsumer;
58994
b09ba68c6a19 8233636 : Make jpackage an incubator and remove tool provider implementation
herrick
parents: 58888
diff changeset
    38
import jdk.incubator.jpackage.internal.AppImageFile;
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
    39
import static jdk.jpackage.test.PackageType.*;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    40
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    41
/**
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    42
 * Instance of PackageTest is for configuring and running a single jpackage
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    43
 * command to produce platform specific package bundle.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    44
 *
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
    45
 * Provides methods to hook up custom configuration of jpackage command and
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    46
 * verification of the output bundle.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    47
 */
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    48
public final class PackageTest {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    49
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    50
    /**
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    51
     * Default test configuration for jpackage command. Default jpackage command
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    52
     * initialization includes:
58147
45a9084fe981 8230521: rename --output/-o option and add default value (".")
herrick
parents: 58113
diff changeset
    53
     * <li>Set --input and --dest parameters.
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    54
     * <li>Set --name parameter. Value of the parameter is the name of the first
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    55
     * class with main function found in the callers stack. Defaults can be
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    56
     * overridden with custom initializers set with subsequent addInitializer()
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    57
     * function calls.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    58
     */
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    59
    public PackageTest() {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    60
        action = DEFAULT_ACTION;
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    61
        excludeTypes = new HashSet<>();
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    62
        forTypes();
58434
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
    63
        setExpectedExitCode(0);
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    64
        handlers = new HashMap<>();
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
    65
        namedInitializers = new HashSet<>();
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    66
        currentTypes.forEach(v -> handlers.put(v, new Handler(v)));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    67
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    68
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    69
    public PackageTest excludeTypes(PackageType... types) {
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    70
        excludeTypes.addAll(Stream.of(types).collect(Collectors.toSet()));
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    71
        return forTypes(currentTypes);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    72
    }
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    73
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    74
    public PackageTest excludeTypes(Collection<PackageType> types) {
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    75
        return excludeTypes(types.toArray(PackageType[]::new));
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    76
    }
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    77
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    78
    public PackageTest forTypes(PackageType... types) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    79
        Collection<PackageType> newTypes;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    80
        if (types == null || types.length == 0) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    81
            newTypes = PackageType.NATIVE;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    82
        } else {
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    83
            newTypes = Stream.of(types).collect(Collectors.toSet());
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    84
        }
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    85
        currentTypes = newTypes.stream()
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    86
                .filter(PackageType::isSupported)
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    87
                .filter(Predicate.not(excludeTypes::contains))
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    88
                .collect(Collectors.toUnmodifiableSet());
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    89
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    90
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    91
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    92
    public PackageTest forTypes(Collection<PackageType> types) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    93
        return forTypes(types.toArray(PackageType[]::new));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    94
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
    95
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    96
    public PackageTest notForTypes(PackageType... types) {
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    97
        return notForTypes(List.of(types));
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    98
    }
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
    99
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   100
    public PackageTest notForTypes(Collection<PackageType> types) {
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   101
        Set<PackageType> workset = new HashSet<>(currentTypes);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   102
        workset.removeAll(types);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   103
        return forTypes(workset);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   104
    }
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   105
58434
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   106
    public PackageTest setExpectedExitCode(int v) {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   107
        expectedJPackageExitCode = v;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   108
        return this;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   109
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   110
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   111
    private PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v,
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   112
            String id) {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   113
        if (id != null) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   114
            if (namedInitializers.contains(id)) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   115
                return this;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   116
            }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   117
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   118
            namedInitializers.add(id);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   119
        }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   120
        currentTypes.stream().forEach(type -> handlers.get(type).addInitializer(
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   121
                ThrowingConsumer.toConsumer(v)));
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   122
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   123
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   124
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   125
    public PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v) {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   126
        return addInitializer(v, null);
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   127
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   128
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   129
    public PackageTest addBundleVerifier(
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   130
            BiConsumer<JPackageCommand, Executor.Result> v) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   131
        currentTypes.stream().forEach(
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   132
                type -> handlers.get(type).addBundleVerifier(v));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   133
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   134
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   135
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   136
    public PackageTest addBundleVerifier(ThrowingConsumer<JPackageCommand> v) {
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   137
        return addBundleVerifier(
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   138
                (cmd, unused) -> ThrowingConsumer.toConsumer(v).accept(cmd));
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   139
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   140
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   141
    public PackageTest addBundlePropertyVerifier(String propertyName,
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   142
            BiConsumer<String, String> pred) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   143
        return addBundleVerifier(cmd -> {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   144
            pred.accept(propertyName,
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   145
                    LinuxHelper.getBundleProperty(cmd, propertyName));
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   146
        });
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   147
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   148
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   149
    public PackageTest addBundlePropertyVerifier(String propertyName,
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   150
            String expectedPropertyValue) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   151
        return addBundlePropertyVerifier(propertyName, (unused, v) -> {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   152
            TKit.assertEquals(expectedPropertyValue, v, String.format(
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   153
                    "Check value of %s property is [%s]", propertyName, v));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   154
        });
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   155
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   156
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   157
    public PackageTest addBundleDesktopIntegrationVerifier(boolean integrated) {
58417
67ffaf3a2b75 8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents: 58416
diff changeset
   158
        forTypes(LINUX, () -> {
67ffaf3a2b75 8231280: Linux packages produced by jpackage should have correct dependencies
herrick
parents: 58416
diff changeset
   159
            LinuxHelper.addBundleDesktopIntegrationVerifier(this, integrated);
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   160
        });
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   161
        return this;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   162
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   163
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   164
    public PackageTest addInstallVerifier(ThrowingConsumer<JPackageCommand> v) {
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   165
        currentTypes.stream().forEach(
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   166
                type -> handlers.get(type).addInstallVerifier(
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   167
                        ThrowingConsumer.toConsumer(v)));
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   168
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   169
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   170
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   171
    public PackageTest addUninstallVerifier(ThrowingConsumer<JPackageCommand> v) {
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   172
        currentTypes.stream().forEach(
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   173
                type -> handlers.get(type).addUninstallVerifier(
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   174
                        ThrowingConsumer.toConsumer(v)));
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   175
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   176
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   177
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   178
    static void withTestFileAssociationsFile(FileAssociations fa,
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   179
            ThrowingConsumer<Path> consumer) {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   180
        final String testFileDefaultName = String.join(".", "test",
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   181
                fa.getSuffix());
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   182
        TKit.withTempFile(testFileDefaultName, fa.getSuffix(), testFile -> {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   183
            if (TKit.isLinux()) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   184
                LinuxHelper.initFileAssociationsTestFile(testFile);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   185
            }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   186
            consumer.accept(testFile);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   187
        });
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   188
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   189
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   190
    PackageTest addHelloAppFileAssociationsVerifier(FileAssociations fa,
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   191
            String... faLauncherDefaultArgs) {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   192
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   193
        // Setup test app to have valid jpackage command line before
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   194
        // running check of type of environment.
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   195
        addInitializer(cmd -> new HelloApp(null).addTo(cmd), "HelloApp");
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   196
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   197
        String noActionMsg = "Not running file associations test";
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   198
        if (GraphicsEnvironment.isHeadless()) {
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   199
            TKit.trace(String.format(
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   200
                    "%s because running in headless environment", noActionMsg));
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   201
            return this;
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   202
        }
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   203
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   204
        addInstallVerifier(cmd -> {
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   205
            if (cmd.isFakeRuntime(noActionMsg)) {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   206
                return;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   207
            }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   208
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   209
            withTestFileAssociationsFile(fa, testFile -> {
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   210
                testFile = testFile.toAbsolutePath().normalize();
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   211
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   212
                final Path appOutput = testFile.getParent()
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   213
                        .resolve(HelloApp.OUTPUT_FILENAME);
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   214
                Files.deleteIfExists(appOutput);
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   215
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   216
                TKit.trace(String.format("Use desktop to open [%s] file",
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   217
                        testFile));
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   218
                Desktop.getDesktop().open(testFile.toFile());
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   219
                TKit.waitForFileCreated(appOutput, 7);
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   220
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   221
                List<String> expectedArgs = new ArrayList<>(List.of(
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   222
                        faLauncherDefaultArgs));
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   223
                expectedArgs.add(testFile.toString());
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   224
58304
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   225
                // Wait a little bit after file has been created to
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   226
                // make sure there are no pending writes into it.
7a61351edad2 8231282 : Revisit --linux-deb-copyright option
herrick
parents: 58301
diff changeset
   227
                Thread.sleep(3000);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   228
                HelloApp.verifyOutputFile(appOutput, expectedArgs);
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   229
            });
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   230
        });
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   231
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   232
        forTypes(PackageType.LINUX, () -> {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   233
            LinuxHelper.addFileAssociationsVerifier(this, fa);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   234
        });
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   235
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   236
        return this;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   237
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   238
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   239
    PackageTest forTypes(Collection<PackageType> types, Runnable action) {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   240
        Set<PackageType> oldTypes = Set.of(currentTypes.toArray(
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   241
                PackageType[]::new));
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   242
        try {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   243
            forTypes(types);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   244
            action.run();
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   245
        } finally {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   246
            forTypes(oldTypes);
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   247
        }
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   248
        return this;
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   249
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   250
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   251
    PackageTest forTypes(PackageType type, Runnable action) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   252
        return forTypes(List.of(type), action);
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   253
    }
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   254
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   255
    PackageTest notForTypes(Collection<PackageType> types, Runnable action) {
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   256
        Set<PackageType> workset = new HashSet<>(currentTypes);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   257
        workset.removeAll(types);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   258
        return forTypes(workset, action);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   259
    }
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   260
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   261
    PackageTest notForTypes(PackageType type, Runnable action) {
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   262
        return notForTypes(List.of(type), action);
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   263
    }
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   264
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   265
    public PackageTest configureHelloApp() {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   266
        return configureHelloApp(null);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   267
    }
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   268
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   269
    public PackageTest configureHelloApp(String encodedName) {
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   270
        addInitializer(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   271
                cmd -> new HelloApp(JavaAppDesc.parse(encodedName)).addTo(cmd));
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   272
        addInstallVerifier(HelloApp::executeLauncherAndVerifyOutput);
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   273
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   274
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   275
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   276
    public void run() {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   277
        List<Handler> supportedHandlers = handlers.values().stream()
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   278
                .filter(entry -> !entry.isVoid())
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   279
                .collect(Collectors.toList());
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   280
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   281
        if (supportedHandlers.isEmpty()) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   282
            // No handlers with initializers found. Nothing to do.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   283
            return;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   284
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   285
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   286
        Supplier<JPackageCommand> initializer = new Supplier<>() {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   287
            @Override
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   288
            public JPackageCommand get() {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   289
                JPackageCommand cmd = new JPackageCommand().setDefaultInputOutput();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   290
                if (bundleOutputDir != null) {
58147
45a9084fe981 8230521: rename --output/-o option and add default value (".")
herrick
parents: 58113
diff changeset
   291
                    cmd.setArgumentValue("--dest", bundleOutputDir.toString());
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   292
                }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   293
                cmd.setDefaultAppName();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   294
                return cmd;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   295
            }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   296
        };
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   297
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   298
        supportedHandlers.forEach(handler -> handler.accept(initializer.get()));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   299
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   300
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   301
    public PackageTest setAction(Action value) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   302
        action = value;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   303
        return this;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   304
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   305
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   306
    public Action getAction() {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   307
        return action;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   308
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   309
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   310
    private class Handler implements Consumer<JPackageCommand> {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   311
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   312
        Handler(PackageType type) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   313
            if (!PackageType.NATIVE.contains(type)) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   314
                throw new IllegalArgumentException(
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   315
                        "Attempt to configure a test for image packaging");
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   316
            }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   317
            this.type = type;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   318
            initializers = new ArrayList<>();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   319
            bundleVerifiers = new ArrayList<>();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   320
            installVerifiers = new ArrayList<>();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   321
            uninstallVerifiers = new ArrayList<>();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   322
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   323
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   324
        boolean isVoid() {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   325
            return initializers.isEmpty();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   326
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   327
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   328
        void addInitializer(Consumer<JPackageCommand> v) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   329
            initializers.add(v);
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   330
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   331
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   332
        void addBundleVerifier(BiConsumer<JPackageCommand, Executor.Result> v) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   333
            bundleVerifiers.add(v);
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   334
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   335
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   336
        void addInstallVerifier(Consumer<JPackageCommand> v) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   337
            installVerifiers.add(v);
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   338
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   339
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   340
        void addUninstallVerifier(Consumer<JPackageCommand> v) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   341
            uninstallVerifiers.add(v);
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   342
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   343
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   344
        @Override
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   345
        public void accept(JPackageCommand cmd) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   346
            type.applyTo(cmd);
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   347
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   348
            initializers.stream().forEach(v -> v.accept(cmd));
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   349
            cmd.executePrerequisiteActions();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   350
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   351
            switch (action) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   352
                case CREATE:
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   353
                    Executor.Result result = cmd.execute();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   354
                    result.assertExitCodeIs(expectedJPackageExitCode);
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   355
                    if (expectedJPackageExitCode == 0) {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   356
                        TKit.assertFileExists(cmd.outputBundle());
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   357
                    } else {
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   358
                        TKit.assertPathExists(cmd.outputBundle(), false);
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   359
                    }
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   360
                    verifyPackageBundle(cmd.createImmutableCopy(), result);
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   361
                    break;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   362
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   363
                case VERIFY_INSTALL:
58434
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   364
                    if (expectedJPackageExitCode == 0) {
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   365
                        verifyPackageInstalled(cmd.createImmutableCopy());
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   366
                    }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   367
                    break;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   368
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   369
                case VERIFY_UNINSTALL:
58434
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   370
                    if (expectedJPackageExitCode == 0) {
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   371
                        verifyPackageUninstalled(cmd.createImmutableCopy());
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   372
                    }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   373
                    break;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   374
            }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   375
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   376
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   377
        private void verifyPackageBundle(JPackageCommand cmd,
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   378
                Executor.Result result) {
58434
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   379
            if (expectedJPackageExitCode == 0) {
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   380
                if (PackageType.LINUX.contains(cmd.packageType())) {
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   381
                    LinuxHelper.verifyPackageBundleEssential(cmd);
b00cbf427368 8231721 : jpackage --install-dir should reject system dirs on Linux
herrick
parents: 58417
diff changeset
   382
                }
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   383
            }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   384
            bundleVerifiers.stream().forEach(v -> v.accept(cmd, result));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   385
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   386
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   387
        private void verifyPackageInstalled(JPackageCommand cmd) {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   388
            TKit.trace(String.format("Verify installed: %s",
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   389
                    cmd.getPrintableCommandLine()));
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   390
            TKit.assertDirectoryExists(cmd.appRuntimeDirectory());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   391
            if (!cmd.isRuntime()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   392
                TKit.assertExecutableFileExists(cmd.appLauncherPath());
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   393
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   394
                if (PackageType.WINDOWS.contains(cmd.packageType())) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   395
                    new WindowsHelper.AppVerifier(cmd);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   396
                }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   397
            }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   398
58762
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58696
diff changeset
   399
            TKit.assertPathExists(AppImageFile.getPathInAppImage(
0fe62353385b 8232281: jpackage is not always reporting an error when no main class specified
herrick
parents: 58696
diff changeset
   400
                    cmd.appInstallationDirectory()), false);
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   401
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   402
            installVerifiers.stream().forEach(v -> v.accept(cmd));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   403
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   404
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   405
        private void verifyPackageUninstalled(JPackageCommand cmd) {
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   406
            TKit.trace(String.format("Verify uninstalled: %s",
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   407
                    cmd.getPrintableCommandLine()));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   408
            if (!cmd.isRuntime()) {
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   409
                TKit.assertPathExists(cmd.appLauncherPath(), false);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   410
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   411
                if (PackageType.WINDOWS.contains(cmd.packageType())) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   412
                    new WindowsHelper.AppVerifier(cmd);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   413
                }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   414
            }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   415
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents: 58434
diff changeset
   416
            TKit.assertPathExists(cmd.appInstallationDirectory(), false);
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   417
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   418
            uninstallVerifiers.stream().forEach(v -> v.accept(cmd));
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   419
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   420
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   421
        private final PackageType type;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   422
        private final List<Consumer<JPackageCommand>> initializers;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   423
        private final List<BiConsumer<JPackageCommand, Executor.Result>> bundleVerifiers;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   424
        private final List<Consumer<JPackageCommand>> installVerifiers;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   425
        private final List<Consumer<JPackageCommand>> uninstallVerifiers;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   426
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   427
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   428
    private Collection<PackageType> currentTypes;
58888
d802578912f3 8232186 : Add verification for pkg and dmg tests
herrick
parents: 58762
diff changeset
   429
    private Set<PackageType> excludeTypes;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   430
    private int expectedJPackageExitCode;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   431
    private Map<PackageType, Handler> handlers;
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   432
    private Set<String> namedInitializers;
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   433
    private Action action;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   434
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   435
    /**
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   436
     * Test action.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   437
     */
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   438
    static public enum Action {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   439
        /**
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   440
         * Create bundle.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   441
         */
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   442
        CREATE,
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   443
        /**
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   444
         * Verify bundle installed.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   445
         */
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   446
        VERIFY_INSTALL,
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   447
        /**
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   448
         * Verify bundle uninstalled.
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   449
         */
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   450
        VERIFY_UNINSTALL;
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   451
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   452
        @Override
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   453
        public String toString() {
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   454
            return name().toLowerCase().replace('_', '-');
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   455
        }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   456
    };
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   457
    private final static Action DEFAULT_ACTION;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   458
    private final static File bundleOutputDir;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   459
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   460
    static {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   461
        final String propertyName = "output";
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   462
        String val = TKit.getConfigProperty(propertyName);
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   463
        if (val == null) {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   464
            bundleOutputDir = null;
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   465
        } else {
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   466
            bundleOutputDir = new File(val).getAbsoluteFile();
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   467
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   468
            if (!bundleOutputDir.isDirectory()) {
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   469
                throw new IllegalArgumentException(String.format(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   470
                        "Invalid value of %s sytem property: [%s]. Should be existing directory",
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   471
                        TKit.getConfigPropertyName(propertyName),
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   472
                        bundleOutputDir));
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   473
            }
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   474
        }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   475
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   476
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   477
    static {
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   478
        final String propertyName = "action";
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   479
        String action = Optional.ofNullable(TKit.getConfigProperty(propertyName)).orElse(
58301
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   480
                Action.CREATE.toString()).toLowerCase();
e0efb29609bd 8225249 : LinuxDebBundler and LinuxRpmBundler should share more code
herrick
parents: 58147
diff changeset
   481
        DEFAULT_ACTION = Stream.of(Action.values()).filter(
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   482
                a -> a.toString().equals(action)).findFirst().orElseThrow(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   483
                        () -> new IllegalArgumentException(String.format(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58648
diff changeset
   484
                                "Unrecognized value of %s property: [%s]",
58416
f09bf58c1f17 8231605: Improve test helpers
herrick
parents: 58304
diff changeset
   485
                                TKit.getConfigPropertyName(propertyName), action)));
58113
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   486
    }
885b0543f6e4 8230726: Improve jpackage jtreg tests
herrick
parents: 58036
diff changeset
   487
}