Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8325089: jpackage utility creates an "infinite", undeleteable directory tree #21550

Closed
Closed
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3f961f3
8325089: jpackage utility creates an "infinite", undeleteable directo…
alexeysemenyukoracle Oct 15, 2024
b2fd813
Properly parse "foo.jar:" app desc string.
alexeysemenyukoracle Oct 15, 2024
0accfc1
More strict verification of app image contents
alexeysemenyukoracle Oct 15, 2024
19a4877
Bugfix
alexeysemenyukoracle Oct 15, 2024
c072c34
remove DeployParams.output; remove Arguments.input; replace Arguments…
alexeysemenyukoracle Oct 16, 2024
9edd590
Fix packaging tests
alexeysemenyukoracle Oct 16, 2024
96572f0
Follow up change for DeployParams chnages
alexeysemenyukoracle Oct 16, 2024
17f9c08
Add support to test jpackage execution without `--dest` parameter spe…
alexeysemenyukoracle Oct 16, 2024
50f4d19
Minor improvements to simplify test debug and allow reruns on non-emp…
alexeysemenyukoracle Oct 16, 2024
217e0ef
Add commands
alexeysemenyukoracle Oct 16, 2024
1634c50
Fix trailing whitespaces
alexeysemenyukoracle Oct 16, 2024
645a501
Make jpackage work properly when input and output directories are the…
alexeysemenyukoracle Oct 16, 2024
e3ff0fd
Fix JPackageCommand.execute(): remove existing output bundle (package…
alexeysemenyukoracle Oct 16, 2024
f307fd6
Fix typo and trailing whitespaces
alexeysemenyukoracle Oct 16, 2024
7e3ad9c
Bugfix
alexeysemenyukoracle Oct 16, 2024
20f3015
Use jdk.jpackage.test.Annotations.Parameter annotation to parameteriz…
alexeysemenyukoracle Oct 16, 2024
3cbd2a2
Replace Path.equals() call with Files.isSameFile()
alexeysemenyukoracle Oct 18, 2024
5065a3b
Files.isSameFile() throws exception if a file doesn't exist
alexeysemenyukoracle Oct 18, 2024
01c42c5
Add tests for `--app-content` and `--dmg-app-content` CLI parameters
alexeysemenyukoracle Oct 25, 2024
c21b18b
Merge branch 'master' into JDK-8325089
alexeysemenyukoracle Oct 25, 2024
f54e88b
Make app image asserts configurable in JPackageCommand
alexeysemenyukoracle Oct 25, 2024
1d38f2e
All new InOutPathTest test cases pass
alexeysemenyukoracle Oct 25, 2024
1902637
Bugfix
alexeysemenyukoracle Oct 25, 2024
abf8a89
Merge branch 'master' into JDK-8325089
alexeysemenyukoracle Oct 29, 2024
57b4893
Merge branch 'master' into JDK-8325089
alexeysemenyukoracle Oct 30, 2024
114b6d2
Added TKit.assertDirectoryContent() with unit tests
alexeysemenyukoracle Oct 30, 2024
2812c7d
Missing @module added
alexeysemenyukoracle Oct 30, 2024
137bcf6
- move OSX-specific code to MacHelper
alexeysemenyukoracle Oct 30, 2024
f732ea4
Rework the test to pass on OSX
alexeysemenyukoracle Oct 30, 2024
ba6012b
Ran blessed-modifier-order.sh
alexeysemenyukoracle Oct 30, 2024
0bf7601
Fix modifier order
alexeysemenyukoracle Oct 30, 2024
09c3b54
Rename DirectoryContentVerifier.equals() in DirectoryContentVerifier.…
alexeysemenyukoracle Oct 30, 2024
8001f2f
Bugfix
alexeysemenyukoracle Oct 30, 2024
bc0e3ea
; -> ,
alexeysemenyukoracle Oct 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 14 additions & 15 deletions test/jdk/tools/jpackage/share/InOutPathTest.java
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@
import jdk.jpackage.internal.ApplicationLayout;
import jdk.jpackage.internal.PackageFile;
import jdk.jpackage.test.Annotations;
import jdk.jpackage.test.Annotations.Parameter;
import jdk.jpackage.test.Annotations.Test;
import jdk.jpackage.test.Functional.ThrowingConsumer;
import jdk.jpackage.test.JPackageCommand;
@@ -57,28 +58,27 @@ public final class InOutPathTest {
public static Collection input() {
List<Object[]> data = new ArrayList<>();

for (boolean appImage : List.of(true, false)) {
data.addAll(List.of(new Object[][]{
{appImage, wrap(InOutPathTest::outputDirInInputDir, "--dest:subdir")},
{appImage, wrap(InOutPathTest::outputDirSameAsInputDir, "--dest:same")},
{appImage, wrap(InOutPathTest::tempDirInInputDir, "--temp")},
{appImage, wrap(cmd -> {
outputDirInInputDir(cmd);
tempDirInInputDir(cmd);
}, "--dest:subdir and --temp")},
}));
}
data.addAll(List.of(new Object[][]{
{wrap(InOutPathTest::outputDirInInputDir, "--dest:subdir")},
{wrap(InOutPathTest::outputDirSameAsInputDir, "--dest:same")},
{wrap(InOutPathTest::tempDirInInputDir, "--temp")},
{wrap(cmd -> {
outputDirInInputDir(cmd);
tempDirInInputDir(cmd);
}, "--dest:subdir and --temp")},
}));

return data;
}

public InOutPathTest(Boolean appImage, Envelope configure) {
this.appImage = appImage;
public InOutPathTest(Envelope configure) {
this.configure = configure.value;
}

@Test
public void test() throws Throwable {
@Parameter("true")
@Parameter("false")
public void test(boolean appImage) throws Throwable {
runTest(appImage, configure);
}

@@ -171,7 +171,6 @@ public String toString() {
}
}

private final boolean appImage;
private final ThrowingConsumer<JPackageCommand> configure;

private final static String JAR_NAME = "duke.jar";