test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java
branchJDK-8200758-branch
changeset 58890 6539ad1d90aa
parent 58417 67ffaf3a2b75
--- a/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java	Fri Nov 01 10:22:49 2019 -0400
+++ b/test/jdk/tools/jpackage/junit/jdk/jpackage/internal/ToolValidatorTest.java	Fri Nov 01 10:25:15 2019 -0400
@@ -51,13 +51,21 @@
         }).validate();
 
         // Minimal version is 1, actual is 10. Should be OK.
-        assertNull(
-                new ToolValidator(TOOL_JAVA).setMinimalVersion(
-                        "1").setVersionParser(unused -> "10").validate());
+        assertNull(new ToolValidator(TOOL_JAVA).setMinimalVersion(
+                new DottedVersion("1")).setVersionParser(unused -> "10").validate());
 
         // Minimal version is 5, actual is 4.99.37. Error expected.
         assertValidationFailure(new ToolValidator(TOOL_JAVA).setMinimalVersion(
-                "5").setVersionParser(unused -> "4.99.37").validate(), false);
+                new DottedVersion("5")).setVersionParser(unused -> "4.99.37").validate(),
+                false);
+
+        // Minimal version is 8, actual is 10, lexicographical comparison is used. Error expected.
+        assertValidationFailure(new ToolValidator(TOOL_JAVA).setMinimalVersion(
+                "8").setVersionParser(unused -> "10").validate(), false);
+
+        // Minimal version is 8, actual is 10, Use DottedVersion class for comparison. Should be OK.
+        assertNull(new ToolValidator(TOOL_JAVA).setMinimalVersion(
+                new DottedVersion("8")).setVersionParser(unused -> "10").validate());
     }
 
     private static void assertValidationFailure(ConfigException v,