Fix JPackageCommand.macAppImageSigned() and move it together with JPackageCommand.signPredefinedAppImage() to MacHelper class

Author: alexeysemenyukoracle

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

@@ -374,7 +374,7 @@ public Path outputBundle() {
             String dirName;
             if (!TKit.isOSX()) {
                 dirName = name();
-            } else if (macSignPredefinedAppImage()) {
+            } else if (MacHelper.signPredefinedAppImage(this)) {
                 // Request to sign external app image, not to build a new one
                 dirName = getArgumentValue("--app-image");
             } else {
@@ -942,7 +942,7 @@ private boolean expectAppImageFile() {
         }
 
         if (TKit.isOSX()) {
-            if (macSignPredefinedAppImage()) {
+            if (MacHelper.signPredefinedAppImage(this)) {
                 // Request to sign external app image, ".jpackage.xml" file should exist.
                 return true;
             }
@@ -957,30 +957,6 @@ private boolean expectAppImageFile() {
         return isImagePackageType();
     }
 
-    boolean macSignPredefinedAppImage() {
-        if (!TKit.isOSX()) {
-            throw new UnsupportedOperationException();
-        }
-        return hasArgument("--mac-sign") && hasArgument("--app-image");
-    }
-
-    boolean macAppImageSigned() {
-        if (!TKit.isOSX()) {
-            throw new UnsupportedOperationException();
-        }
-
-        if (!hasArgument("--mac-sign")) {
-            return false;
-        }
-
-        if (Optional.ofNullable(getArgumentValue("--app-image")).map(Path::of).map(AppImageFile::load).map(AppImageFile::macSigned).orElse(false)) {
-            // The external app image is signed, so the app image is signed too.
-            return true;
-        }
-
-        return (hasArgument("--mac-signing-key-user-name") || hasArgument("--mac-app-image-sign-identity"));
-    }
-
     private void assertAppImageFile() {
         Path appImageDir = Path.of("");
         if (isImagePackageType() && hasArgument("--app-image")) {
@@ -999,7 +975,7 @@ private void assertAppImageFile() {
 
                 AppImageFile aif = AppImageFile.load(rootDir);
 
-                boolean expectedValue = macAppImageSigned();
+                boolean expectedValue = MacHelper.appImageSigned(this);
                 boolean actualValue = aif.macSigned();
                 TKit.assertEquals(expectedValue, actualValue,
                     "Check for unexpected value of <signed> property in app image file");

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

@@ -33,6 +33,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -149,6 +150,32 @@ public static PListWrapper readPList(Stream<String> lines) {
                 .collect(Collectors.joining()))).get();
     }
 
+    public static boolean signPredefinedAppImage(JPackageCommand cmd) {
+        Objects.requireNonNull(cmd);
+        if (!TKit.isOSX()) {
+            throw new UnsupportedOperationException();
+        }
+        return cmd.hasArgument("--mac-sign") && cmd.hasArgument("--app-image");
+    }
+
+    public static boolean appImageSigned(JPackageCommand cmd) {
+        Objects.requireNonNull(cmd);
+        if (!TKit.isOSX()) {
+            throw new UnsupportedOperationException();
+        }
+
+        if (Optional.ofNullable(cmd.getArgumentValue("--app-image")).map(Path::of).map(AppImageFile::load).map(AppImageFile::macSigned).orElse(false)) {
+            // The external app image is signed, so the app image is signed too.
+            return true;
+        }
+
+        if (!cmd.hasArgument("--mac-sign")) {
+            return false;
+        }
+
+        return (cmd.hasArgument("--mac-signing-key-user-name") || cmd.hasArgument("--mac-app-image-sign-identity"));
+    }
+
     static PackageHandlers createDmgPackageHandlers() {
         return new PackageHandlers(MacHelper::installDmg, MacHelper::uninstallDmg, MacHelper::unpackDmg);
     }