stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8259268: Refactor InheritIO shell test as java test

Browse Source 
Reviewed-by: iignatyev, rriggs
This commit is contained in:
Ivan Šipka 2021-02-06 00:05:42 +00:00 committed by Igor Ignatyev
parent 440db35e8f
commit fb46d4e578
3 changed files with 84 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
test/jdk/java/lang/ProcessBuilder/InheritIO/InheritIO.java
View File

@ -1,47 +0,0 @@
/*
* Copyright (c) 2013, 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 static java.lang.ProcessBuilder.Redirect.*;
class InheritIO {
public static class TestInheritIO {
public static void main(String args[]) throws Throwable {
int err = new ProcessBuilder(args).inheritIO().start().waitFor();
System.err.print("exit value: " + err);
System.exit(err);
}
}
public static class TestRedirectInherit {
public static void main(String args[]) throws Throwable {
int err = new ProcessBuilder(args)
.redirectInput(INHERIT)
.redirectOutput(INHERIT)
.redirectError(INHERIT)
.start().waitFor();
System.err.print("exit value: " + err);
System.exit(err);
}
}
}

84
test/jdk/java/lang/ProcessBuilder/InheritIO/InheritIO.sh
View File

@ -1,84 +0,0 @@
#
# Copyright (c) 2013, 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
# @bug 8023130
# @summary (process) ProcessBuilder#inheritIO does not work on Windows
# @run shell InheritIO.sh
if [ "x${TESTSRC}" = "x" ]; then
echo "TESTSRC not set. Test cannot execute. Failed."
exit 1
fi
if [ "x${TESTJAVA}" = "x" ]; then
echo "TESTJAVA not set. Test cannot execute. Failed."
exit 1
fi
if [ "x${COMPILEJAVA}" = "x" ]; then
COMPILEJAVA="${TESTJAVA}"
fi
JAVA="${TESTJAVA}/bin/java"
JAVAC="${COMPILEJAVA}/bin/javac"
cp -f ${TESTSRC}/InheritIO.java .
# compile the class ourselves, so this can run as a standalone test
${JAVAC} InheritIO.java
RES="$?"
if [ ${RES} != 0 ]; then
echo 'FAIL: Cannot compile InheritIO.java'
exit ${RES}
fi
for TEST_NAME in TestInheritIO TestRedirectInherit
do
${JAVA} ${TESTVMOPTS} -classpath . \
'InheritIO$'${TEST_NAME} printf message > stdout.txt 2> stderr.txt
RES="$?"
if [ ${RES} != 0 ]; then
echo 'FAIL: InheritIO$'${TEST_NAME}' failed with '${RES}
exit ${RES}
fi
OUT_EXPECTED='message'
OUT_RECEIVED=`cat stdout.txt`
if [ "x${OUT_RECEIVED}" != "x${OUT_EXPECTED}" ]; then
echo "FAIL: unexpected '${OUT_RECEIVED}' in stdout"
exit 1
fi
ERR_EXPECTED='exit value: 0'
ERR_RECEIVED=`cat stderr.txt`
if [ "x${ERR_RECEIVED}" != "x${ERR_EXPECTED}" ]; then
echo "FAIL: unexpected '${ERR_RECEIVED}' in stderr"
exit 1
fi
done
echo 'PASS: InheritIO works as expected'

84
test/jdk/java/lang/ProcessBuilder/InheritIOTest.java Normal file
View File

@ -0,0 +1,84 @@
/*
* Copyright (c) 2020, 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
* @bug 8023130 8166026
* @summary Unit test for java.lang.ProcessBuilder inheritance of standard output and standard error streams
* @library /test/lib
* @build jdk.test.lib.process.*
* @run testng InheritIOTest
*/
import java.util.List;
import static java.lang.ProcessBuilder.Redirect.INHERIT;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
public class InheritIOTest {
private static final String EXIT_VALUE_TEMPLATE = "exit value: %d";
private static final String EXPECTED_RESULT_STDOUT = "message";
private static final String EXPECTED_RESULT_STDERR = EXIT_VALUE_TEMPLATE.formatted(0);
@DataProvider
public Object[][] testCases() {
return new Object[][]{
new Object[] { List.of("InheritIOTest$TestInheritIO", "printf", EXPECTED_RESULT_STDOUT) },
new Object[] { List.of("InheritIOTest$TestRedirectInherit", "printf", EXPECTED_RESULT_STDOUT) }
};
}
@Test(dataProvider = "testCases")
public void testInheritWithoutRedirect(List<String> arguments) throws Throwable {
ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(arguments);
OutputAnalyzer outputAnalyzer = ProcessTools.executeCommand(processBuilder);
outputAnalyzer.shouldHaveExitValue(0);
assertEquals(outputAnalyzer.getStdout(), EXPECTED_RESULT_STDOUT);
assertEquals(outputAnalyzer.getStderr(), EXPECTED_RESULT_STDERR);
}
public static class TestInheritIO {
public static void main(String args[]) throws Throwable {
int err = new ProcessBuilder(args).inheritIO().start().waitFor();
System.err.printf(EXIT_VALUE_TEMPLATE, err);
System.exit(err);
}
}
public static class TestRedirectInherit {
public static void main(String args[]) throws Throwable {
int err = new ProcessBuilder(args)
.redirectInput(INHERIT)
.redirectOutput(INHERIT)
.redirectError(INHERIT)
.start().waitFor();
System.err.printf(EXIT_VALUE_TEMPLATE, err);
System.exit(err);
}
}
}