8344326: Move jpackage tests from "jdk.jpackage.tests" package to the default package

Reviewed-by: mbaesken
Backport-of: 2c509a158fad63e69a8072fa4a7588eaacf37dc0

Author: GoeLin

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

@@ -38,10 +38,12 @@
 import java.nio.file.WatchService;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -54,13 +56,14 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import static java.util.stream.Collectors.toSet;
 import java.util.stream.Stream;
 import jdk.jpackage.test.Functional.ExceptionBox;
 import jdk.jpackage.test.Functional.ThrowingConsumer;
 import jdk.jpackage.test.Functional.ThrowingRunnable;
 import jdk.jpackage.test.Functional.ThrowingSupplier;
 
-final public class TKit {
+public final class TKit {
 
     private static final String OS = System.getProperty("os.name").toLowerCase();
 
@@ -81,7 +84,7 @@ final public class TKit {
         return TEST_SRC_ROOT.resolve("../../../../src/jdk.jpackage").normalize().toAbsolutePath();
     }).get();
 
-    public final static String ICON_SUFFIX = Functional.identity(() -> {
+    public static final String ICON_SUFFIX = Functional.identity(() -> {
         if (isOSX()) {
             return ".icns";
         }
@@ -741,6 +744,86 @@ public static void assertUnexpected(String msg) {
         error(concatMessages("Unexpected", msg));
     }
 
+    public static DirectoryContentVerifier assertDirectoryContent(Path dir) {
+        return new DirectoryContentVerifier(dir);
+    }
+    public static final class DirectoryContentVerifier {
+        public DirectoryContentVerifier(Path baseDir) {
+            this(baseDir, ThrowingSupplier.toSupplier(() -> {
+                try (var files = Files.list(baseDir)) {
+                    return files.map(Path::getFileName).collect(toSet());
+                }
+            }).get());
+        }
+        public void match(Path ... expected) {
+            DirectoryContentVerifier.this.match(Set.of(expected));
+        }
+        public void match(Set<Path> expected) {
+            currentTest.notifyAssert();
+            var comm = Comm.compare(content, expected);
+            if (!comm.unique1.isEmpty() && !comm.unique2.isEmpty()) {
+                error(String.format(
+                        "assertDirectoryContentEquals(%s): Some expected %s. Unexpected %s. Missing %s",
+                        baseDir, format(comm.common), format(comm.unique1), format(comm.unique2)));
+            } else if (!comm.unique1.isEmpty()) {
+                error(String.format(
+                        "assertDirectoryContentEquals%s: Expected %s. Unexpected %s",
+                        baseDir, format(comm.common), format(comm.unique1)));
+            } else if (!comm.unique2.isEmpty()) {
+                error(String.format(
+                        "assertDirectoryContentEquals(%s): Some expected %s. Missing %s",
+                        baseDir, format(comm.common), format(comm.unique2)));
+            } else {
+                traceAssert(String.format(
+                        "assertDirectoryContentEquals(%s): Expected %s",
+                        baseDir, format(expected)));
+            }
+        }
+        public void contains(Path ... expected) {
+            contains(Set.of(expected));
+        }
+        public void contains(Set<Path> expected) {
+            currentTest.notifyAssert();
+            var comm = Comm.compare(content, expected);
+            if (!comm.unique2.isEmpty()) {
+                error(String.format(
+                        "assertDirectoryContentContains(%s): Some expected %s. Missing %s",
+                        baseDir, format(comm.common), format(comm.unique2)));
+            } else {
+                traceAssert(String.format(
+                        "assertDirectoryContentContains(%s): Expected %s",
+                        baseDir, format(expected)));
+            }
+        }
+        public DirectoryContentVerifier removeAll(Path ... paths) {
+            Set<Path> newContent = new HashSet<>(content);
+            newContent.removeAll(List.of(paths));
+            return new DirectoryContentVerifier(baseDir, newContent);
+        }
+        private DirectoryContentVerifier(Path baseDir, Set<Path> contents) {
+            this.baseDir = baseDir;
+            this.content = contents;
+        }
+        private static record Comm(Set<Path> common, Set<Path> unique1, Set<Path> unique2) {
+            static Comm compare(Set<Path> a, Set<Path> b) {
+                Set<Path> common = new HashSet<>(a);
+                common.retainAll(b);
+                Set<Path> unique1 = new HashSet<>(a);
+                unique1.removeAll(common);
+                Set<Path> unique2 = new HashSet<>(b);
+                unique2.removeAll(common);
+                return new Comm(common, unique1, unique2);
+            }
+        }
+        private static String format(Set<Path> paths) {
+            return Arrays.toString(
+                    paths.stream().sorted().map(Path::toString).toArray(
+                            String[]::new));
+        }
+        private final Path baseDir;
+        private final Set<Path> content;
+    }
+
     public static void assertStringListEquals(List<String> expected,
             List<String> actual, String msg) {
         currentTest.notifyAssert();
@@ -790,7 +873,7 @@ public static void assertStringListEquals(List<String> expected,
         }
     }
 
-    public final static class TextStreamVerifier {
+    public static final class TextStreamVerifier {
         TextStreamVerifier(String value) {
             this.value = value;
             predicate(String::contains);
@@ -853,7 +936,7 @@ public void apply(Stream<String> lines) {
         private String label;
         private boolean negate;
         private Supplier<RuntimeException> createException;
-        final private String value;
+        private final String value;
     }
 
     public static TextStreamVerifier assertTextStream(String what) {

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

@@ -61,22 +61,6 @@ private static Path getInstallationSubDirectory(JPackageCommand cmd) {
         return Path.of(cmd.getArgumentValue("--install-dir", cmd::name));
     }
 
-    // Tests have problems on windows where path in the temp dir are too long
-    // for the wix tools.  We can't use a tempDir outside the TKit's WorkDir, so
-    // we minimize both the tempRoot directory name (above) and the tempDir name
-    // (below) to the extension part (which is necessary to differenciate between
-    // the multiple PackageTypes that will be run for one JPackageCommand).
-    // It might be beter if the whole work dir name was shortened from:
-    // jtreg_open_test_jdk_tools_jpackage_share_jdk_jpackage_tests_BasicTest_java.
-    public static Path getTempDirectory(JPackageCommand cmd, Path tempRoot) {
-        String ext = cmd.outputBundle().getFileName().toString();
-        int i = ext.lastIndexOf(".");
-        if (i > 0 && i < (ext.length() - 1)) {
-            ext = ext.substring(i+1);
-        }
-        return tempRoot.resolve(ext);
-    }
-
     private static void runMsiexecWithRetries(Executor misexec) {
         Executor.Result result = null;
         for (int attempt = 0; attempt < 8; ++attempt) {

test/jdk/tools/jpackage/linux/jdk/jpackage/tests/UsrTreeTest.java renamed to test/jdk/tools/jpackage/linux/UsrTreeTest.java

@@ -21,7 +21,6 @@
  * questions.
  */
 
-package jdk.jpackage.tests;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -46,7 +45,7 @@
  * @build jdk.jpackage.test.*
  * @compile AppVersionTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.AppVersionTest
+ *  --jpt-run=AppVersionTest
  */
 
 public final class AppVersionTest {

test/jdk/tools/jpackage/share/jdk/jpackage/tests/AppVersionTest.java renamed to test/jdk/tools/jpackage/share/AppVersionTest.java

@@ -21,7 +21,6 @@
  * questions.
  */
 
-package jdk.jpackage.tests;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -42,16 +41,14 @@
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.Annotations.Parameter;
 
-import static jdk.jpackage.test.WindowsHelper.getTempDirectory;
-
 /*
  * @test
  * @summary jpackage basic testing
  * @library /test/jdk/tools/jpackage/helpers
  * @build jdk.jpackage.test.*
  * @compile BasicTest.java
  * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.BasicTest
+ *  --jpt-run=BasicTest
  */
 
 public final class BasicTest {
@@ -285,7 +282,7 @@ public void testTemp(TestTempType type) throws IOException {
         // Force save of package bundle in test work directory.
         .addInitializer(JPackageCommand::setDefaultInputOutput)
         .addInitializer(cmd -> {
-            Path tempDir = getTempDirectory(cmd, tempRoot);
+            Path tempDir = tempRoot.resolve(cmd.packageType().name());
             switch (type) {
                     case TEMPDIR_EMPTY -> Files.createDirectories(tempDir);
                     case TEMPDIR_NOT_EXIST -> Files.createDirectories(tempDir.getParent());
@@ -302,20 +299,16 @@ public void testTemp(TestTempType type) throws IOException {
         if (TestTempType.TEMPDIR_NOT_EMPTY.equals(type)) {
             pkgTest.setExpectedExitCode(1).addBundleVerifier(cmd -> {
                 // Check jpackage didn't use the supplied directory.
-                Path tempDir = getTempDirectory(cmd, tempRoot);
-                String[] tempDirContents = tempDir.toFile().list();
-                TKit.assertStringListEquals(List.of("foo.txt"), List.of(
-                        tempDirContents), String.format(
-                                "Check the contents of the supplied temporary directory [%s]",
-                                tempDir));
+                Path tempDir = Path.of(cmd.getArgumentValue("--temp"));
+                TKit.assertDirectoryContent(tempDir).match(Path.of("foo.txt"));
                 TKit.assertStringListEquals(List.of("Hello Duke!"),
-                        Files.readAllLines(tempDir.resolve(tempDirContents[0])),
+                        Files.readAllLines(tempDir.resolve("foo.txt")),
                         "Check the contents of the file in the supplied temporary directory");
             });
         } else {
             pkgTest.addBundleVerifier(cmd -> {
                 // Check jpackage used the supplied directory.
-                Path tempDir = getTempDirectory(cmd, tempRoot);
+                Path tempDir = Path.of(cmd.getArgumentValue("--temp"));
                 TKit.assertDirectoryNotEmpty(tempDir);
             });
         }

test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java renamed to test/jdk/tools/jpackage/share/BasicTest.java

@@ -21,7 +21,6 @@
  * questions.
  */
 
-package jdk.jpackage.tests;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -46,7 +45,7 @@
  * @build jdk.jpackage.test.*
  * @compile CookedRuntimeTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.CookedRuntimeTest
+ *  --jpt-run=CookedRuntimeTest
  */
 
 public final class CookedRuntimeTest {

test/jdk/tools/jpackage/share/jdk/jpackage/tests/CookedRuntimeTest.java renamed to test/jdk/tools/jpackage/share/CookedRuntimeTest.java

@@ -21,7 +21,6 @@
  * questions.
  */
 
-package jdk.jpackage.tests;
 
 import jdk.jpackage.test.JPackageCommand;
 import jdk.jpackage.test.HelloApp;
@@ -37,7 +36,7 @@
  * @build jdk.jpackage.test.*
  * @compile DotInNameTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.DotInNameTest
+ *  --jpt-run=DotInNameTest
  *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
  */
 

test/jdk/tools/jpackage/share/jdk/jpackage/tests/DotInNameTest.java renamed to test/jdk/tools/jpackage/share/DotInNameTest.java

@@ -21,7 +21,6 @@
  * questions.
  */
 
-package jdk.jpackage.tests;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +36,7 @@
  * @build jdk.jpackage.test.*
  * @compile ErrorTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.ErrorTest
+ *  --jpt-run=ErrorTest
  *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
  */
 
@@ -48,7 +47,7 @@
  * @build jdk.jpackage.test.*
  * @compile ErrorTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.ErrorTest
+ *  --jpt-run=ErrorTest
  *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
  */
 

test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java renamed to test/jdk/tools/jpackage/share/ErrorTest.java

@@ -21,7 +21,6 @@
  * questions.
  */
 
-package jdk.jpackage.tests;
 
 import java.util.Collection;
 import java.util.List;
@@ -37,7 +36,7 @@
  * @build jdk.jpackage.test.*
  * @compile JLinkOptionsTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.JLinkOptionsTest
+ *  --jpt-run=JLinkOptionsTest
  */
 
 public final class JLinkOptionsTest {

test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java renamed to test/jdk/tools/jpackage/share/JLinkOptionsTest.java

@@ -21,7 +21,6 @@
  * questions.
  */
 
-package jdk.jpackage.tests;
 
 import java.util.Collection;
 import java.util.List;
@@ -39,7 +38,7 @@
  * @build jdk.jpackage.test.*
  * @compile JavaOptionsEqualsTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest
+ *  --jpt-run=JavaOptionsEqualsTest
  *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
  */
 
@@ -50,7 +49,7 @@
  * @build jdk.jpackage.test.*
  * @compile JavaOptionsEqualsTest.java
  * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest
+ *  --jpt-run=JavaOptionsEqualsTest
  *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
  */