Better testing of DottedVersion: verify exception error messages

Author: alexeysemenyukoracle

src/jdk.jpackage/share/classes/jdk/jpackage/internal/DottedVersion.java

@@ -57,9 +57,7 @@ private DottedVersion(String version, boolean greedy) {
                             if (!greedy) {
                                 return null;
                             } else {
-                                throw new IllegalArgumentException(MessageFormat.format(I18N.
-                                        getString("error.version-string-zero-length-component"),
-                                        version));
+                                ds.throwException();
                             }
                         }
 
@@ -77,8 +75,7 @@ private DottedVersion(String version, boolean greedy) {
                     }).takeWhile(Objects::nonNull).toArray(BigInteger[]::new);
             suffix = ds.getUnprocessedString();
             if (!suffix.isEmpty() && greedy) {
-                throw new IllegalArgumentException(MessageFormat.format(I18N.getString(
-                        "error.version-string-invalid-component"), version, suffix));
+                ds.throwException();
             }
         }
     }
@@ -89,7 +86,7 @@ private static class DigitsSupplier {
             this.input = input;
         }
 
-        public String getNextDigits() {
+        String getNextDigits() {
             if (stoped) {
                 return null;
             }
@@ -130,10 +127,29 @@ public String getNextDigits() {
             return sb.toString();
         }
 
-        public String getUnprocessedString() {
+        String getUnprocessedString() {
             return input.substring(cursor);
         }
 
+        void throwException() {
+            final String tail;
+            if (lastDotPos >= 0) {
+                tail = input.substring(lastDotPos + 1);
+            } else {
+                tail = getUnprocessedString();
+            }
+
+            final String errMessage;
+            if (tail.isEmpty()) {
+                errMessage = MessageFormat.format(I18N.getString(
+                        "error.version-string-zero-length-component"), input);
+            } else {
+                errMessage = MessageFormat.format(I18N.getString(
+                        "error.version-string-invalid-component"), input, tail);
+            }
+            throw new IllegalArgumentException(errMessage);
+        }
+
         private int cursor;
         private int lastDotPos = -1;
         private boolean stoped;

test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/DottedVersionTest.java

@@ -22,8 +22,10 @@
  */
 package jdk.jpackage.internal;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Stream;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -112,28 +114,57 @@ private static List<TestConfig> testValid() {
         return data;
     }
 
+    record InvalidVersionTestSpec(String version, String invalidComponent) {
+        public InvalidVersionTestSpec {
+            Objects.requireNonNull(version);
+            Objects.requireNonNull(invalidComponent);
+        }
+
+        InvalidVersionTestSpec(String version) {
+            this(version, "");
+        }
+
+        void run() {
+            final String expectedErrorMsg;
+            if (invalidComponent.isEmpty()) {
+                expectedErrorMsg = MessageFormat.format(I18N.getString("error.version-string-zero-length-component"), version);
+            } else {
+                expectedErrorMsg = MessageFormat.format(I18N.getString("error.version-string-invalid-component"), version, invalidComponent);
+            }
+
+            final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> new DottedVersion(version));
+
+            assertEquals(expectedErrorMsg, ex.getMessage());
+        }
+    }
+
     @ParameterizedTest
     @MethodSource
-    public void testInvalid(String str) {
-        assertThrowsExactly(IllegalArgumentException.class, () -> new DottedVersion(str));
+    public void testInvalid(InvalidVersionTestSpec testSpec) {
+        testSpec.run();
     }
 
-    private static Stream<String> testInvalid() {
+    private static Stream<InvalidVersionTestSpec> testInvalid() {
         return Stream.of(
-                "1.-1",
-                "5.",
-                "4.2.",
-                "3..2",
-                "2.a",
-                "0a",
-                ".",
-                " ",
-                " 1",
-                "1. 2",
-                "+1",
-                "-1",
-                "-0",
-                "+0"
+                new InvalidVersionTestSpec("1.-1", "-1"),
+                new InvalidVersionTestSpec("5."),
+                new InvalidVersionTestSpec("4.2."),
+                new InvalidVersionTestSpec("3..2", ".2"),
+                new InvalidVersionTestSpec("3...2", "..2"),
+                new InvalidVersionTestSpec("2.a", "a"),
+                new InvalidVersionTestSpec("0a", "a"),
+                new InvalidVersionTestSpec("1.0a", "0a"),
+                new InvalidVersionTestSpec(".", "."),
+                new InvalidVersionTestSpec("..", ".."),
+                new InvalidVersionTestSpec(".a.b", ".a.b"),
+                new InvalidVersionTestSpec(".1.2", ".1.2"),
+                new InvalidVersionTestSpec(" ", " "),
+                new InvalidVersionTestSpec(" 1", " 1"),
+                new InvalidVersionTestSpec("1. 2", " 2"),
+                new InvalidVersionTestSpec("+1", "+1"),
+                new InvalidVersionTestSpec("-1", "-1"),
+                new InvalidVersionTestSpec("-0", "-0"),
+                new InvalidVersionTestSpec("+0", "+0")
         );
     }
 
@@ -145,7 +176,8 @@ public void testNull(Type type) {
 
     @Test
     public void testEmptyGreedy() {
-        assertThrowsExactly(IllegalArgumentException.class, () -> DottedVersion.greedy(""), "Version may not be empty string");
+        final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> DottedVersion.greedy(""));
+        assertEquals(I18N.getString("error.version-string-empty"), ex.getMessage());
     }
 
     @Test