|
30 | 30 | import java.util.function.Function;
|
31 | 31 | import java.util.stream.Collectors;
|
32 | 32 | import java.util.stream.Stream;
|
| 33 | +import jdk.jpackage.test.CannedFormattedString; |
33 | 34 | import jdk.jpackage.test.TKit;
|
34 | 35 | import jdk.jpackage.test.JavaAppDesc;
|
35 | 36 | import jdk.jpackage.test.HelloApp;
|
36 | 37 | import jdk.jpackage.test.JPackageCommand;
|
| 38 | +import jdk.jpackage.test.JPackageStringBundle; |
37 | 39 | import jdk.jpackage.test.PackageType;
|
38 | 40 | import jdk.jpackage.test.Annotations.Parameter;
|
39 | 41 | import jdk.jpackage.test.Annotations.Parameters;
|
@@ -121,19 +123,16 @@ public void test(String javaAppDesc) throws IOException {
|
121 | 123 | if (withGoodPath) {
|
122 | 124 | cmd.executeAndAssertHelloAppImageCreated();
|
123 | 125 | } else {
|
124 |
| - final String expectedErrorMessage; |
| 126 | + final CannedFormattedString expectedErrorMessage; |
125 | 127 | 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"); |
127 | 130 | } 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()); |
130 | 133 | }
|
131 | 134 |
|
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); |
137 | 136 | }
|
138 | 137 | }
|
139 | 138 |
|
|
0 commit comments