Skip to content

Commit ecad792

Browse files
ModulePathTest: use CannedFormattedString to validate error output
1 parent 461f654 commit ecad792

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
import java.util.function.Function;
3131
import java.util.stream.Collectors;
3232
import java.util.stream.Stream;
33+
import jdk.jpackage.test.CannedFormattedString;
3334
import jdk.jpackage.test.TKit;
3435
import jdk.jpackage.test.JavaAppDesc;
3536
import jdk.jpackage.test.HelloApp;
3637
import jdk.jpackage.test.JPackageCommand;
38+
import jdk.jpackage.test.JPackageStringBundle;
3739
import jdk.jpackage.test.PackageType;
3840
import jdk.jpackage.test.Annotations.Parameter;
3941
import jdk.jpackage.test.Annotations.Parameters;
@@ -121,19 +123,16 @@ public void test(String javaAppDesc) throws IOException {
121123
if (withGoodPath) {
122124
cmd.executeAndAssertHelloAppImageCreated();
123125
} else {
124-
final String expectedErrorMessage;
126+
final CannedFormattedString expectedErrorMessage;
125127
if (modulePathArgs.isEmpty()) {
126-
expectedErrorMessage = "Error: Missing argument: --runtime-image or --module-path";
128+
expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
129+
"ERR_MissingArgument", "--runtime-image or --module-path");
127130
} else {
128-
expectedErrorMessage = String.format(
129-
"Failed to find %s module in module path", appDesc.moduleName());
131+
expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(
132+
"error.no-module-in-path", appDesc.moduleName());
130133
}
131134

132-
List<String> output = cmd
133-
.saveConsoleOutput(true)
134-
.execute(1)
135-
.getOutput();
136-
TKit.assertTextStream(expectedErrorMessage).apply(output.stream());
135+
cmd.validateOutput(expectedErrorMessage).execute(1);
137136
}
138137
}
139138

0 commit comments

Comments
 (0)