8353321: [macos] ErrorTest.testAppContentWarning test case requires signing environment

Reviewed-by: almatvee

Author: Alexey Semenyuk

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacSign.java

@@ -287,7 +287,7 @@ public Builder password(String v) {
             }
 
             public Builder addCert(CertificateRequest v) {
-                certs.add(v);
+                certs.add(Objects.requireNonNull(v));
                 return this;
             }
 

test/jdk/tools/jpackage/macosx/MacSignTest.java

@@ -0,0 +1,86 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedFormattedString;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
+import jdk.jpackage.test.MacHelper;
+import jdk.jpackage.test.TKit;
+
+/*
+ * @test
+ * @summary jpackage with --mac-sign
+ * @library /test/jdk/tools/jpackage/helpers
+ * @library base
+ * @build SigningBase
+ * @build jdk.jpackage.test.*
+ * @build MacSignTest
+ * @requires (jpackage.test.MacSignTests == "run")
+ * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=MacSignTest
+ *  --jpt-before-run=SigningBase.verifySignTestEnvReady
+ */
+public class MacSignTest {
+
+    @Test
+    public static void testAppContentWarning() throws IOException {
+
+        // Create app content directory with the name known to fail signing.
+        // This will trigger jpackage exit with status code "1".
+        final var appContent = TKit.createTempDirectory("app-content").resolve("foo.1");
+        Files.createDirectory(appContent);
+        Files.createFile(appContent.resolve("file"));
+
+        final List<CannedFormattedString> expectedStrings = new ArrayList<>();
+        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.app.content"));
+
+        final var xcodeWarning = JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.xcode.tools");
+        if (!MacHelper.isXcodeDevToolsInstalled()) {
+            expectedStrings.add(xcodeWarning);
+        }
+
+        // --app-content and --type app-image
+        // Expect `message.codesign.failed.reason.app.content` message in the log.
+        // This is not a fatal error, just a warning.
+        // To make jpackage fail, specify bad additional content.
+        final var cmd = JPackageCommand.helloAppImage()
+                .ignoreDefaultVerbose(true)
+                .validateOutput(expectedStrings.toArray(CannedFormattedString[]::new))
+                .addArguments("--app-content", appContent)
+                .addArguments("--mac-sign")
+                .addArguments("--mac-signing-keychain", SigningBase.StandardKeychain.MAIN.spec().keychain().name())
+                .addArguments("--mac-app-image-sign-identity", SigningBase.StandardCertificateRequest.APP_IMAGE.spec().name());
+
+        if (MacHelper.isXcodeDevToolsInstalled()) {
+            // Check there is no warning about missing xcode command line developer tools.
+            cmd.validateOutput(TKit.assertTextStream(xcodeWarning.getValue()).negate());
+        }
+
+        cmd.execute(1);
+    }
+}

test/jdk/tools/jpackage/macosx/base/SigningBase.java

@@ -63,20 +63,41 @@
 
 public class SigningBase {
 
-    enum StandardKeychain {
-        MAIN(DEFAULT_KEYCHAIN,
-                cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()]).create(),
-                cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()]).create(),
-                cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]).create(),
-                cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]).create());
+    public enum StandardCertificateRequest {
+        APP_IMAGE(cert().userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        INSTALLER(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.ASCII_INDEX.value()])),
+        APP_IMAGE_UNICODE(cert().userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()])),
+        INSTALLER_UNICODE(cert().type(CertificateType.INSTALLER).userName(DEV_NAMES[CertIndex.UNICODE_INDEX.value()]));
+
+        StandardCertificateRequest(CertificateRequest.Builder specBuilder) {
+            this.spec = specBuilder.create();
+        }
+
+        public CertificateRequest spec() {
+            return spec;
+        }
+
+        private static CertificateRequest.Builder cert() {
+            return new CertificateRequest.Builder();
+        }
+
+        private final CertificateRequest spec;
+    }
+
+    public enum StandardKeychain {
+        MAIN(DEFAULT_KEYCHAIN, StandardCertificateRequest.values());
+
+        StandardKeychain(String keychainName, StandardCertificateRequest... certs) {
+            this(keychainName, certs[0].spec(), Stream.of(certs).skip(1).map(StandardCertificateRequest::spec).toArray(CertificateRequest[]::new));
+        }
 
         StandardKeychain(String keychainName, CertificateRequest cert, CertificateRequest... otherCerts) {
             final var builder = keychain(keychainName).addCert(cert);
             List.of(otherCerts).forEach(builder::addCert);
             this.spec = builder.create();
         }
 
-        KeychainWithCertsSpec spec() {
+        public KeychainWithCertsSpec spec() {
             return spec;
         }
 
@@ -92,7 +113,7 @@ private static List<KeychainWithCertsSpec> signingEnv() {
             return Stream.of(values()).map(StandardKeychain::spec).toList();
         }
 
-        final KeychainWithCertsSpec spec;
+        private final KeychainWithCertsSpec spec;
     }
 
     public static void setUp() {

test/jdk/tools/jpackage/share/ErrorTest.java

@@ -47,7 +47,6 @@
 import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JPackageStringBundle;
-import jdk.jpackage.test.MacHelper;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
 
@@ -558,34 +557,6 @@ public static Collection<Object[]> testMac() {
         return toTestArgs(testCases.stream());
     }
 
-    @Test(ifOS = MACOS)
-    public static void testAppContentWarning() {
-        // --app-content and --type app-image
-        // Expect `message.codesign.failed.reason.app.content` message in the log.
-        // This is not a fatal error, just a warning.
-        // To make jpackage fail, specify invalid signing identity.
-        final var cmd = JPackageCommand.helloAppImage()
-                .addArguments("--app-content", TKit.TEST_SRC_ROOT.resolve("apps/dukeplug.png"))
-                .addArguments("--mac-sign", "--mac-app-image-sign-identity", "foo");
-
-        final List<CannedFormattedString> expectedStrings = new ArrayList<>();
-        expectedStrings.add(JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.app.content"));
-
-        final var xcodeWarning = JPackageStringBundle.MAIN.cannedFormattedString("message.codesign.failed.reason.xcode.tools");
-        if (!MacHelper.isXcodeDevToolsInstalled()) {
-            expectedStrings.add(xcodeWarning);
-        }
-
-        defaultInit(cmd, expectedStrings);
-
-        if (MacHelper.isXcodeDevToolsInstalled()) {
-            // Check there is no warning about missing xcode command line developer tools.
-            cmd.validateOutput(TKit.assertTextStream(xcodeWarning.getValue()).negate());
-        }
-
-        cmd.execute(1);
-    }
-
     public static Collection<Object[]> testLinux() {
         final List<TestSpec> testCases = new ArrayList<>();