8184329: Refactor java/lang/ClassLoader shell tests to java
Reviewed-by: mchung
This commit is contained in:
parent
300988fb02
commit
f22dd8323b
test/jdk/java/lang/ClassLoader
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 1999, 2017, 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
|
||||
@ -26,19 +26,56 @@
|
||||
* @bug 4273031
|
||||
* @summary ClassLoader.getResouce() should be able to
|
||||
* find resources with leading "." in their names
|
||||
* @build GetDotResource
|
||||
* @run shell getdotresource.sh
|
||||
* @library /lib/testlibrary
|
||||
* @build jdk.testlibrary.*
|
||||
* @run main GetDotResource
|
||||
*/
|
||||
|
||||
import java.net.URL;
|
||||
import java.net.URLClassLoader;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.util.jar.JarEntry;
|
||||
import java.util.jar.JarOutputStream;
|
||||
|
||||
import jdk.testlibrary.ProcessTools;
|
||||
|
||||
public class GetDotResource {
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
private static final String JAR_FILENAME = "resource.jar";
|
||||
private static final String DOT_FILENAME = ".resource";
|
||||
private static final String CP = JAR_FILENAME + File.pathSeparator
|
||||
+ System.getProperty("test.class.path");
|
||||
|
||||
public static void main(String[] args) throws Throwable {
|
||||
if (args.length == 0) {
|
||||
createJar(JAR_FILENAME, DOT_FILENAME);
|
||||
|
||||
ProcessTools.executeTestJava("-cp", CP,
|
||||
GetDotResource.class.getName(),
|
||||
DOT_FILENAME)
|
||||
.outputTo(System.out)
|
||||
.errorTo(System.out)
|
||||
.shouldHaveExitValue(0);
|
||||
} else {
|
||||
runTest(args[0]);
|
||||
}
|
||||
}
|
||||
|
||||
public static void runTest(String dotFileName) throws Exception {
|
||||
if (GetDotResource.class.getClassLoader().
|
||||
getResourceAsStream(".resource") == null)
|
||||
throw new Exception("Could not find resource with " +
|
||||
"leading . in their names");
|
||||
getResourceAsStream(dotFileName) == null) {
|
||||
throw new Exception("Could not find resource with "
|
||||
+ "leading . in their names");
|
||||
}
|
||||
}
|
||||
|
||||
public static void createJar(String jarFileName, String dotFileName)
|
||||
throws IOException {
|
||||
try (FileOutputStream fos = new FileOutputStream(jarFileName);
|
||||
JarOutputStream out = new JarOutputStream(fos))
|
||||
{
|
||||
out.putNextEntry(new JarEntry(dotFileName));
|
||||
out.closeEntry();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,46 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
#
|
||||
# Copyright (c) 1999, 2012, 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.
|
||||
#
|
||||
|
||||
if [ x"$TESTJAVA" = x ]; then
|
||||
TESTJAVA=$1
|
||||
shift
|
||||
fi
|
||||
if [ x"$TESTCLASSES" = x ]; then TESTCLASSES=.; fi
|
||||
if [ x"$TESTSRC" = x ]; then TESTSRC=.; fi
|
||||
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
Windows* | CYGWIN* )
|
||||
PS=";"
|
||||
FS="\\"
|
||||
;;
|
||||
* )
|
||||
PS=":"
|
||||
FS="/"
|
||||
;;
|
||||
esac
|
||||
|
||||
# now start the test
|
||||
${TESTJAVA}/bin/java ${TESTVMOPTS} -cp ${TESTSRC}${FS}resource.jar${PS}${TESTCLASSES} GetDotResource
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user