Skip to content
Permalink
Browse files

8233166: jpackage tool skips empty directories

Reviewed-by: herrick, asemenyuk
  • Loading branch information
Alexander Matveev
Alexander Matveev committed May 5, 2020
1 parent 2254cf5 commit 5868c76ec6ead5e6476fe810c521c3d00514ce40
@@ -83,10 +83,13 @@ public void setOutput(File output) {
if (!Files.isSymbolicLink(root.toPath())) {
if (root.isDirectory()) {
File[] children = root.listFiles();
if (children != null) {
if (children != null && children.length > 0) {
for (File f : children) {
files.addAll(expandFileset(f));
}
} else {
// Include empty folders
files.add(root);
}
} else {
files.add(root);
@@ -0,0 +1,72 @@
/*
* Copyright (c) 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import jdk.jpackage.test.TKit;

public class EmptyFolderBase {

// Note: To specify file use ".txt" extension.
// Note: createDirStrcture() will call mkdir() or createNewFile() for paths defined
// in dirStruct, so make sure paths are defined in order.

// folder-empty
// folder-not-empty
// folder-not-empty/folder-empty
// folder-not-empty/another-folder-empty
// folder-not-empty/folder-non-empty2
// folder-not-empty/folder-non-empty2/file.txt
private static final String [] DIR_STRUCT = {
"folder-empty",
"folder-not-empty",
"folder-not-empty" + File.separator + "folder-empty",
"folder-not-empty" + File.separator + "another-folder-empty",
"folder-not-empty" + File.separator + "folder-non-empty2",
"folder-not-empty" + File.separator + "folder-non-empty2" + File.separator +
"file.txt"
};

// See dirStruct
public static void createDirStrcture(Path inputPath) throws IOException {
File input = new File(inputPath.toString());
input.mkdir();

for (String p : DIR_STRUCT) {
File f = new File(input, p);
if (p.endsWith(".txt")) {
f.createNewFile();
} else {
f.mkdir();
}
}
}

public static void validateDirStrcture(Path appDirPath) {
for (String p : DIR_STRUCT) {
Path path = appDirPath.resolve(p);
TKit.assertPathExists(path, true);
}
}
}
@@ -0,0 +1,61 @@
/*
* Copyright (c) 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.nio.file.Path;
import jdk.incubator.jpackage.internal.ApplicationLayout;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.TKit;

/**
* Tests generation of packages with input folder containing empty folders.
*/

/*
* @test
* @summary jpackage with input containing empty folders
* @library ../helpers
* @library /test/lib
* @key jpackagePlatformPackage
* @build EmptyFolderBase
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @run main/othervm -Xmx512m EmptyFolderPackageTest
*/
public class EmptyFolderPackageTest {

public static void main(String[] args) throws Exception {
TKit.run(args, () -> {
new PackageTest().configureHelloApp()
.addInitializer(cmd -> {
Path input = cmd.inputDir();
EmptyFolderBase.createDirStrcture(input);
})
.addInstallVerifier(cmd -> {
ApplicationLayout appLayout = cmd.appLayout();
Path appDir = appLayout.appDirectory();
EmptyFolderBase.validateDirStrcture(appDir);
})
.run();
});
}
}
@@ -0,0 +1,63 @@
/*
* Copyright (c) 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.nio.file.Path;
import jdk.jpackage.test.JPackageCommand;
import jdk.jpackage.test.TKit;
import jdk.incubator.jpackage.internal.ApplicationLayout;

/**
* Tests generation of app image with input folder containing empty folders.
*/

/*
* @test
* @summary jpackage with input containing empty folders
* @library ../helpers
* @library /test/lib
* @build EmptyFolderBase
* @build jdk.jpackage.test.*
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
* @run main/othervm -Xmx512m EmptyFolderTest
*/
public class EmptyFolderTest {

public static void main(String[] args) throws Exception {
TKit.run(args, () -> {
JPackageCommand cmd = JPackageCommand.helloAppImage();

// Add more files into input folder
Path input = cmd.inputDir();
EmptyFolderBase.createDirStrcture(input);

// Create app image
cmd.executeAndAssertHelloAppImageCreated();

// Verify directory strcture
ApplicationLayout appLayout = cmd.appLayout();
Path appDir = appLayout.appDirectory();
EmptyFolderBase.validateDirStrcture(appDir);
});
}

}

0 comments on commit 5868c76

Please sign in to comment.