--- a/test/jdk/tools/jpackage/createimage/JPackageCreateImageForceTest.java	Wed Feb 06 09:14:09 2019 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2018, 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.
- *
- * 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.File;
-import java.nio.file.Files;
-
-/*
- * @test
- * @summary jpackage create image to verify --overwrite
- * @library ../helpers
- * @build JPackageHelper
- * @build JPackagePath
- * @modules jdk.jpackage
- * @run main/othervm -Xmx512m JPackageCreateImageForceTest
- */
-public class JPackageCreateImageForceTest {
-    private static final String app = JPackagePath.getApp();
-    private static final String appOutput = JPackagePath.getAppOutputFile();
-    private static final String appWorkingDir = JPackagePath.getAppWorkingDir();
-
-    private static final String[] CMD = {
-        "create-image",
-        "--input", "input",
-        "--name", "test",
-        "--main-jar", "hello.jar",
-        "--main-class", "Hello",
-        "--files", "hello.jar",
-        "--output", "TBD"};
-
-    private static final String[] CMD_FORCE = {
-        "create-image",
-        "--input", "input",
-        "--name", "test",
-        "--main-jar", "hello.jar",
-        "--main-class", "Hello",
-        "--overwrite",
-        "--files", "hello.jar",
-        "--output", "TBD"};
-
-    private static void validateResult(String[] result) throws Exception {
-        if (result.length != 2) {
-            throw new AssertionError(
-                   "Unexpected number of lines: " + result.length);
-        }
-
-        if (!result[0].trim().equals("jpackage test application")) {
-            throw new AssertionError("Unexpected result[0]: " + result[0]);
-        }
-
-        if (!result[1].trim().equals("args.length: 0")) {
-            throw new AssertionError("Unexpected result[1]: " + result[1]);
-        }
-    }
-
-    private static void validate(String result) throws Exception {
-        if (!result.contains("java.io.IOException") &&
-                !result.contains("already exists") &&
-                !result.contains("--overwrite is not specified")) {
-            System.err.println(result);
-            throw new AssertionError("Unexpected error message");
-        }
-    }
-
-    private static void validateForce() throws Exception {
-        int retVal = JPackageHelper.execute(null, app);
-        if (retVal != 0) {
-            throw new AssertionError(
-                   "Test application exited with error: " + retVal);
-        }
-
-        File outfile = new File(appWorkingDir + File.separator + appOutput);
-        if (!outfile.exists()) {
-            throw new AssertionError(appOutput + " was not created");
-        }
-
-        String output = Files.readString(outfile.toPath());
-        String[] result = output.split("\n");
-        validateResult(result);
-    }
-
-    private static void testForce() throws Exception {
-        CMD[CMD.length - 1] = "output";
-        CMD_FORCE[CMD_FORCE.length - 1] = "output";
-
-        String appFolder = "test";
-        if (JPackageHelper.isOSX()) {
-            appFolder = "test.app";
-        }
-
-        File output = new File("output" + File.separator + appFolder);
-        if (output.exists()) {
-            throw new AssertionError(
-                   "Output folder already exist");
-        }
-        output.mkdirs();
-
-        String result = JPackageHelper.executeCLI(false, CMD);
-        validate(result);
-
-        JPackageHelper.executeCLI(true, CMD_FORCE);
-        validateForce();
-    }
-
-    private static void testForceToolProvider() throws Exception {
-        CMD[CMD.length - 1] = "outputToolProvider";
-        CMD_FORCE[CMD_FORCE.length - 1] = "outputToolProvider";
-
-        String appFolder = "test";
-        if (JPackageHelper.isOSX()) {
-            appFolder = "test.app";
-        }
-
-        File output = new File("outputToolProvider" + File.separator + appFolder);
-        if (output.exists()) {
-            throw new AssertionError(
-                   "Output folder already exist");
-        }
-        output.mkdirs();
-
-        String result = JPackageHelper.executeToolProvider(false, CMD);
-        validate(result);
-
-        JPackageHelper.executeToolProvider(true, CMD_FORCE);
-        validateForce();
-    }
-
-    public static void main(String[] args) throws Exception {
-        JPackageHelper.createHelloImageJar();
-        testForce();
-        testForceToolProvider();
-    }
-
-}