mirror of
https://github.com/openjdk/jdk.git
synced 2026-01-28 03:58:21 +00:00
8367017: Remove legacy checks from WrappedToolkitTest and convert from bash
Reviewed-by: prr
This commit is contained in:
Sergey Bylokhov
parent
b75e35cb94
commit
e1071797a4
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2012, 2025, 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
|
||||
@ -22,55 +22,52 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* test
|
||||
* @test
|
||||
* @bug 6282388
|
||||
* @summary Tests that AWT use correct toolkit to be wrapped into HeadlessToolkit
|
||||
* @author artem.ananiev@sun.com: area=awt.headless
|
||||
* @run shell WrappedToolkitTest.sh
|
||||
* @summary Tests that AWT uses correct toolkit wrapped into HeadlessToolkit
|
||||
* @modules java.desktop/sun.awt:open
|
||||
* @library /test/lib
|
||||
* @run main/othervm -Djava.awt.headless=true TestWrapped
|
||||
*/
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.Toolkit;
|
||||
import java.lang.Class;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import java.lang.reflect.*;
|
||||
import jdk.test.lib.Platform;
|
||||
|
||||
import sun.awt.*;
|
||||
public final class TestWrapped {
|
||||
|
||||
public class TestWrapped
|
||||
{
|
||||
public static void main(String[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (args.length != 1) {
|
||||
System.err.println("No correct toolkit class name is specified, test is not run");
|
||||
System.exit(0);
|
||||
private static final String HEADLESS_TOOLKIT = "sun.awt.HeadlessToolkit";
|
||||
private static final String MACOSX_TOOLKIT = "sun.lwawt.macosx.LWCToolkit";
|
||||
private static final String UNIX_TOOLKIT = "sun.awt.X11.XToolkit";
|
||||
private static final String WINDOWS_TOOLKIT = "sun.awt.windows.WToolkit";
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
String expectedToolkitClassName;
|
||||
if (Platform.isWindows()) {
|
||||
expectedToolkitClassName = WINDOWS_TOOLKIT;
|
||||
} else if (Platform.isOSX()) {
|
||||
expectedToolkitClassName = MACOSX_TOOLKIT;
|
||||
} else {
|
||||
expectedToolkitClassName = UNIX_TOOLKIT;
|
||||
}
|
||||
|
||||
String correctToolkitClassName = args[0];
|
||||
Toolkit tk = Toolkit.getDefaultToolkit();
|
||||
Class tkClass = tk.getClass();
|
||||
if (!tkClass.getName().equals("sun.awt.HeadlessToolkit"))
|
||||
{
|
||||
System.err.println(tkClass.getName());
|
||||
System.err.println("Error: default toolkit is not an instance of HeadlessToolkit");
|
||||
System.exit(-1);
|
||||
Class<?> tkClass = tk.getClass();
|
||||
if (!tkClass.getName().equals(HEADLESS_TOOLKIT)) {
|
||||
System.err.println("Expected: " + HEADLESS_TOOLKIT);
|
||||
System.err.println("Actual: " + tkClass.getName());
|
||||
throw new RuntimeException("Wrong default toolkit");
|
||||
}
|
||||
|
||||
Field f = tkClass.getDeclaredField("tk");
|
||||
f.setAccessible(true);
|
||||
Class wrappedClass = f.get(tk).getClass();
|
||||
if (!wrappedClass.getName().equals(correctToolkitClassName)) {
|
||||
System.err.println(wrappedClass.getName());
|
||||
System.err.println("Error: wrapped toolkit is not an instance of " + correctToolkitClassName);
|
||||
System.exit(-1);
|
||||
Class<?> wrappedClass = f.get(tk).getClass();
|
||||
if (!wrappedClass.getName().equals(expectedToolkitClassName)) {
|
||||
System.err.println("Expected: " + expectedToolkitClassName);
|
||||
System.err.println("Actual: " + wrappedClass.getName());
|
||||
throw new RuntimeException("Wrong wrapped toolkit");
|
||||
}
|
||||
}
|
||||
catch (Exception z)
|
||||
{
|
||||
z.printStackTrace(System.err);
|
||||
System.exit(-1);
|
||||
}
|
||||
|
||||
System.exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,221 +0,0 @@
|
||||
#!/bin/ksh -p
|
||||
|
||||
#
|
||||
# Copyright (c) 2012, 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 6282388 8030640
|
||||
# @summary Tests that AWT use correct toolkit to be wrapped into HeadlessToolkit
|
||||
# @author artem.ananiev@sun.com: area=awt.headless
|
||||
# compile TestWrapped.java
|
||||
# @run shell WrappedToolkitTest.sh
|
||||
|
||||
# Beginning of subroutines:
|
||||
status=1
|
||||
|
||||
#Call this from anywhere to fail the test with an error message
|
||||
# usage: fail "reason why the test failed"
|
||||
fail()
|
||||
{ echo "The test failed :-("
|
||||
echo "$*" 1>&2
|
||||
echo "exit status was $status"
|
||||
exit $status
|
||||
} #end of fail()
|
||||
|
||||
#Call this from anywhere to pass the test with a message
|
||||
# usage: pass "reason why the test passed if applicable"
|
||||
pass()
|
||||
{ echo "The test passed!!!"
|
||||
echo "$*" 1>&2
|
||||
exit 0
|
||||
} #end of pass()
|
||||
|
||||
# end of subroutines
|
||||
|
||||
|
||||
# The beginning of the script proper
|
||||
|
||||
# Checking for proper OS
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
AIX | CYGWIN* | Darwin | Linux )
|
||||
FILESEP="/"
|
||||
;;
|
||||
|
||||
Windows* )
|
||||
FILESEP="\\"
|
||||
;;
|
||||
|
||||
# catch all other OSs
|
||||
* )
|
||||
echo "Unrecognized system! $OS"
|
||||
fail "Unrecognized system! $OS"
|
||||
;;
|
||||
esac
|
||||
|
||||
# check that some executable or other file you need is available, abort if not
|
||||
# note that the name of the executable is in the fail string as well.
|
||||
# this is how to check for presence of the compiler, etc.
|
||||
#RESOURCE=`whence SomeProgramOrFileNeeded`
|
||||
#if [ "${RESOURCE}" = "" ] ;
|
||||
# then fail "Need SomeProgramOrFileNeeded to perform the test" ;
|
||||
#fi
|
||||
|
||||
# Want this test to run standalone as well as in the harness, so do the
|
||||
# following to copy the test's directory into the harness's scratch directory
|
||||
# and set all appropriate variables:
|
||||
|
||||
if [ -z "${TESTJAVA}" ] ; then
|
||||
# TESTJAVA is not set, so the test is running stand-alone.
|
||||
# TESTJAVA holds the path to the root directory of the build of the JDK
|
||||
# to be tested. That is, any java files run explicitly in this shell
|
||||
# should use TESTJAVA in the path to the java interpreter.
|
||||
# So, we'll set this to the JDK spec'd on the command line. If none
|
||||
# is given on the command line, tell the user that and use a cheesy
|
||||
# default.
|
||||
# THIS IS THE JDK BEING TESTED.
|
||||
if [ -n "$1" ] ;
|
||||
then TESTJAVA=$1
|
||||
else fail "no JDK specified on command line!"
|
||||
fi
|
||||
TESTSRC=.
|
||||
TESTCLASSES=.
|
||||
STANDALONE=1;
|
||||
fi
|
||||
echo "JDK under test is: $TESTJAVA"
|
||||
|
||||
#if in test harness, then copy the entire directory that the test is in over
|
||||
# to the scratch directory. This catches any support files needed by the test.
|
||||
if [ -z "${STANDALONE}" ] ;
|
||||
then cp ${TESTSRC}/* .
|
||||
fi
|
||||
case "$OS" in
|
||||
Windows* | CYGWIN* )
|
||||
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} \
|
||||
--add-exports java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-exports java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
|
||||
*.java
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Compilation failed";
|
||||
fi
|
||||
;;
|
||||
|
||||
AIX | Linux )
|
||||
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} \
|
||||
--add-exports java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-exports java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
|
||||
*.java
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Compilation failed";
|
||||
fi
|
||||
;;
|
||||
|
||||
Darwin)
|
||||
${COMPILEJAVA}/bin/javac ${TESTJAVACOPTS} \
|
||||
--add-exports java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-exports java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
|
||||
*.java
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Compilation failed";
|
||||
fi
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
#Just before executing anything, make sure it has executable permission!
|
||||
chmod 777 ./*
|
||||
|
||||
############### YOUR TEST CODE HERE!!!!!!! #############
|
||||
|
||||
case "$OS" in
|
||||
Windows* | CYGWIN* )
|
||||
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
|
||||
--add-opens java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-opens java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
|
||||
TestWrapped sun.awt.windows.WToolkit
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.windows.WToolkit";
|
||||
fi
|
||||
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
|
||||
--add-opens java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-opens java.desktop/sun.awt.windows=ALL-UNNAMED ${CP} \
|
||||
-Dawt.toolkit=sun.awt.windows.WToolkit \
|
||||
TestWrapped sun.awt.windows.WToolkit
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.windows.WToolkit";
|
||||
fi
|
||||
;;
|
||||
|
||||
AIX | Linux )
|
||||
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
|
||||
--add-opens java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-opens java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
|
||||
-Dawt.toolkit=sun.awt.X11.XToolkit \
|
||||
TestWrapped sun.awt.X11.XToolkit
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.xawt.XToolkit";
|
||||
fi
|
||||
AWT_TOOLKIT=XToolkit ${TESTJAVA}/bin/java ${TESTVMOPTS} \
|
||||
--add-opens java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-opens java.desktop/sun.awt.X11=ALL-UNNAMED ${CP} \
|
||||
-Djava.awt.headless=true \
|
||||
TestWrapped sun.awt.X11.XToolkit
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.awt.xawt.XToolkit";
|
||||
fi
|
||||
;;
|
||||
|
||||
Darwin)
|
||||
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
|
||||
--add-opens java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-opens java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
|
||||
TestWrapped sun.lwawt.macosx.LWCToolkit
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.lwawt.macosx.LWCToolkit";
|
||||
fi
|
||||
${TESTJAVA}/bin/java ${TESTVMOPTS} -Djava.awt.headless=true \
|
||||
--add-opens java.desktop/sun.awt=ALL-UNNAMED \
|
||||
--add-opens java.desktop/sun.lwawt.macosx=ALL-UNNAMED ${CP} \
|
||||
-Dawt.toolkit=sun.lwawt.macosx.LWCToolkit \
|
||||
TestWrapped sun.lwawt.macosx.LWCToolkit
|
||||
status=$?
|
||||
if [ ! $status -eq "0" ]; then
|
||||
fail "Test FAILED: toolkit wrapped into HeadlessToolkit is not an instance of sun.lwawt.macosx.LWCToolkit";
|
||||
fi
|
||||
;;
|
||||
|
||||
esac
|
||||
|
||||
pass "All the tests are PASSED";
|
||||
|
||||
#For additional examples of how to write platform independent KSH scripts,
|
||||
# see the jtreg file itself. It is a KSH script for both Solaris and Win32
|
||||
Loading…
x
Reference in New Issue
Block a user