Backport 00fe9f7bdfd245791bca6b5b1b2d0a98d41af221

Author: duke

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

@@ -673,26 +673,40 @@ public static void assertPathExists(Path path, boolean exists) {
             assertTrue(path.toFile().exists(), String.format(
                     "Check [%s] path exists", path));
         } else {
-            assertFalse(path.toFile().exists(), String.format(
+            assertTrue(!path.toFile().exists(), String.format(
                     "Check [%s] path doesn't exist", path));
         }
     }
 
-    public static void assertPathNotEmptyDirectory(Path path) {
-        if (Files.isDirectory(path)) {
+    public static void assertDirectoryNotEmpty(Path path) {
+        assertDirectoryExists(path, Optional.of(false));
+    }
+
+    public static void assertDirectoryEmpty(Path path) {
+        assertDirectoryExists(path, Optional.of(true));
+    }
+
+    public static void assertDirectoryExists(Path path, Optional<Boolean> isEmptyCheck) {
+        assertPathExists(path, true);
+        boolean isDirectory = Files.isDirectory(path);
+        if (isEmptyCheck.isEmpty() || !isDirectory) {
+            assertTrue(isDirectory, String.format("Check [%s] is a directory", path));
+        } else {
             ThrowingRunnable.toRunnable(() -> {
                 try (var files = Files.list(path)) {
-                    TKit.assertFalse(files.findFirst().isEmpty(), String.format
-                            ("Check [%s] is not an empty directory", path));
+                    boolean actualIsEmpty = files.findFirst().isEmpty();
+                    if (isEmptyCheck.get()) {
+                        TKit.assertTrue(actualIsEmpty, String.format("Check [%s] is not an empty directory", path));
+                    } else {
+                        TKit.assertTrue(!actualIsEmpty, String.format("Check [%s] is an empty directory", path));
+                    }
                 }
             }).run();
-         }
+        }
     }
 
     public static void assertDirectoryExists(Path path) {
-        assertPathExists(path, true);
-        assertTrue(path.toFile().isDirectory(), String.format(
-                "Check [%s] is a directory", path));
+        assertDirectoryExists(path, Optional.empty());
     }
 
     public static void assertFileExists(Path path) {

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

@@ -298,7 +298,7 @@ private void verifyStartMenuShortcut(Path shortcutsRoot, boolean exists) {
             Path shortcutPath = shortcutsRoot.resolve(startMenuShortcutPath);
             verifyShortcut(shortcutPath, exists);
             if (!exists) {
-                TKit.assertPathNotEmptyDirectory(shortcutPath.getParent());
+                TKit.assertDirectoryNotEmpty(shortcutPath.getParent());
             }
         }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,44 +21,113 @@
  * questions.
  */
 
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
-import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.Annotations.Test;
-import jdk.jpackage.internal.ApplicationLayout;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.PackageType;
+import jdk.jpackage.test.TKit;
 
 /**
- * Tests generation of app image with input folder containing empty folders.
+ * Tests generation of packages and app image with input folder containing empty folders.
+ */
+
+/*
+ * @test
+ * @summary jpackage for package with input containing empty folders
+ * @library ../helpers
+ * @library /test/lib
+ * @key jpackagePlatformPackage
+ * @build jdk.jpackage.test.*
+ * @build EmptyFolderTest
+ * @modules jdk.jpackage/jdk.jpackage.internal
+ * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
+ *  --jpt-run=EmptyFolderTest.testPackage
  */
 
 /*
  * @test
- * @summary jpackage with input containing empty folders
+ * @summary jpackage for app image with input containing empty folders
  * @library ../helpers
  * @library /test/lib
- * @build EmptyFolderBase
  * @build jdk.jpackage.test.*
  * @build EmptyFolderTest
  * @modules jdk.jpackage/jdk.jpackage.internal
  * @run main/othervm -Xmx512m jdk.jpackage.test.Main
- *  --jpt-run=EmptyFolderTest
+ *  --jpt-run=EmptyFolderTest.testAppImage
  */
+
 public class EmptyFolderTest {
 
     @Test
-    public static void test() throws Exception {
-        JPackageCommand cmd = JPackageCommand.helloAppImage();
+    public static void testPackage() {
+        new PackageTest()
+                .configureHelloApp()
+                .addInitializer(EmptyFolderTest::createDirTree)
+                .addInitializer(cmd -> {
+                    cmd.setArgumentValue("--name", "EmptyFolderPackageTest");
+                })
+                .addInstallVerifier(EmptyFolderTest::validateDirTree)
+                .run();
+    }
+
+    @Test
+    public static void testAppImage() throws IOException {
+        var cmd = JPackageCommand.helloAppImage();
 
         // Add more files into input folder
-        Path input = cmd.inputDir();
-        EmptyFolderBase.createDirStrcture(input);
+        createDirTree(cmd);
 
         // Create app image
         cmd.executeAndAssertHelloAppImageCreated();
 
-        // Verify directory strcture
-        ApplicationLayout appLayout = cmd.appLayout();
-        Path appDir = appLayout.appDirectory();
-        EmptyFolderBase.validateDirStrcture(appDir);
+        // Verify directory structure
+        validateDirTree(cmd);
+    }
+
+    private static void createDirTree(JPackageCommand cmd) throws IOException {
+        var baseDir = cmd.inputDir();
+        for (var path : DIR_STRUCT) {
+            path = baseDir.resolve(path);
+            if (isFile(path)) {
+                Files.createDirectories(path.getParent());
+                Files.write(path, new byte[0]);
+            } else {
+                Files.createDirectories(path);
+            }
+        }
+    }
+
+    private static void validateDirTree(JPackageCommand cmd) {
+        var outputBaseDir = cmd.appLayout().appDirectory();
+        var inputBaseDir = cmd.inputDir();
+        for (var path : DIR_STRUCT) {
+            Path outputPath = outputBaseDir.resolve(path);
+            if (isFile(outputPath)) {
+                TKit.assertFileExists(outputPath);
+            } else if (!PackageType.WINDOWS.contains(cmd.packageType())) {
+                TKit.assertDirectoryExists(outputPath);
+            } else if (inputBaseDir.resolve(path).toFile().list().length == 0) {
+                // MSI packages don't support empty folders
+                TKit.assertPathExists(outputPath, false);
+            } else {
+                TKit.assertDirectoryNotEmpty(outputPath);
+            }
+        }
+    }
+
+    private static boolean isFile(Path path) {
+        return path.getFileName().toString().endsWith(".txt");
     }
 
+    // Note: To specify file use ".txt" extension.
+    private static final Path [] DIR_STRUCT = {
+        Path.of("folder-empty"),
+        Path.of("folder-not-empty"),
+        Path.of("folder-not-empty", "folder-empty"),
+        Path.of("folder-not-empty", "another-folder-empty"),
+        Path.of("folder-not-empty", "folder-non-empty2", "file.txt")
+    };
 }