Make JavaOptionsEqualsTest and JavaOptionsTest work when external fake runtime is used

alexeysemenyukoracle · alexeysemenyukoracle · commit ac97961455a6 · 2025-03-06T17:12:27.000-05:00
diff --git a/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java b/test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java
@@ -75,7 +75,7 @@ public static Collection<?> input() {
     }
 
     public JavaOptionsEqualsTest(String javaAppDesc, String[] jpackageArgs) {
-        cmd = JPackageCommand.helloAppImage(javaAppDesc);
+        cmd = JPackageCommand.helloAppImage(javaAppDesc).ignoreFakeRuntime();
         if (jpackageArgs != null) {
             cmd.addArguments(jpackageArgs);
         }
@@ -85,7 +85,6 @@ public JavaOptionsEqualsTest(String javaAppDesc, String[] jpackageArgs) {
     public void test() {
         cmd.executeAndAssertHelloAppImageCreated();
         List<String> output = HelloApp.executeLauncher(cmd).getOutput();
-        TKit.assertNotNull(output, "output is null");
         TKit.assertTextStream(WARNING1).apply(output.stream());
         TKit.assertTextStream(WARNING2).apply(output.stream());
     }
diff --git a/test/jdk/tools/jpackage/share/JavaOptionsTest.java b/test/jdk/tools/jpackage/share/JavaOptionsTest.java
@@ -76,7 +76,7 @@ public static Collection<?> input() {
 
     public JavaOptionsTest(String javaAppDesc, String[] jpackageArgs,
             String[] expectedParams) {
-        cmd = JPackageCommand.helloAppImage(javaAppDesc);
+        cmd = JPackageCommand.helloAppImage(javaAppDesc).ignoreFakeRuntime();
         if (jpackageArgs != null) {
             cmd.addArguments(jpackageArgs);
         }
@@ -90,7 +90,6 @@ public void test() {
 
         // 2.) run the launcher it generated
         List<String> output = HelloApp.executeLauncher(cmd).getOutput();
-        TKit.assertNotNull(output, "output is null");
         for (String expect : expected) {
             TKit.assertTextStream(expect).apply(output.stream());
         }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public static Collection<?> input() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public JavaOptionsEqualsTest(String javaAppDesc, String[] jpackageArgs) {`
`78`		`- cmd = JPackageCommand.helloAppImage(javaAppDesc);`
	`78`	`+ cmd = JPackageCommand.helloAppImage(javaAppDesc).ignoreFakeRuntime();`
`79`	`79`	`if (jpackageArgs != null) {`
`80`	`80`	`cmd.addArguments(jpackageArgs);`
`81`	`81`	`}`
`@@ -85,7 +85,6 @@ public JavaOptionsEqualsTest(String javaAppDesc, String[] jpackageArgs) {`
`85`	`85`	`public void test() {`
`86`	`86`	`cmd.executeAndAssertHelloAppImageCreated();`
`87`	`87`	`List<String> output = HelloApp.executeLauncher(cmd).getOutput();`
`88`		`- TKit.assertNotNull(output, "output is null");`
`89`	`88`	`TKit.assertTextStream(WARNING1).apply(output.stream());`
`90`	`89`	`TKit.assertTextStream(WARNING2).apply(output.stream());`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static Collection<?> input() {`
`76`	`76`
`77`	`77`	`public JavaOptionsTest(String javaAppDesc, String[] jpackageArgs,`
`78`	`78`	`String[] expectedParams) {`
`79`		`- cmd = JPackageCommand.helloAppImage(javaAppDesc);`
	`79`	`+ cmd = JPackageCommand.helloAppImage(javaAppDesc).ignoreFakeRuntime();`
`80`	`80`	`if (jpackageArgs != null) {`
`81`	`81`	`cmd.addArguments(jpackageArgs);`
`82`	`82`	`}`
`@@ -90,7 +90,6 @@ public void test() {`
`90`	`90`
`91`	`91`	`// 2.) run the launcher it generated`
`92`	`92`	`List<String> output = HelloApp.executeLauncher(cmd).getOutput();`
`93`		`- TKit.assertNotNull(output, "output is null");`
`94`	`93`	`for (String expect : expected) {`
`95`	`94`	`TKit.assertTextStream(expect).apply(output.stream());`
`96`	`95`	`}`