Enhance RuntimePackageTest to test that jpackage can derive package name from the runtime image directory name if --name option is not given

Author: alexeysemenyukoracle

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

@@ -29,10 +29,12 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.RunnablePackageTest.Action;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.TKit;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.JavaTool;
 import jdk.jpackage.test.LinuxHelper;
@@ -83,17 +85,24 @@ public static void test() {
     }
 
     @Test
-    public static void testUsrInstallDir() {
+    @Parameter("/usr")
+    @Parameter("/usr/lib/Java")
+    public static void testUsrInstallDir(String installDir) {
         init(PackageType.LINUX)
         .addInitializer(cmd -> cmd.addArguments("--install-dir", "/usr"))
         .run();
     }
 
     @Test
-    public static void testUsrInstallDir2() {
-        init(PackageType.LINUX)
-        .addInitializer(cmd -> cmd.addArguments("--install-dir", "/usr/lib/Java"))
-        .run();
+    public static void testName() {
+        // Test that jpackage can derive package name from the path to runtime image.
+        init(PackageType.NATIVE)
+        .addInitializer(cmd -> cmd.removeArgumentWithValue("--name"))
+        // Don't attempt to install this package as it may have an odd name derived from
+        // the runtime image path. Say, on Linux for `--runtime-image foo/bar/sed`
+        // command line jpackage will create a package named 'sed' that will conflict
+        // with the default 'sed' package.
+        .run(Action.CREATE_AND_UNPACK);
     }
 
     private static PackageTest init(Set<PackageType> types) {
@@ -157,7 +166,8 @@ private static PackageTest init(Set<PackageType> types) {
                         "Check the package doesn't deliver [%s] copyright file",
                         copyright));
             }
-        });
+        })
+        .forTypes(types);
     }
 
     private static Set<Path> listFiles(Path root) throws IOException {