test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java
author herrick
Wed, 23 Oct 2019 10:37:54 -0400
branchJDK-8200758-branch
changeset 58762 0fe62353385b
parent 58696 61c44899b4eb
child 58994 b09ba68c6a19
permissions -rw-r--r--
8232281: jpackage is not always reporting an error when no main class specified Reviewed-by: asemenyuk, asemenuk
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     1
/*
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     2
 * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     4
 *
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     7
 * published by the Free Software Foundation.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     8
 *
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    13
 * accompanied this code).
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    14
 *
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    18
 *
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    21
 * questions.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    22
 */
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    23
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    24
package jdk.jpackage.tests;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    25
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    26
import java.io.IOException;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    27
import java.nio.file.Files;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    28
import java.util.Collection;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    29
import java.util.ArrayList;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    30
import java.util.List;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    31
import java.util.Set;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    32
import java.util.jar.JarFile;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    33
import java.util.Objects;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    34
import java.util.stream.Collectors;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    35
import java.util.stream.Stream;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    36
import java.nio.file.Path;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    37
import java.util.function.Predicate;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    38
import java.util.jar.JarEntry;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    39
import jdk.jpackage.test.Annotations.Parameters;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    40
import jdk.jpackage.test.Annotations.Test;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    41
import jdk.jpackage.test.*;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    42
import jdk.jpackage.test.Functional.ThrowingConsumer;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    43
import static jdk.jpackage.tests.MainClassTest.Script.MainClassType.*;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    44
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    45
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    46
/*
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    47
 * @test
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    48
 * @summary test different settings of main class name for jpackage
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    49
 * @library ../../../../helpers
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    50
 * @build jdk.jpackage.test.*
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    51
 * @modules jdk.jpackage/jdk.jpackage.internal
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    52
 * @compile MainClassTest.java
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    53
 * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    54
 *  --jpt-run=jdk.jpackage.tests.MainClassTest
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    55
 */
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    56
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    57
public final class MainClassTest {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    58
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    59
    static final class Script {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    60
        Script() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    61
            appDesc = JavaAppDesc.parse("test.Hello");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    62
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    63
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    64
        Script modular(boolean v) {
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
    65
            appDesc.setModuleName(v ? "com.other" : null);
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    66
            return this;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    67
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    68
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    69
        Script withJLink(boolean v) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    70
            withJLink = v;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    71
            return this;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    72
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    73
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    74
        Script withMainClass(MainClassType v) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    75
            mainClass = v;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    76
            return this;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    77
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    78
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    79
        Script withJarMainClass(MainClassType v) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    80
            appDesc.setJarWithMainClass(v != NotSet);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    81
            jarMainClass = v;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    82
            return this;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    83
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    84
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    85
        Script expectedErrorMessage(String v) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    86
            expectedErrorMessage = v;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    87
            return this;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    88
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    89
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    90
        @Override
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    91
        public String toString() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    92
            return Stream.of(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    93
                    format("modular", appDesc.moduleName() != null ? 'y' : 'n'),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    94
                    format("main-class", mainClass),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    95
                    format("jar-main-class", jarMainClass),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    96
                    format("jlink", withJLink ? 'y' : 'n'),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    97
                    format("error", expectedErrorMessage)
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    98
            ).filter(Objects::nonNull).collect(Collectors.joining("; "));
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
    99
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   100
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   101
        private static String format(String key, Object value) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   102
            if (value == null) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   103
                return null;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   104
            }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   105
            return String.join("=", key, value.toString());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   106
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   107
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   108
        enum MainClassType {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   109
            NotSet("n"),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   110
            SetWrong("b"),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   111
            SetRight("y");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   112
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   113
            MainClassType(String label) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   114
                this.label = label;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   115
            }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   116
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   117
            @Override
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   118
            public String toString() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   119
                return label;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   120
            }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   121
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   122
            private final String label;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   123
        };
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   124
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   125
        private JavaAppDesc appDesc;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   126
        private boolean withJLink;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   127
        private MainClassType mainClass;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   128
        private MainClassType jarMainClass;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   129
        private String expectedErrorMessage;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   130
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   131
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   132
    public MainClassTest(Script script) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   133
        this.script = script;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   134
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   135
        nonExistingMainClass = Stream.of(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   136
                script.appDesc.packageName(), "ThereIsNoSuchClass").filter(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   137
                Objects::nonNull).collect(Collectors.joining("."));
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   138
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   139
        cmd = JPackageCommand
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   140
                .helloAppImage(script.appDesc)
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   141
                .ignoreDefaultRuntime(true);
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   142
        if (!script.withJLink) {
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   143
            cmd.addArguments("--runtime-image", Path.of(System.getProperty(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   144
                    "java.home")));
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   145
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   146
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   147
        final String moduleName = script.appDesc.moduleName();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   148
        switch (script.mainClass) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   149
            case NotSet:
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   150
                if (moduleName != null) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   151
                    // Don't specify class name, only module name.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   152
                    cmd.setArgumentValue("--module", moduleName);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   153
                } else {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   154
                    cmd.removeArgumentWithValue("--main-class");
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   155
                }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   156
                break;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   157
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   158
            case SetWrong:
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   159
                if (moduleName != null) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   160
                    cmd.setArgumentValue("--module",
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   161
                            String.join("/", moduleName, nonExistingMainClass));
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   162
                } else {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   163
                    cmd.setArgumentValue("--main-class", nonExistingMainClass);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   164
                }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   165
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   166
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   167
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   168
    @Parameters
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   169
    public static Collection scripts() {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   170
        final var withMainClass = Set.of(SetWrong, SetRight);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   171
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   172
        List<Script[]> scripts = new ArrayList<>();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   173
        for (var withJLink : List.of(true, false)) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   174
            for (var modular : List.of(true, false)) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   175
                for (var mainClass : Script.MainClassType.values()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   176
                    for (var jarMainClass : Script.MainClassType.values()) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   177
                        Script script = new Script()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   178
                            .modular(modular)
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   179
                            .withJLink(withJLink)
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   180
                            .withMainClass(mainClass)
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   181
                            .withJarMainClass(jarMainClass);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   182
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   183
                        if (withMainClass.contains(jarMainClass)
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   184
                                || withMainClass.contains(mainClass)) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   185
                        } else if (modular) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   186
                            script.expectedErrorMessage(
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   187
                                    "Error: Main application class is missing");
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   188
                        } else {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   189
                            script.expectedErrorMessage(
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   190
                                    "A main class was not specified nor was one found in the jar");
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   191
                        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   192
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   193
                        scripts.add(new Script[]{script});
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   194
                    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   195
                }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   196
            }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   197
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   198
        return scripts;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   199
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   200
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   201
    @Test
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   202
    public void test() throws IOException {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   203
        if (script.jarMainClass == SetWrong) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   204
            initJarWithWrongMainClass();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   205
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   206
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   207
        if (script.expectedErrorMessage != null) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   208
            // This is the case when main class is not found nor in jar
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   209
            // file nor on command line.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   210
            List<String> output = cmd
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   211
                    .saveConsoleOutput(true)
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   212
                    .execute()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   213
                    .assertExitCodeIs(1)
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   214
                    .getOutput();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   215
            TKit.assertTextStream(script.expectedErrorMessage).apply(output.stream());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   216
            return;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   217
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   218
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   219
        // Get here only if main class is specified.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   220
        boolean appShouldSucceed = false;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   221
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   222
        // Should succeed if valid main class is set on the command line.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   223
        appShouldSucceed |= (script.mainClass == SetRight);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   224
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   225
        // Should succeed if main class is not set on the command line but set
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   226
        // to valid value in the jar.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   227
        appShouldSucceed |= (script.mainClass == NotSet && script.jarMainClass == SetRight);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   228
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   229
        if (appShouldSucceed) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   230
            cmd.executeAndAssertHelloAppImageCreated();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   231
        } else {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   232
            cmd.executeAndAssertImageCreated();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   233
            if (!cmd.isFakeRuntime(String.format("Not running [%s]",
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   234
                    cmd.appLauncherPath()))) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   235
                List<String> output = new Executor()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   236
                    .setDirectory(cmd.outputDir())
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   237
                    .setExecutable(cmd.appLauncherPath())
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   238
                    .dumpOutput().saveOutput()
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   239
                    .execute().assertExitCodeIs(1).getOutput();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   240
                TKit.assertTextStream(String.format(
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   241
                        "Error: Could not find or load main class %s",
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   242
                        nonExistingMainClass)).apply(output.stream());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   243
            }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   244
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   245
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   246
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   247
    private void initJarWithWrongMainClass() throws IOException {
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   248
        // Call JPackageCommand.executePrerequisiteActions() to build app's jar.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   249
        // executePrerequisiteActions() is called by JPackageCommand instance
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   250
        // only once.
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   251
        cmd.executePrerequisiteActions();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   252
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   253
        final Path jarFile;
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   254
        if (script.appDesc.moduleName() != null) {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   255
            jarFile = Path.of(cmd.getArgumentValue("--module-path"),
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   256
                    script.appDesc.jarFileName());
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   257
        } else {
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   258
            jarFile = cmd.inputDir().resolve(cmd.getArgumentValue("--main-jar"));
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   259
        }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   260
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   261
        // Create new jar file filtering out main class from the old jar file.
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   262
        TKit.withTempDirectory("repack-jar", workDir -> {
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   263
            // Extract app's class from the old jar.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   264
            explodeJar(jarFile, workDir,
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   265
                    jarEntry -> Path.of(jarEntry.getName()).equals(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   266
                            script.appDesc.classFilePath()));
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   267
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   268
            // Create app's jar file with different main class.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   269
            var badAppDesc = JavaAppDesc.parse(script.appDesc.toString()).setClassName(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   270
                    nonExistingMainClass);
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   271
            JPackageCommand.helloAppImage(badAppDesc).executePrerequisiteActions();
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   272
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   273
            // Extract new jar but skip app's class.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   274
            explodeJar(jarFile, workDir,
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   275
                    jarEntry -> !Path.of(jarEntry.getName()).equals(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   276
                            badAppDesc.classFilePath()));
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   277
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   278
            // At this point we should have:
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   279
            // 1. Manifest from the new jar referencing non-existing class
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   280
            //  as the main class.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   281
            // 2. Module descriptor referencing non-existing class as the main
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   282
            //  class in case of modular app.
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   283
            // 3. App's class from the old jar. We need it to let jlink find some
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   284
            //  classes in the package declared in module descriptor
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   285
            //  in case of modular app.
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   286
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   287
            Files.delete(jarFile);
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   288
            new Executor().setToolProvider(JavaTool.JAR)
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   289
            .addArguments("-v", "-c", "-M", "-f", jarFile.toString())
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   290
            .addArguments("-C", workDir.toString(), ".")
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   291
            .dumpOutput()
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   292
            .execute().assertExitCodeIsZero();
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   293
        });
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   294
    }
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   295
58696
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   296
    private static void explodeJar(Path jarFile, Path workDir,
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   297
            Predicate<JarEntry> filter) throws IOException {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   298
        try (var jar = new JarFile(jarFile.toFile())) {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   299
            jar.stream()
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   300
            .filter(Predicate.not(JarEntry::isDirectory))
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   301
            .filter(filter)
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   302
            .sequential().forEachOrdered(ThrowingConsumer.toConsumer(
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   303
                jarEntry -> {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   304
                    try (var in = jar.getInputStream(jarEntry)) {
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   305
                        Path fileName = workDir.resolve(jarEntry.getName());
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   306
                        Files.createDirectories(fileName.getParent());
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   307
                        Files.copy(in, fileName);
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   308
                    }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   309
                }));
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   310
        }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   311
    }
61c44899b4eb 8223325: Improve wix sources generated by jpackage
herrick
parents: 58695
diff changeset
   312
58648
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   313
    private final JPackageCommand cmd;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   314
    private final Script script;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   315
    private final String nonExistingMainClass;
3bf53ffa9ae7 8232279 : Improve test helpers #2
herrick
parents:
diff changeset
   316
}