stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8343101: Rework BasicTest.testTemp test cases

Browse Source 
Reviewed-by: almatvee
This commit is contained in:
Alexey Semenyuk 2024-10-28 17:24:01 +00:00
parent 00fe9f7bdf
commit a95374f588
2 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/TestBuilder.java
View File

@ -392,6 +392,9 @@ final class TestBuilder implements AutoCloseable {
}
private static Object fromString(String value, Class toType) {
if (toType.isEnum()) {
return Enum.valueOf(toType, value);
}
Function<String, Object> converter = conv.get(toType);
if (converter == null) {
throw new RuntimeException(String.format(

80
test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java
View File

@ -30,7 +30,6 @@ import java.util.List;
import java.util.ArrayList;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import jdk.jpackage.test.TKit;
@ -265,49 +264,64 @@ public final class BasicTest {
cmd.executeAndAssertHelloAppImageCreated();
}
public static enum TestTempType {
TEMPDIR_EMPTY,
TEMPDIR_NOT_EMPTY,
TEMPDIR_NOT_EXIST,
}
/**
* Test --temp option. Doesn't make much sense for app image as temporary
* directory is used only on Windows. Test it in packaging mode.
* @throws IOException
*/
@Test
@Parameter("true")
@Parameter("false")
public void testTemp(boolean withExistingTempDir) throws IOException {
@Parameter("TEMPDIR_EMPTY")
@Parameter("TEMPDIR_NOT_EMPTY")
@Parameter("TEMPDIR_NOT_EXIST")
public void testTemp(TestTempType type) throws IOException {
final Path tempRoot = TKit.createTempDirectory("tmp");
Supplier<PackageTest> createTest = () -> {
return new PackageTest()
.configureHelloApp()
// Force save of package bundle in test work directory.
.addInitializer(JPackageCommand::setDefaultInputOutput)
.addInitializer(cmd -> {
Path tempDir = getTempDirectory(cmd, tempRoot);
if (withExistingTempDir) {
Files.createDirectories(tempDir);
} else {
Files.createDirectories(tempDir.getParent());
var pkgTest = new PackageTest()
.configureHelloApp()
// Force save of package bundle in test work directory.
.addInitializer(JPackageCommand::setDefaultInputOutput)
.addInitializer(cmd -> {
Path tempDir = getTempDirectory(cmd, tempRoot);
switch (type) {
case TEMPDIR_EMPTY -> Files.createDirectories(tempDir);
case TEMPDIR_NOT_EXIST -> Files.createDirectories(tempDir.getParent());
case TEMPDIR_NOT_EMPTY -> {
Files.createDirectories(tempDir);
TKit.createTextFile(tempDir.resolve("foo.txt"), List.of(
"Hello Duke!"));
}
}
cmd.addArguments("--temp", tempDir);
}
);
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));
TKit.assertStringListEquals(List.of("Hello Duke!"),
Files.readAllLines(tempDir.resolve(tempDirContents[0])),
"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);
TKit.assertPathNotEmptyDirectory(tempDir);
});
}
createTest.get()
.addBundleVerifier(cmd -> {
// Check jpackage actually used the supplied directory.
Path tempDir = getTempDirectory(cmd, tempRoot);
TKit.assertNotEquals(0, tempDir.toFile().list().length,
String.format(
"Check jpackage wrote some data in the supplied temporary directory [%s]",
tempDir));
})
.run(PackageTest.Action.CREATE);
createTest.get()
// Temporary directory should not be empty,
// jpackage should exit with error.
.setExpectedExitCode(1)
.run(PackageTest.Action.CREATE);
pkgTest.run(PackageTest.Action.CREATE);
}
@Test