--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/jpackager/JPackagerCreateImageInputFilesTest.java	Thu Nov 08 19:07:57 2018 -0500
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2018, 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.
+ *
+ * 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.
+ */
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+
+ /*
+ * @test
+ * @summary jpackager create image input/files test
+ * @build JPackagerHelper
+ * @modules jdk.jpackager
+ * @run main/othervm -Xmx512m JPackagerCreateImageInputFilesTest
+ */
+public class JPackagerCreateImageInputFilesTest {
+    private static final String inputFile =
+            "input" + File.separator + "input.txt";
+    private static final String jarFile =
+            "input" + File.separator + "input.txt";
+    private static final String appOutputPath;
+    private static final String appInputFilePath;
+    private static final String appJarFilePath;
+
+    static {
+        if (JPackagerHelper.isOSX()) {
+            appOutputPath = "output" + File.separator + "test.app"
+                    + File.separator + "Contents" + File.separator + "Java";
+            appInputFilePath = "output" + File.separator + "test.app"
+                    + File.separator + "Contents" + File.separator + "Java"
+                    + File.separator + "input.txt";
+            appJarFilePath = "output" + File.separator + "test.app"
+                    + File.separator + "Contents" + File.separator + "Java"
+                    + File.separator + "hello.jar";
+        } else {
+            appOutputPath = "output" + File.separator + "test"
+                    + File.separator + "app";
+            appInputFilePath = "output" + File.separator + "test"
+                    + File.separator + "app" + File.separator + "input.txt";
+            appJarFilePath = "output" + File.separator + "test"
+                    + File.separator + "app" + File.separator + "hello.jar";
+        }
+    }
+
+    private static final String [] CMD_1 = {
+        "create-image",
+        "--input", "input",
+        "--output", "output",
+        "--name", "test",
+        "--main-jar", "hello.jar",
+        "--force",
+        "--class", "Hello"};
+
+    private static final String [] CMD_2 = {
+        "create-image",
+        "--input", "input",
+        "--output", "output",
+        "--name", "test",
+        "--main-jar", "hello.jar",
+        "--class", "Hello",
+        "--force",
+        "--files", "hello.jar"};
+
+    private static void validate1() throws Exception {
+        File input = new File(appInputFilePath);
+        if (!input.exists()) {
+            throw new AssertionError("Unexpected file does not exist: "
+                    + input.getAbsolutePath());
+        }
+
+        File jar = new File(appJarFilePath);
+        if (!jar.exists()) {
+            throw new AssertionError("Unexpected file does not exist: "
+                    + jar.getAbsolutePath());
+        }
+    }
+
+    private static void validate2() throws Exception {
+        File input = new File(appInputFilePath);
+        if (input.exists()) {
+            throw new AssertionError("Unexpected file exist: "
+                    + input.getAbsolutePath());
+        }
+
+        File jar = new File(appJarFilePath);
+        if (!jar.exists()) {
+            throw new AssertionError("Unexpected file does not exist: "
+                    + jar.getAbsolutePath());
+        }
+    }
+
+    private static void testCreateImage() throws Exception {
+        JPackagerHelper.executeCLI(true, CMD_1);
+        validate1();
+
+        JPackagerHelper.executeCLI(true, CMD_2);
+        validate2();
+    }
+
+    private static void testCreateImageToolProvider() throws Exception {
+        JPackagerHelper.executeToolProvider(true, CMD_1);
+        validate1();
+
+        JPackagerHelper.executeToolProvider(true, CMD_2);
+        validate2();
+    }
+
+    private static void createInputFile() throws Exception {
+        try (PrintWriter out = new PrintWriter(
+                new BufferedWriter(new FileWriter(inputFile)))) {
+            out.println("jpackgaer resource file");
+        }
+    }
+
+    private static void initCMD() {
+        File input = new File(inputFile);
+        File jar = new File(jarFile);
+
+        String inputPath = input.getAbsolutePath();
+        String jarPath = jar.getAbsolutePath();
+    }
+
+    public static void main(String[] args) throws Exception {
+        JPackagerHelper.createHelloJar();
+
+        createInputFile();
+        initCMD();
+
+        testCreateImage();
+        testCreateImageToolProvider();
+    }
+
+}