infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-06 18:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

8384087: Test tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java fails

Browse Source 
Reviewed-by: almatvee, asemenyuk
This commit is contained in:
Ashay Rane 2026-06-01 00:26:50 +00:00 committed by SendaoYan
parent d3073b53d3
commit 7b2845eab4
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/cli/MainTest.java
View File

@ -50,6 +50,7 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import jdk.internal.util.OperatingSystem;
import jdk.jpackage.internal.Globals;
import jdk.jpackage.internal.model.BundlingOperationDescriptor;
import jdk.jpackage.internal.model.ConfigException;
import jdk.jpackage.internal.model.ExecutableAttributesWithCapturedOutput;
import jdk.jpackage.internal.model.JPackageException;
@ -491,8 +492,35 @@ public class MainTest extends JUnitAdapter {
var os = OperatingSystem.current();
var exitCode = Main.run(os, () -> {
CliBundlingEnvironment bundlingEnv = JPackageMockUtils.createBundlingEnvironment(os);
return bundlingEnv;
return new CliBundlingEnvironment() {
@Override
public Optional<BundlingOperationDescriptor> defaultOperation() {
switch (os) {
case LINUX -> {
return Optional.of(StandardBundlingOperation.CREATE_LINUX_DEB.descriptor());
}
case WINDOWS -> {
return Optional.of(StandardBundlingOperation.CREATE_WIN_MSI.descriptor());
}
case MACOS -> {
return Optional.of(StandardBundlingOperation.CREATE_MAC_PKG.descriptor());
}
default -> {
throw new AssertionError();
}
}
}
@Override
public void createBundle(BundlingOperationDescriptor op, Options cmdline) {
if (StandardBundlingOperation.CREATE_APP_IMAGE.contains(StandardBundlingOperation.valueOf(op).orElseThrow())) {
CliBundlingEnvironment bundlingEnv = JPackageMockUtils.createBundlingEnvironment(os);
bundlingEnv.createBundle(op, cmdline);
} else {
throw new AssertionError();
}
}
};
}, new PrintWriter(stdout), new PrintWriter(stderr), args);
return new ExecutionResult(lines(stdout.toString()), lines(stderr.toString()), exitCode);