FileAssociationsTest: use CannedFormattedString

Author: alexeysemenyukoracle

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

@@ -23,10 +23,11 @@
 
 import java.nio.file.Path;
 import java.util.Map;
-
 import jdk.jpackage.test.Annotations.Parameter;
 import jdk.jpackage.test.Annotations.Test;
 import jdk.jpackage.test.FileAssociations;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.JPackageStringBundle;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
 import jdk.jpackage.test.TKit;
@@ -111,46 +112,42 @@ public static void test(boolean includeDescription) {
     public static void testNoMime() {
         final Path propFile = TKit.workDir().resolve("fa.properties");
 
-        PackageTest packageTest = new PackageTest().excludeTypes(PackageType.MAC);
-
-        packageTest.configureHelloApp().addRunOnceInitializer(() -> {
+        initPackageTest().addRunOnceInitializer(() -> {
             TKit.createPropertiesFile(propFile, Map.of(
                 "extension", "foo",
                 "description", "bar"
             ));
         }).addInitializer(cmd -> {
-            cmd.addArguments("--file-associations", propFile).saveConsoleOutput(true);
-        }).setExpectedExitCode(1).addBundleVerifier((cmd, result) -> {
-           TKit.assertTextStream(
-                   "No MIME types were specified for File Association number 1")
-                   .apply(result.getOutput().stream());
-           TKit.assertTextStream(
-                   "Advice to fix: Specify MIME type for File Association number 1")
-                   .apply(result.getOutput().stream());
+            cmd.addArguments("--file-associations", propFile);
+            cmd.validateOutput(
+                    JPackageStringBundle.MAIN.cannedFormattedString("error.no-content-types-for-file-association", 1),
+                    JPackageStringBundle.MAIN.cannedFormattedString("error.no-content-types-for-file-association.advice", 1));
         }).run();
     }
 
     @Test
     public static void testTooManyMimes() {
         final Path propFile = TKit.workDir().resolve("fa.properties");
 
-        PackageTest packageTest = new PackageTest().excludeTypes(PackageType.MAC);
-
-        packageTest.configureHelloApp().addRunOnceInitializer(() -> {
+        initPackageTest().addRunOnceInitializer(() -> {
             TKit.createPropertiesFile(propFile, Map.of(
                 "mime-type", "application/x-jpackage-foo, application/x-jpackage-bar",
                 "extension", "foo",
                 "description", "bar"
             ));
         }).addInitializer(cmd -> {
-            cmd.addArguments("--file-associations", propFile).saveConsoleOutput(true);
-        }).setExpectedExitCode(1).addBundleVerifier((cmd, result) -> {
-           TKit.assertTextStream(
-                   "More than one MIME types was specified for File Association number 1")
-                   .apply(result.getOutput().stream());
-           TKit.assertTextStream(
-                   "Advice to fix: Specify only one MIME type for File Association number 1")
-                   .apply(result.getOutput().stream());
+            cmd.addArguments("--file-associations", propFile);
+            cmd.validateOutput(
+                    JPackageStringBundle.MAIN.cannedFormattedString("error.too-many-content-types-for-file-association", 1),
+                    JPackageStringBundle.MAIN.cannedFormattedString("error.too-many-content-types-for-file-association.advice", 1));
         }).run();
     }
+
+    private static PackageTest initPackageTest() {
+        return new PackageTest()
+                .excludeTypes(PackageType.MAC)
+                .configureHelloApp()
+                .addInitializer(JPackageCommand::setFakeRuntime)
+                .setExpectedExitCode(1);
+    }
 }