Better test coverage for bad app image

Author: alexeysemenyukoracle

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

@@ -25,10 +25,13 @@
 import java.nio.file.Files;
 import java.io.IOException;
 import java.util.List;
+import jdk.jpackage.internal.util.XmlUtils;
 import jdk.jpackage.test.AppImageFile;
 import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.CannedFormattedString;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.RunnablePackageTest.Action;
 import jdk.jpackage.test.Annotations.Test;
@@ -106,17 +109,16 @@ public static void testEmpty(boolean withIcon) throws IOException {
     public static void testBadAppImage() throws IOException {
         Path appImageDir = TKit.createTempDirectory("appimage");
         Files.createFile(appImageDir.resolve("foo"));
-        configureAppImageWithoutJPackageXMLFile(appImageDir).addInitializer(
-                cmd -> {
-                    cmd.removeArgumentWithValue("--name");
-                }).run(Action.CREATE);
+        configureBadAppImage(appImageDir).addInitializer(cmd -> {
+            cmd.removeArgumentWithValue("--name");
+        }).run(Action.CREATE);
     }
 
     @Test
     public static void testBadAppImage2() throws IOException {
         Path appImageDir = TKit.createTempDirectory("appimage");
         Files.createFile(appImageDir.resolve("foo"));
-        configureAppImageWithoutJPackageXMLFile(appImageDir).run(Action.CREATE);
+        configureBadAppImage(appImageDir).run(Action.CREATE);
     }
 
     @Test
@@ -126,29 +128,45 @@ public static void testBadAppImage3() throws IOException {
         JPackageCommand appImageCmd = JPackageCommand.helloAppImage().
                 setFakeRuntime().setArgumentValue("--dest", appImageDir);
 
-        configureAppImageWithoutJPackageXMLFile(appImageCmd.outputBundle()).
-                addRunOnceInitializer(() -> {
-                    appImageCmd.execute();
-                    Files.delete(AppImageFile.getPathInAppImage(appImageCmd.
-                            outputBundle()));
-                }).run(Action.CREATE);
+        configureBadAppImage(appImageCmd.outputBundle()).addRunOnceInitializer(() -> {
+            appImageCmd.execute();
+            Files.delete(AppImageFile.getPathInAppImage(appImageCmd.outputBundle()));
+        }).run(Action.CREATE);
     }
 
-    private static PackageTest configureAppImageWithoutJPackageXMLFile(
-            Path appImageDir) {
-        return new PackageTest()
-                .addInitializer(cmd -> {
-                    cmd.saveConsoleOutput(true);
-                    cmd.addArguments("--app-image", appImageDir);
-                    cmd.removeArgumentWithValue("--input");
-                    cmd.ignoreDefaultVerbose(true); // no "--verbose" option
-                })
-                .addBundleVerifier((cmd, result) -> {
-                    TKit.assertTextStream(
-                    "Error: Missing .jpackage.xml file in app-image dir").apply(
-                            result.getOutput().stream());
-                })
-                .setExpectedExitCode(1);
+    @Test
+    public static void testBadAppImageFile() throws IOException {
+        final var appImageRoot = TKit.createTempDirectory("appimage");
+
+        final var appImageCmd = JPackageCommand.helloAppImage().
+                setFakeRuntime().setArgumentValue("--dest", appImageRoot);
+
+        final var appImageDir = appImageCmd.outputBundle();
+
+        final var expectedError = JPackageStringBundle.MAIN.cannedFormattedString(
+                "error.invalid-app-image", appImageDir, AppImageFile.getPathInAppImage(appImageDir));
+
+        configureBadAppImage(appImageDir, expectedError).addRunOnceInitializer(() -> {
+            appImageCmd.execute();
+            XmlUtils.createXml(AppImageFile.getPathInAppImage(appImageDir), xml -> {
+                xml.writeStartElement("jpackage-state");
+                xml.writeEndElement();
+            });
+        }).run(Action.CREATE);
+    }
+
+    private static PackageTest configureBadAppImage(Path appImageDir) {
+        return configureBadAppImage(appImageDir,
+                JPackageStringBundle.MAIN.cannedFormattedString("error.foreign-app-image", appImageDir));
+    }
+
+    private static PackageTest configureBadAppImage(Path appImageDir, CannedFormattedString expectedError) {
+        return new PackageTest().addInitializer(cmd -> {
+            cmd.addArguments("--app-image", appImageDir);
+            cmd.removeArgumentWithValue("--input");
+            cmd.ignoreDefaultVerbose(true); // no "--verbose" option
+            cmd.validateOutput(expectedError);
+        }).setExpectedExitCode(1);
     }
 
     private static Path iconPath(String name) {