Better negative testing in MainClassTest

Author: alexeysemenyukoracle

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

@@ -39,10 +39,13 @@
 import jdk.jpackage.internal.util.function.ThrowingConsumer;
 import jdk.jpackage.test.Annotations.Parameters;
 import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.CannedFormattedString;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.CfgFile;
 import jdk.jpackage.test.Executor;
 import jdk.jpackage.test.HelloApp;
 import jdk.jpackage.test.JPackageCommand;
+import static jdk.jpackage.test.JPackageCommand.cannedArgument;
 import jdk.jpackage.test.JavaAppDesc;
 import jdk.jpackage.test.JavaTool;
 import jdk.jpackage.test.TKit;
@@ -87,8 +90,8 @@ Script withJarMainClass(MainClassType v) {
             return this;
         }
 
-        Script expectedErrorMessage(String v) {
-            expectedErrorMessage = v;
+        Script expectedErrorMessage(String key, Object... args) {
+            expectedErrorMessage = JPackageStringBundle.MAIN.cannedFormattedString(key, args);
             return this;
         }
 
@@ -131,7 +134,7 @@ public String toString() {
         private boolean withJLink;
         private MainClassType mainClass;
         private MainClassType jarMainClass;
-        private String expectedErrorMessage;
+        private CannedFormattedString expectedErrorMessage;
     }
 
     public MainClassTest(Script script) {
@@ -194,11 +197,12 @@ public static Collection<?> scripts() {
                         if (withMainClass.contains(jarMainClass)
                                 || withMainClass.contains(mainClass)) {
                         } else if (modular) {
-                            script.expectedErrorMessage(
-                                    "Error: Main application class is missing");
+                            script.expectedErrorMessage("ERR_NoMainClass");
                         } else {
                             script.expectedErrorMessage(
-                                    "A main class was not specified nor was one found in the jar");
+                                    "error.no-main-class-with-main-jar", cannedArgument(cmd -> {
+                                        return cmd.getArgumentValue("--main-jar");
+                                    }, "MAIN-JAR"));
                         }
 
                         scripts.add(new Script[]{script});
@@ -218,11 +222,7 @@ public void test() throws IOException {
         if (script.expectedErrorMessage != null) {
             // This is the case when main class is not found nor in jar
             // file nor on command line.
-            List<String> output = cmd
-                    .saveConsoleOutput(true)
-                    .execute(1)
-                    .getOutput();
-            TKit.assertTextStream(script.expectedErrorMessage).apply(output.stream());
+            cmd.validateOutput(script.expectedErrorMessage).execute(1);
             return;
         }