All mac signing tests pass

Author: alexeysemenyukoracle

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java

@@ -194,9 +194,9 @@ static Package createSignAppImagePackage(MacApplication app, BuildEnv env) {
         }).get();
     }
 
-    private static void copyAppImage(Package pkg, AppImageDesc srcAppImage,
+    private static void copyAppImage(MacPackage pkg, AppImageDesc srcAppImage,
             AppImageDesc dstAppImage) throws IOException {
-        PackagingPipeline.copyAppImage(srcAppImage, dstAppImage, false/*!((MacApplication)pkg.app()).sign()*/);
+        PackagingPipeline.copyAppImage(srcAppImage, dstAppImage, !pkg.predefinedAppImageSigned().orElse(false));
     }
 
     private static void copyJliLib(
@@ -409,12 +409,6 @@ private record TaskContextProxy(TaskContext delegate, boolean forApp, boolean co
 
         @Override
         public boolean test(TaskID taskID) {
-            if (!forApp && !copyAppImage && taskID == BuildApplicationTaskID.APP_IMAGE_FILE) {
-                // Always create ".jpackage.xml" if not copying predefined app image for compatibility with the tests
-                // TODO: Don't create ".jpackage.xml" when bundling a package like on other platforms
-                return true;
-            }
-
             if (!delegate.test(taskID)) {
                 return false;
             } else if (taskID == MacBuildApplicationTaskID.PACKAGE_FILE) {

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

@@ -134,8 +134,8 @@ interface AppImageTaskAction<T extends Application, U extends AppImageLayout> ex
     }
 
     @FunctionalInterface
-    interface CopyAppImageTaskAction extends TaskAction {
-        void execute(Package pkg, AppImageDesc srcAppImage, AppImageDesc dstAppImage) throws IOException, PackagerException;
+    interface CopyAppImageTaskAction<T extends Package> extends TaskAction {
+        void execute(T pkg, AppImageDesc srcAppImage, AppImageDesc dstAppImage) throws IOException, PackagerException;
     }
 
     @FunctionalInterface
@@ -183,7 +183,7 @@ <T extends Application, U extends AppImageLayout> TaskBuilder appImageAction(App
                 return setAction(action);
             }
 
-            TaskBuilder copyAction(CopyAppImageTaskAction action) {
+            <T extends Package> TaskBuilder copyAction(CopyAppImageTaskAction<T> action) {
                 return setAction(action);
             }
 
@@ -514,8 +514,9 @@ public boolean test(TaskID taskID) {
         public void execute(TaskAction taskAction) throws IOException, PackagerException {
             if (taskAction instanceof PackageTaskAction<?, ?>) {
                 ((PackageTaskAction<Package, AppImageLayout>)taskAction).execute(env);
-            } else if (taskAction instanceof CopyAppImageTaskAction copyAction) {
-                copyAction.execute(env.pkg(), srcAppImage, new AppImageDesc(env.envLayout(), env.env().appImageDir()));
+            } else if (taskAction instanceof CopyAppImageTaskAction<?>) {
+                ((CopyAppImageTaskAction<Package>)taskAction).execute(env.pkg(),
+                        srcAppImage, new AppImageDesc(env.envLayout(), env.env().appImageDir()));
             } else {
                 throw new IllegalArgumentException();
             }