8245788: EmptyFolderPackageTest fails on Windows 10

Reviewed-by: herrick, asemenyuk
This commit is contained in:
Alexander Matveev 2020-06-10 18:18:30 -04:00
parent 7450098458
commit 52be8949e7

View File

@ -24,6 +24,7 @@
import java.nio.file.Path;
import jdk.incubator.jpackage.internal.ApplicationLayout;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.PackageType;
import jdk.jpackage.test.TKit;
/**
@ -51,6 +52,13 @@ public class EmptyFolderPackageTest {
EmptyFolderBase.createDirStrcture(input);
})
.addInstallVerifier(cmd -> {
if (cmd.packageType() == PackageType.WIN_MSI) {
if (cmd.isPackageUnpacked("Not running file "
+ "structure check for empty folders")) {
return;
}
}
ApplicationLayout appLayout = cmd.appLayout();
Path appDir = appLayout.appDirectory();
EmptyFolderBase.validateDirStrcture(appDir);