--- /dev/null	2019-11-20 11:14:37.000000000 -0500
+++ new/test/jdk/tools/jpackage/junit/jdk/incubator/jpackage/internal/ToolValidatorTest.java	2019-11-20 11:14:35.048631600 -0500
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.incubator.jpackage.internal;
+
+import java.nio.file.Path;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+
+public class ToolValidatorTest {
+
+    @Test
+    public void testAvailable() {
+        assertNull(new ToolValidator(TOOL_JAVA).validate());
+    }
+
+    @Test
+    public void testNotAvailable() {
+        assertValidationFailure(new ToolValidator(TOOL_UNKNOWN).validate(), true);
+    }
+
+    @Test
+    public void testVersionParserUsage() {
+        // Without minimal version configured, version parser should not be used
+        new ToolValidator(TOOL_JAVA).setVersionParser(unused -> {
+            throw new RuntimeException();
+        }).validate();
+
+        // Minimal version is 1, actual is 10. Should be OK.
+        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(
+                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,
+            boolean withCause) {
+        assertNotNull(v);
+        assertThat("", is(not(v.getMessage().strip())));
+        assertThat("", is(not(v.advice.strip())));
+        if (withCause) {
+            assertNotNull(v.getCause());
+        } else {
+            assertNull(v.getCause());
+        }
+    }
+
+    private final static String TOOL_JAVA;
+    private final static String TOOL_UNKNOWN = Path.of(System.getProperty(
+            "java.home"), "bin").toString();
+
+    static {
+        String fname = "java";
+        if (Platform.isWindows()) {
+            fname = fname + ".exe";
+        }
+        TOOL_JAVA = Path.of(System.getProperty("java.home"), "bin", fname).toString();
+    }
+}