AddLauncherTest: add test cases for the main/additional launcher descriptions

Author: alexeysemenyukoracle

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

@@ -21,18 +21,22 @@
  * questions.
  */
 
-import java.nio.file.Path;
-import java.util.Map;
 import java.lang.invoke.MethodHandles;
-import jdk.jpackage.test.PackageTest;
-import jdk.jpackage.test.FileAssociations;
+import java.nio.file.Path;
+import java.util.function.Consumer;
+import jdk.internal.util.OperatingSystem;
 import jdk.jpackage.test.AdditionalLauncher;
+import jdk.jpackage.test.Annotations.Parameter;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CfgFile;
+import jdk.jpackage.test.ConfigurationTarget;
+import jdk.jpackage.test.FileAssociations;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.JavaAppDesc;
+import jdk.jpackage.test.PackageTest;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
 import jdk.jpackage.test.TKit;
-import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.test.Annotations.Parameter;
-import jdk.jpackage.test.CfgFile;
 
 /**
  * Test --add-launcher parameter. Output of the test should be
@@ -233,6 +237,61 @@ public void testMainLauncherIsModular(boolean mainLauncherIsModular) {
                 "Check app.classpath value in ModularAppLauncher cfg file");
     }
 
+    /**
+     * Test --description option
+     */
+    @Test(ifNotOS = OperatingSystem.MACOS) // Don't run on macOS as launcher description is ignored on this platform
+    @Parameter("true")
+    @Parameter("fase")
+    public void testDescription(boolean withPredefinedAppImage) {
+
+        ConfigurationTarget target;
+        if (TKit.isWindows() || withPredefinedAppImage) {
+            target = new ConfigurationTarget(JPackageCommand.helloAppImage());
+        } else {
+            target = new ConfigurationTarget(new PackageTest().configureHelloApp());
+        }
+
+        target.addInitializer(cmd -> {
+            cmd.setArgumentValue("--name", "Foo").setArgumentValue("--description", "Hello");
+            cmd.setFakeRuntime();
+            cmd.setStandardAsserts(JPackageCommand.StandardAssert.MAIN_LAUNCHER_DESCRIPTION);
+        });
+
+        target.add(new AdditionalLauncher("x"));
+        target.add(new AdditionalLauncher("bye").setProperty("description", "Bye"));
+
+        target.test().ifPresent(test -> {
+            // Make all launchers have shortcuts and thus .desktop files.
+            // Launcher description is recorded in a desktop file and verified automatically.
+            test.mutate(addLinuxShortcuts());
+        });
+
+        target.cmd().ifPresent(withPredefinedAppImage ? JPackageCommand::execute : JPackageCommand::executeAndAssertImageCreated);
+        target.test().ifPresent(test -> {
+            test.run(Action.CREATE_AND_UNPACK);
+        });
+
+        if (withPredefinedAppImage) {
+            new PackageTest().addInitializer(cmd -> {
+                cmd.setArgumentValue("--name", "Bar");
+                // Should not have impact of launcher descriptions, but it does.
+                cmd.setArgumentValue("--description", "Installer");
+                cmd.removeArgumentWithValue("--input").setArgumentValue("--app-image", target.cmd().orElseThrow().outputBundle());
+            }).mutate(addLinuxShortcuts()).run(Action.CREATE_AND_UNPACK);
+        }
+    }
+
+    private static Consumer<PackageTest> addLinuxShortcuts() {
+        return test -> {
+            test.forTypes(PackageType.LINUX, () -> {
+                test.addInitializer(cmd -> {
+                    cmd.addArgument("--linux-shortcut");
+                });
+            });
+        };
+    }
+
     private static final Path GOLDEN_ICON = TKit.TEST_SRC_ROOT.resolve(Path.of(
             "resources", "icon" + TKit.ICON_SUFFIX));
 }