--- old/test/jdk/tools/jpackage/createimage/JPackageCreateImageStripNativeCommandsTest.java 2019-02-28 20:51:03.676430800 -0800 +++ /dev/null 2019-02-28 20:51:04.000000000 -0800 @@ -1,90 +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; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.stream.Collectors; - - /* - * @test - * @summary jpackage create image with --strip-native-commands test - * @library ../helpers - * @build JPackageHelper - * @build JPackagePath - * @modules jdk.jpackage - * @run main/othervm -Xmx512m JPackageCreateImageStripNativeCommandsTest - */ -public class JPackageCreateImageStripNativeCommandsTest { - private static final String runtimeBinPath = JPackagePath.getRuntimeBin(); - - private static final String [] CMD = { - "create-image", - "--input", "input", - "--output", "output", - "--name", "test", - "--main-jar", "hello.jar", - "--main-class", "Hello", - "--files", "hello.jar", - "--overwrite", - "--strip-native-commands"}; - - private static void validate() throws Exception { - if (JPackageHelper.isWindows()) { - Path binPath = Paths.get(runtimeBinPath).toAbsolutePath(); - List files = Files.walk(binPath).collect(Collectors.toList()); - files.forEach((f) -> { - if (f.toString().endsWith(".exe")) { - throw new AssertionError( - "Found executable file in runtime bin folder: " - + f.toString()); - } - }); - } else { - File binFolder = new File(runtimeBinPath); - if (binFolder.exists()) { - throw new AssertionError("Found bin folder in runtime: " - + binFolder.toString()); - } - } - } - - private static void testCreateImage() throws Exception { - JPackageHelper.executeCLI(true, CMD); - validate(); - } - - private static void testCreateImageToolProvider() throws Exception { - JPackageHelper.executeToolProvider(true, CMD); - validate(); - } - - public static void main(String[] args) throws Exception { - JPackageHelper.createHelloImageJar(); - testCreateImage(); - testCreateImageToolProvider(); - } - -}