JPackageCommand: enhance usePredefinedAppImage() to enable automatic entitlements validation of additional launchers in two-phase app image packaging/signing scenarios; add missing verifyMutable() calls; SigningAppImageTwoStepsTest: follow-up change

Author: alexeysemenyukoracle

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

@@ -392,20 +392,29 @@ public JPackageCommand setInputToEmptyDirectory() {
     }
 
     public JPackageCommand setFakeRuntime() {
-        verifyMutable();
         addPrerequisiteAction(cmd -> {
             cmd.setArgumentValue("--runtime-image", createInputRuntimeImage(RuntimeImageType.RUNTIME_TYPE_FAKE));
         });
 
         return this;
     }
 
+    public JPackageCommand usePredefinedAppImage(JPackageCommand appImageCmd) {
+        appImageCmd.verifyIsOfType(PackageType.IMAGE);
+        verifyIsOfType(PackageType.IMAGE);
+        appImageCmd.getVerifyActionsWithRole(ActionRole.LAUNCHER_VERIFIER).forEach(verifier -> {
+            addVerifyAction(verifier, ActionRole.LAUNCHER_VERIFIER);
+        });
+        return usePredefinedAppImage(appImageCmd.outputBundle());
+    }
+
     public JPackageCommand usePredefinedAppImage(Path predefinedAppImagePath) {
         return setArgumentValue("--app-image", Objects.requireNonNull(predefinedAppImagePath))
                 .removeArgumentWithValue("--input");
     }
 
     JPackageCommand addPrerequisiteAction(ThrowingConsumer<JPackageCommand, ? extends Exception> action) {
+        verifyMutable();
         prerequisiteActions.add(action);
         return this;
     }
@@ -421,6 +430,7 @@ enum ActionRole {
     }
 
     JPackageCommand addVerifyAction(ThrowingConsumer<JPackageCommand, ? extends Exception> action, ActionRole actionRole) {
+        verifyMutable();
         verifyActions.add(action, actionRole);
         return this;
     }

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

@@ -21,8 +21,6 @@
  * questions.
  */
 
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -38,7 +36,6 @@
 import jdk.jpackage.test.MacHelper.SignKeyOption;
 import jdk.jpackage.test.MacHelper.SignKeyOptionWithKeychain;
 import jdk.jpackage.test.MacSign;
-import jdk.jpackage.test.ApplicationLayout;
 import jdk.jpackage.test.MacSignVerify;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
@@ -153,7 +150,7 @@ private SignKeyOptionWithKeychain createSignKeyOption() {
             private SignKeyOptionWithKeychain sign;
         }
 
-        Path createAppImage() {
+        JPackageCommand createAppImage() {
             var appImageCmd = JPackageCommand.helloAppImage()
                     .setFakeRuntime()
                     .setArgumentValue("--dest", TKit.createTempDirectory("appimage"));
@@ -170,17 +167,17 @@ Path createAppImage() {
                 }, signOption.keychain());
             }, appImageCmd::execute);
 
-            return appImageCmd.outputBundle();
+            return appImageCmd;
         }
 
-        void signAppImage(Path appImage, Optional<Consumer<JPackageCommand>> mutator) {
-            Objects.requireNonNull(appImage);
+        void signAppImage(JPackageCommand appImageCmd, Optional<Consumer<JPackageCommand>> mutator) {
+            Objects.requireNonNull(appImageCmd);
             Objects.requireNonNull(mutator);
 
             MacSign.withKeychain(keychain -> {
                 var cmd = new JPackageCommand()
                         .setPackageType(PackageType.IMAGE)
-                        .addArguments("--app-image", appImage)
+                        .usePredefinedAppImage(appImageCmd)
                         .mutate(sign::addTo);
 
                 mutator.ifPresent(cmd::mutate);