--- old/test/jdk/tools/jpackage/JPackageVersionTest.java 2019-11-18 21:50:07.785057100 -0500 +++ /dev/null 2019-11-18 21:50:09.000000000 -0500 @@ -1,68 +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. - */ - - /* - * @test - * @summary jpackage version test - * @library helpers - * @build JPackageHelper - * @build JPackagePath - * @modules jdk.jpackage - * @run main/othervm -Xmx512m JPackageVersionTest - */ -public class JPackageVersionTest { - - private static final String ARG = "--version"; - private static final String RESULT = "jpackage version" - + " " + System.getProperty("java.version"); - - private static void validate(String output) throws Exception { - String[] result = output.split("\n"); - if (result.length != 1) { - System.err.println(output); - throw new AssertionError("Invalid number of lines in output: " + result.length); - } - - if (!result[0].trim().equals(RESULT)) { - System.err.println("Expected: " + RESULT); - System.err.println("Actual: " + result[0]); - throw new AssertionError("Unexpected line 1"); - } - } - - private static void testVersion() throws Exception { - String output = JPackageHelper.executeCLI(true, ARG); - validate(output); - } - - private static void testVersionToolProvider() throws Exception { - String output = JPackageHelper.executeToolProvider(true, ARG); - validate(output); - } - - public static void main(String[] args) throws Exception { - testVersion(); - testVersionToolProvider(); - } - -}