LinuxResourceTest: use CannedFormattedString

Author: alexeysemenyukoracle

test/jdk/tools/jpackage/linux/LinuxResourceTest.java

@@ -21,14 +21,19 @@
  * questions.
  */
 
+import static jdk.jpackage.test.JPackageStringBundle.MAIN;
+
 import java.io.IOException;
 import java.nio.file.Path;
-import jdk.jpackage.test.TKit;
+import java.util.List;
+import java.util.Objects;
+import jdk.jpackage.test.Annotations.Test;
+import jdk.jpackage.test.JPackageCommand;
+import jdk.jpackage.test.LinuxHelper;
 import jdk.jpackage.test.PackageTest;
 import jdk.jpackage.test.PackageType;
-import jdk.jpackage.test.LinuxHelper;
-import jdk.jpackage.test.Annotations.Test;
-import java.util.List;
+import jdk.jpackage.test.RunnablePackageTest.Action;
+import jdk.jpackage.test.TKit;
 
 /*
  * @test
@@ -55,48 +60,47 @@ public static void testHardcodedProperties() throws IOException {
         })
         .forTypes(PackageType.LINUX_DEB)
         .addInitializer(cmd -> {
-            Path controlFile = Path.of(cmd.getArgumentValue("--resource-dir"),
-                    "control");
+            Path controlFile = Path.of(cmd.getArgumentValue("--resource-dir"), "control");
+
+            final var packageProp = property("Package", "dont-install-me");
+            final var verProp = property("Version", "1.2.3-R2");
+            final var arhProp = property("Architecture", "bar");
+
             TKit.createTextFile(controlFile, List.of(
-                "Package: dont-install-me",
-                "Version: 1.2.3-R2",
+                packageProp.format(),
+                verProp.format(),
                 "Section: APPLICATION_SECTION",
                 "Maintainer: APPLICATION_MAINTAINER",
                 "Priority: optional",
-                "Architecture: bar",
+                arhProp.format(),
                 "Provides: dont-install-me",
                 "Description: APPLICATION_DESCRIPTION",
                 "Installed-Size: APPLICATION_INSTALLED_SIZE",
                 "Depends: PACKAGE_DEFAULT_DEPENDENCIES"
             ));
-        })
-        .addBundleVerifier((cmd, result) -> {
-            TKit.assertTextStream("Using custom package resource [DEB control file]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(String.format(
-                    "Expected value of \"Package\" property is [%s]. Actual value in output package is [dont-install-me]",
-                    LinuxHelper.getPackageName(cmd)))
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(
-                    "Expected value of \"Version\" property is [1.0]. Actual value in output package is [1.2.3-R2]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(String.format(
-                    "Expected value of \"Architecture\" property is [%s]. Actual value in output package is [bar]",
-                    LinuxHelper.getDefaultPackageArch(cmd.packageType())))
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
+
+            cmd.validateOutput(MAIN.cannedFormattedString(
+                    "message.using-custom-resource",
+                    String.format("[%s]", MAIN.cannedFormattedString("resource.deb-control-file").getValue()),
+                    controlFile.getFileName()));
+
+            packageProp.expectedValue(LinuxHelper.getPackageName(cmd)).token("APPLICATION_PACKAGE").resourceDirFile(controlFile).validateOutput(cmd);
+            verProp.expectedValue(cmd.version()).token("APPLICATION_VERSION_WITH_RELEASE").resourceDirFile(controlFile).validateOutput(cmd);
+            arhProp.expectedValue(LinuxHelper.getDefaultPackageArch(cmd.packageType())).token("APPLICATION_ARCH").resourceDirFile(controlFile).validateOutput(cmd);
         })
         .forTypes(PackageType.LINUX_RPM)
         .addInitializer(cmd -> {
             Path specFile = Path.of(cmd.getArgumentValue("--resource-dir"),
                     LinuxHelper.getPackageName(cmd) + ".spec");
+
+            final var packageProp = property("Name", "dont-install-me");
+            final var verProp = property("Version", "1.2.3");
+            final var releaseProp = property("Release", "R2");
+
             TKit.createTextFile(specFile, List.of(
-                "Name: dont-install-me",
-                "Version: 1.2.3",
-                "Release: R2",
+                packageProp.format(),
+                verProp.format(),
+                releaseProp.format(),
                 "Summary: APPLICATION_SUMMARY",
                 "License: APPLICATION_LICENSE_TYPE",
                 "Prefix: %{dirname:APPLICATION_DIRECTORY}",
@@ -113,25 +117,77 @@ public static void testHardcodedProperties() throws IOException {
                 "%files",
                 "APPLICATION_DIRECTORY"
             ));
+
+            cmd.validateOutput(MAIN.cannedFormattedString(
+                    "message.using-custom-resource",
+                    String.format("[%s]", MAIN.cannedFormattedString("resource.rpm-spec-file").getValue()),
+                    specFile.getFileName()));
+
+            packageProp.expectedValue(LinuxHelper.getPackageName(cmd)).token("APPLICATION_PACKAGE").resourceDirFile(specFile).validateOutput(cmd);
+            verProp.expectedValue(cmd.version()).token("APPLICATION_VERSION").resourceDirFile(specFile).validateOutput(cmd);
+            releaseProp.expectedValue("1").token("APPLICATION_RELEASE").resourceDirFile(specFile).validateOutput(cmd);
         })
-        .addBundleVerifier((cmd, result) -> {
-            TKit.assertTextStream("Using custom package resource [RPM spec file]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(String.format(
-                    "Expected value of \"Name\" property is [%s]. Actual value in output package is [dont-install-me]",
-                    LinuxHelper.getPackageName(cmd)))
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(
-                    "Expected value of \"Version\" property is [1.0]. Actual value in output package is [1.2.3]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-            TKit.assertTextStream(
-                    "Expected value of \"Release\" property is [1]. Actual value in output package is [R2]")
-                    .predicate(String::contains)
-                    .apply(result.getOutput().stream());
-        })
-        .run();
+        .run(Action.CREATE);
+    }
+
+    private final static class PropertyValidator {
+
+        PropertyValidator name(String v) {
+            name = v;
+            return this;
+        }
+
+        PropertyValidator customValue(String v) {
+            customValue = v;
+            return this;
+        }
+
+        PropertyValidator expectedValue(String v) {
+            expectedValue = v;
+            return this;
+        }
+
+        PropertyValidator token(String v) {
+            token = v;
+            return this;
+        }
+
+        PropertyValidator resourceDirFile(Path v) {
+            resourceDirFile = v;
+            return this;
+        }
+
+        String format() {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(customValue);
+            return String.format("%s: %s", name, customValue);
+        }
+
+        void validateOutput(JPackageCommand cmd) {
+            Objects.requireNonNull(name);
+            Objects.requireNonNull(customValue);
+            Objects.requireNonNull(expectedValue);
+            Objects.requireNonNull(token);
+            Objects.requireNonNull(resourceDirFile);
+
+            final var customResourcePath = customResourcePath();
+            cmd.validateOutput(
+                    MAIN.cannedFormattedString("error.unexpected-package-property", name, expectedValue, customValue, customResourcePath),
+                    MAIN.cannedFormattedString("error.unexpected-package-property.advice", token, customValue, name, customResourcePath));
+        }
+
+        private Path customResourcePath() {
+            return resourceDirFile.getFileName();
+        }
+
+        private String name;
+        private String customValue;
+        private String expectedValue;
+        private String token;
+        private Path resourceDirFile;
+    }
+
+    private static PropertyValidator property(String name, String customValue) {
+        return new PropertyValidator().name(name).customValue(customValue);
     }
 }