diff --git a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java index e19f234d0d6..1049496146f 100644 --- a/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java +++ b/src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackageBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2025, 2026, 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 @@ -65,7 +65,7 @@ final class MacPackageBuilder { } private static void validatePredefinedAppImage(MacPackage pkg) { - if (pkg.predefinedAppImageSigned().orElse(false)) { + if (pkg.predefinedAppImageSigned().orElse(false) && !pkg.isRuntimeInstaller()) { pkg.predefinedAppImage().ifPresent(predefinedAppImage -> { var thePackageFile = PackageFile.getPathInAppImage(APPLICATION_LAYOUT); if (!Files.exists(predefinedAppImage.resolve(thePackageFile))) { diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageOutputValidator.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageOutputValidator.java index c5c9c018b6a..ed14f40f65c 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageOutputValidator.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageOutputValidator.java @@ -43,7 +43,7 @@ public final class JPackageOutputValidator { } public JPackageOutputValidator(JPackageOutputValidator other) { - stdout = other.stdout; + stream = other.stream; match = other.match; matchTimestamps = other.matchTimestamps; stripTimestamps = other.stripTimestamps; @@ -59,7 +59,7 @@ public final class JPackageOutputValidator { * @return this */ public JPackageOutputValidator stdout() { - stdout = true; + stream = StdStream.OUT; return this; } @@ -68,7 +68,16 @@ public final class JPackageOutputValidator { * @return this */ public JPackageOutputValidator stderr() { - stdout = false; + stream = StdStream.ERR; + return this; + } + + /** + * Configures this validator to validate both stdout and stderr. + * @return this + */ + public JPackageOutputValidator stdoutAndStderr() { + stream = StdStream.OUT_AND_ERR; return this; } @@ -171,7 +180,7 @@ public final class JPackageOutputValidator { } public JPackageOutputValidator compose(JPackageOutputValidator other) { - if (stdout != other.stdout) { + if (stream != other.stream) { throw new IllegalArgumentException(); } if (match != other.match) { @@ -188,7 +197,7 @@ public final class JPackageOutputValidator { private Optional> toResultConsumer(JPackageCommand cmd) { return toStringIteratorConsumer(cmd).map(validator -> { - return toResultConsumer(validator, stdout, match, label()); + return toResultConsumer(validator, stream, match, label()); }); } @@ -244,7 +253,11 @@ public final class JPackageOutputValidator { } private String label() { - return stdout ? "'stdout'" : "'stderr'"; + return switch (stream) { + case OUT -> "'stdout'"; + case ERR -> "'stderr'"; + case OUT_AND_ERR -> "'stdout+stderr'"; + }; } private Consumer> decorate(TKit.TextStreamVerifier validator) { @@ -256,17 +269,16 @@ public final class JPackageOutputValidator { } private static Consumer toResultConsumer( - Consumer> validator, boolean stdout, boolean match, String label) { + Consumer> validator, StdStream stream, boolean match, String label) { Objects.requireNonNull(validator); Objects.requireNonNull(label); return result -> { - List content; - if (stdout) { - content = result.stdout(); - } else { - content = result.stderr(); - } + List content = switch (stream) { + case OUT -> result.stdout(); + case ERR -> result.stderr(); + case OUT_AND_ERR -> result.getOutput(); + }; if (match) { TKit.trace(String.format("Checking %s for exact match against defined validators...", label)); @@ -371,7 +383,14 @@ public final class JPackageOutputValidator { } } - boolean stdout = true; + private enum StdStream { + OUT, + ERR, + OUT_AND_ERR, + ; + } + + StdStream stream = StdStream.OUT; boolean match; boolean matchTimestamps; boolean stripTimestamps; diff --git a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java index dcf994a0e93..688b16a8e09 100644 --- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java +++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageStringBundle.java @@ -78,6 +78,10 @@ public enum JPackageStringBundle { }); } + public Pattern cannedFormattedStringAsPattern(String key, Object ... args) { + return cannedFormattedStringAsPattern(key, MATCH_ANY, args); + } + static Pattern toPattern(MessageFormat mf, Function formatArgMapper, Object ... args) { Objects.requireNonNull(mf); Objects.requireNonNull(formatArgMapper); @@ -154,4 +158,14 @@ public enum JPackageStringBundle { private final Class i18nClass; private final Method i18nClass_getString; private final BiFunction formatter; + + private static final Function MATCH_ANY = new Function<>() { + + @Override + public Pattern apply(Object v) { + return PATTERN; + } + + private static final Pattern PATTERN = Pattern.compile(".*"); + }; } diff --git a/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java b/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java index 11b466ed715..42a0e6fd664 100644 --- a/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java +++ b/test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java @@ -37,6 +37,8 @@ import jdk.jpackage.internal.util.Slot; import jdk.jpackage.test.Annotations.ParameterSupplier; import jdk.jpackage.test.Annotations.Test; import jdk.jpackage.test.JPackageCommand; +import jdk.jpackage.test.JPackageOutputValidator; +import jdk.jpackage.test.JPackageStringBundle; import jdk.jpackage.test.MacHelper; import jdk.jpackage.test.MacHelper.ResolvableCertificateRequest; import jdk.jpackage.test.MacHelper.SignKeyOption; @@ -98,6 +100,13 @@ public class SigningRuntimeImagePackageTest { cmd.ignoreDefaultRuntime(true); cmd.removeArgumentWithValue("--input"); cmd.setArgumentValue("--runtime-image", predefinedRuntime.get()); + + // `warning.per.user.app.image.signed` warning doesn't apply to runtime bundling. + // Ensure the warning is not in the output. + new JPackageOutputValidator().add(TKit.assertTextStream( + JPackageStringBundle.MAIN.cannedFormattedStringAsPattern("warning.per.user.app.image.signed", "file") + ).negate()).stdoutAndStderr().applyTo(cmd); + }).addInstallVerifier(cmd -> { MacSignVerify.verifyAppImageSigned(cmd, signRuntime.certRequest()); }).run(); diff --git a/test/jdk/tools/jpackage/share/AppVersionTest.java b/test/jdk/tools/jpackage/share/AppVersionTest.java index 3b6ac5a9241..7ba1870def1 100644 --- a/test/jdk/tools/jpackage/share/AppVersionTest.java +++ b/test/jdk/tools/jpackage/share/AppVersionTest.java @@ -46,7 +46,6 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.regex.Pattern; import java.util.stream.Stream; import jdk.internal.util.OperatingSystem; import jdk.jpackage.internal.util.MacBundle; @@ -287,9 +286,7 @@ public final class AppVersionTest { } TKit.TextStreamVerifier negateFind() { - var pattern = JPackageStringBundle.MAIN.cannedFormattedStringAsPattern(key, _ -> { - return Pattern.compile(".*"); - }, args); + var pattern = JPackageStringBundle.MAIN.cannedFormattedStringAsPattern(key, args); return TKit.assertTextStream(pattern).negate(); } @@ -400,7 +397,7 @@ public final class AppVersionTest { Stream.of(Message.values()).filter(message -> { return !expectMessageKeys.contains(message.key()); }).map(Message::negateFind).forEach(validator -> { - new JPackageOutputValidator().add(validator).applyTo(cmd); + new JPackageOutputValidator().add(validator).stdoutAndStderr().applyTo(cmd); }); } @@ -760,7 +757,7 @@ public final class AppVersionTest { private final List versions = new ArrayList<>(); private final Map expected = new HashMap<>(); - private final static Set ALL_TYPES = Set.of(PackageType.values()); + private static final Set ALL_TYPES = Set.of(PackageType.values()); } } @@ -1019,7 +1016,7 @@ public final class AppVersionTest { return predefinedRuntimeDir; } - final static String MAC_PREDEFINED_RUNTIME_BUNDLE_VERSION = "1.22.333"; + static final String MAC_PREDEFINED_RUNTIME_BUNDLE_VERSION = "1.22.333"; } private static Consumer skipImagePackageType(Consumer consumer) {