Make CannedFormattedString a record and add null checks. Add CannedFormattedString.CannedArgument interface to make CannedFormattedString instances provide system-independent test descriptions.

Author: alexeysemenyukoracle

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/CannedFormattedString.java

@@ -22,20 +22,60 @@
  */
 package jdk.jpackage.test;
 
+import java.nio.file.Path;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.BiFunction;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
 
-public final class CannedFormattedString {
+public record CannedFormattedString(BiFunction<String, Object[], String> formatter, String key, Object[] args) {
 
-    CannedFormattedString(BiFunction<String, Object[], String> formatter,
-            String key, Object[] args) {
-        this.formatter = formatter;
-        this.key = key;
-        this.args = args;
+    @FunctionalInterface
+    public interface CannedArgument {
+        public String value();
+    }
+
+    public static Object cannedArgument(Supplier<Object> supplier, String label) {
+        Objects.requireNonNull(supplier);
+        Objects.requireNonNull(label);
+        return new CannedArgument() {
+
+            @Override
+            public String value() {
+                return supplier.get().toString();
+            }
+
+            @Override
+            public String toString( ) {
+                return label;
+            }
+        };
+    }
+
+    public static Object cannedAbsolutePath(Path v) {
+        return cannedArgument(() -> v.toAbsolutePath(), String.format("AbsolutePath(%s)", v));
+    }
+
+    public static Object cannedAbsolutePath(String v) {
+        return cannedAbsolutePath(Path.of(v));
+    }
+
+    public CannedFormattedString {
+        Objects.requireNonNull(formatter);
+        Objects.requireNonNull(key);
+        Objects.requireNonNull(args);
+        List.of(args).forEach(Objects::requireNonNull);
     }
 
     public String getValue() {
-        return formatter.apply(key, args);
+        return formatter.apply(key, Stream.of(args).map(arg -> {
+            if (arg instanceof CannedArgument cannedArg) {
+                return cannedArg.value();
+            } else {
+                return arg;
+            }
+        }).toArray());
     }
 
     @Override
@@ -46,8 +86,4 @@ public String toString() {
             return String.format("%s+%s", key, List.of(args));
         }
     }
-
-    private final BiFunction<String, Object[], String> formatter;
-    private final String key;
-    private final Object[] args;
 }