Skip to content

Commit 4835cc5

Browse files
Remove negative tests from AppVersionTest. ErrorTest tests invalid app versions better, it verifies error messages in jpackage output, AppVersionTest doesn't.
1 parent cc03a14 commit 4835cc5

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

test/jdk/tools/jpackage/share/AppVersionTest.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import jdk.jpackage.test.Annotations.Parameters;
3232
import jdk.jpackage.test.Annotations.Test;
3333
import jdk.jpackage.test.JPackageCommand;
34-
import jdk.jpackage.test.PackageTest;
3534
import jdk.jpackage.test.TKit;
3635

3736
/*
@@ -70,19 +69,6 @@ public static Collection<?> input() {
7069
"--app-version", "7.5.81"}}
7170
}));
7271

73-
// These are invalid version strings.
74-
// Don't need to test all invalid input as this is handled in
75-
// PlatformVersionTest unit test
76-
if (TKit.isWindows()) {
77-
data.addAll(List.of(new Object[][]{
78-
{null, "Hello", new String[]{"--app-version", "256"}}
79-
}));
80-
} else if (TKit.isOSX()) {
81-
data.addAll(List.of(new Object[][]{
82-
{null, "Hello", new String[]{"--app-version", "0.2"}}
83-
}));
84-
}
85-
8672
return data;
8773
}
8874

@@ -95,17 +81,6 @@ public AppVersionTest(String expectedVersion, String javaAppDesc,
9581

9682
@Test
9783
public void test() throws XPathExpressionException, IOException {
98-
if (expectedVersion == null) {
99-
new PackageTest()
100-
.setExpectedExitCode(1)
101-
.configureHelloApp(javaAppDesc)
102-
.addInitializer(cmd -> {
103-
cmd.addArguments(jpackageArgs);
104-
})
105-
.run();
106-
return;
107-
}
108-
10984
JPackageCommand cmd = JPackageCommand.helloAppImage(javaAppDesc);
11085
if (jpackageArgs != null) {
11186
cmd.addArguments(jpackageArgs);

0 commit comments

Comments
 (0)