8351372: Improve negative tests coverage of jpackage

src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -166,8 +166,7 @@ public void validate() throws PackagerException {
                 }
             } else {
                 if (!hasInput && !hasAppImage) {
-                    throw new PackagerException(
-                           "ERR_MissingArgument", "--input");
+                    throw new PackagerException("error.no-input-parameter");
                 }
             }
         } else {

src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,9 +57,7 @@ private DottedVersion(String version, boolean greedy) {
                             if (!greedy) {
                                 return null;
                             } else {
-                                throw new IllegalArgumentException(MessageFormat.format(I18N.
-                                        getString("error.version-string-zero-length-component"),
-                                        version));
+                                ds.throwException();
                             }
                         }
 
@@ -77,8 +75,7 @@ private DottedVersion(String version, boolean greedy) {
                     }).takeWhile(Objects::nonNull).toArray(BigInteger[]::new);
             suffix = ds.getUnprocessedString();
             if (!suffix.isEmpty() && greedy) {
-                throw new IllegalArgumentException(MessageFormat.format(I18N.getString(
-                        "error.version-string-invalid-component"), version, suffix));
+                ds.throwException();
             }
         }
     }
@@ -89,7 +86,7 @@ private static class DigitsSupplier {
             this.input = input;
         }
 
-        public String getNextDigits() {
+        String getNextDigits() {
             if (stoped) {
                 return null;
             }
@@ -130,10 +127,29 @@ public String getNextDigits() {
             return sb.toString();
         }
 
-        public String getUnprocessedString() {
+        String getUnprocessedString() {
             return input.substring(cursor);
         }
 
+        void throwException() {
+            final String tail;
+            if (lastDotPos >= 0) {
+                tail = input.substring(lastDotPos + 1);
+            } else {
+                tail = getUnprocessedString();
+            }
+
+            final String errMessage;
+            if (tail.isEmpty()) {
+                errMessage = MessageFormat.format(I18N.getString(
+                        "error.version-string-zero-length-component"), input);
+            } else {
+                errMessage = MessageFormat.format(I18N.getString(
+                        "error.version-string-invalid-component"), input, tail);
+            }
+            throw new IllegalArgumentException(errMessage);
+        }
+
         private int cursor;
         private int lastDotPos = -1;
         private boolean stoped;

src/jdk.jpackage/share/classes/jdk/jpackage/internal/LauncherData.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -185,10 +185,6 @@ private static LauncherData createNonModular(
         }
 
         Path mainJarDir = StandardBundlerParam.SOURCE_DIR.fetchFrom(params);
-        if (mainJarDir == null && launcherData.qualifiedClassName == null) {
-            throw new ConfigException(I18N.getString("error.no-input-parameter"),
-                    null);
-        }
 
         final Path mainJarPath;
         if (launcherData.mainJarName != null && mainJarDir != null) {

src/jdk.jpackage/share/classes/jdk/jpackage/internal/util/TokenReplace.java

@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jpackage.internal.util;
+
+import static java.util.stream.Collectors.joining;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+public final class TokenReplace {
+
+    private record TokenCut(String[] main, String[] sub) {
+        static String[] orderTokens(String... tokens) {
+            if (tokens.length == 0) {
+                throw new IllegalArgumentException("Empty token list");
+            }
+
+            final var orderedTokens = Stream.of(tokens)
+                    .sorted(Comparator.<String>naturalOrder().thenComparing(Comparator.comparingInt(String::length)))
+                    .distinct()
+                    .toArray(String[]::new);
+
+            if (orderedTokens[0].isEmpty()) {
+                throw new IllegalArgumentException("Empty token in the list of tokens");
+            }
+
+            return orderedTokens;
+        }
+
+        static TokenCut createFromOrderedTokens(String... tokens) {
+            final List<Integer> subTokens = new ArrayList<>();
+
+            for (var i = 0; i < tokens.length - 1; ++i) {
+                final var x = tokens[i];
+                for (var j = i + 1; j < tokens.length; ++j) {
+                    final var y = tokens[j];
+                    if (y.contains(x)) {
+                        subTokens.add(i);
+                    }
+                }
+            }
+
+            if (subTokens.isEmpty()) {
+                return new TokenCut(tokens, null);
+            } else {
+                final var main = IntStream.range(0, tokens.length)
+                        .mapToObj(Integer::valueOf)
+                        .filter(Predicate.not(subTokens::contains))
+                        .map(i -> {
+                            return tokens[i];
+                        }).toArray(String[]::new);
+                final var sub = subTokens.stream().map(i -> {
+                    return tokens[i];
+                }).toArray(String[]::new);
+                return new TokenCut(main, sub);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return String.format("TokenCut(main=%s, sub=%s)", Arrays.toString(main), Arrays.toString(sub));
+        }
+    }
+
+    public TokenReplace(String... tokens) {
+        tokens = TokenCut.orderTokens(tokens);
+
+        this.tokens = tokens;
+        regexps = new ArrayList<>();
+
+        for(;;) {
+            final var tokenCut = TokenCut.createFromOrderedTokens(tokens);
+            regexps.add(Pattern.compile(Stream.of(tokenCut.main()).map(Pattern::quote).collect(joining("|", "(", ")"))));
+
+            if (tokenCut.sub() == null) {
+                break;
+            }
+
+            tokens = tokenCut.sub();
+        }
+    }
+
+    public String applyTo(String str, Function<String, Object> tokenValueSupplier) {
+        Objects.requireNonNull(str);
+        Objects.requireNonNull(tokenValueSupplier);
+        for (final var regexp : regexps) {
+            str = regexp.matcher(str).replaceAll(mr -> {
+                final var token = mr.group();
+                return Matcher.quoteReplacement(Objects.requireNonNull(tokenValueSupplier.apply(token), () -> {
+                    return String.format("Null value for token [%s]", token);
+                }).toString());
+            });
+        }
+        return str;
+    }
+
+    public String recursiveApplyTo(String str, Function<String, Object> tokenValueSupplier) {
+        String newStr;
+        int counter = tokens.length + 1;
+        while (!(newStr = applyTo(str, tokenValueSupplier)).equals(str)) {
+            str = newStr;
+            if (counter-- == 0) {
+                throw new IllegalStateException("Infinite recursion");
+            }
+        }
+        return newStr;
+    }
+
+    @Override
+    public int hashCode() {
+        // Auto generated code
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Arrays.hashCode(tokens);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        // Auto generated code
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        TokenReplace other = (TokenReplace) obj;
+        return Arrays.equals(tokens, other.tokens);
+    }
+
+    @Override
+    public String toString() {
+        return "TokenReplace(" + String.join("|", tokens) + ")";
+    }
+
+    public static TokenReplace combine(TokenReplace x, TokenReplace y) {
+        return new TokenReplace(Stream.of(x.tokens, y.tokens).flatMap(Stream::of).toArray(String[]::new));
+    }
+
+    public static Function<String, Object> createCachingTokenValueSupplier(Map<String, Supplier<Object>> tokenValueSuppliers) {
+        Objects.requireNonNull(tokenValueSuppliers);
+        final Map<String, Object> cache = new HashMap<>();
+        return token -> {
+            final var value = cache.computeIfAbsent(token, k -> {
+                final var tokenValueSupplier = Objects.requireNonNull(tokenValueSuppliers.get(token), () -> {
+                    return String.format("No token value supplier for token [%s]", token);
+                });
+                return Optional.ofNullable(tokenValueSupplier.get()).orElse(NULL_SUPPLIED);
+            });
+
+            if (value == NULL_SUPPLIED) {
+                throw new NullPointerException(String.format("Null value for token [%s]", token));
+            }
+
+            return value;
+        };
+    }
+
+    private final String[] tokens;
+    private final transient List<Pattern> regexps;
+    private final static Object NULL_SUPPLIED = new Object();
+}

src/jdk.jpackage/share/classes/jdk/jpackage/main/Main.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,15 +25,16 @@
 
 package jdk.jpackage.main;
 
-import jdk.internal.opt.CommandLine;
-import jdk.jpackage.internal.Arguments;
-import jdk.jpackage.internal.Log;
-import jdk.jpackage.internal.CLIHelp;
-import java.io.PrintWriter;
-import java.util.ResourceBundle;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.NoSuchFileException;
 import java.text.MessageFormat;
+import java.util.ResourceBundle;
+import jdk.internal.opt.CommandLine;
+import jdk.jpackage.internal.Arguments;
+import jdk.jpackage.internal.CLIHelp;
+import jdk.jpackage.internal.Log;
 
 public class Main {
 
@@ -69,7 +70,7 @@ public int execute(PrintWriter out, PrintWriter err, String... args) {
             String[] newArgs;
             try {
                 newArgs = CommandLine.parse(args);
-            } catch (FileNotFoundException fnfe) {
+            } catch (FileNotFoundException|NoSuchFileException fnfe) {
                 Log.fatalError(MessageFormat.format(I18N.getString(
                         "ERR_CannotParseOptions"), fnfe.getMessage()));
                 return 1;

test/jdk/tools/jpackage/helpers-test/jdk/jpackage/test/PackageTestTest.java

@@ -97,12 +97,12 @@ CountingBundleVerifier createBundleVerifier(int jpackageExitCode) {
         private final int tickCount;
     }
 
-    private final static int ERROR_EXIT_CODE_JPACKAGE = 35;
-    private final static int ERROR_EXIT_CODE_INSTALL = 27;
+    private static final int ERROR_EXIT_CODE_JPACKAGE = 35;
+    private static final int ERROR_EXIT_CODE_INSTALL = 27;
 
-    private final static CallbackFactory NEVER = new CallbackFactory(0);
-    private final static CallbackFactory ONCE = new CallbackFactory(1);
-    private final static CallbackFactory TWICE = new CallbackFactory(2);
+    private static final CallbackFactory NEVER = new CallbackFactory(0);
+    private static final CallbackFactory ONCE = new CallbackFactory(1);
+    private static final CallbackFactory TWICE = new CallbackFactory(2);
 
     enum BundleVerifier {
         ONCE_SUCCESS(ONCE),
@@ -238,7 +238,7 @@ public String toString() {
         private final int expectedJPackageExitCode;
     }
 
-    private final static class CountingInstaller extends TickCounter implements Function<JPackageCommand, Integer> {
+    private static final class CountingInstaller extends TickCounter implements Function<JPackageCommand, Integer> {
 
         @Override
         public Integer apply(JPackageCommand cmd) {
@@ -376,7 +376,7 @@ public Executor.Result execute(int expectedExitCode) {
                 };
             }).setExpectedExitCode(expectedJPackageExitCode)
                     .setExpectedInstallExitCode(handlersSpec.installExitCode)
-                    .isPackageTypeSupported(type -> true)
+                    .isPackageTypeEnabled(type -> true)
                     .forTypes().packageHandlers(handlers);
         }
 
@@ -439,7 +439,7 @@ private List<Verifiable> run(Optional<Consumer<PackageTest>> customConfigure) {
         }
     }
 
-    private final static class TestSpecBuilder {
+    private static final class TestSpecBuilder {
 
         TestSpecBuilder type(PackageType v) {
             type = Objects.requireNonNull(v);