Reviewer needed - fix for regression test java/awt/Insets/WindowWithWarningTest/WindowWithWarning
Dr Andrew John Hughes
ahughes at redhat.com
Fri Nov 26 20:13:03 PST 2010
On 19:41 Fri 26 Nov , Pavel Tisnovsky wrote:
> Hi all,
>
> can anyone please review fix for regression test
> java/awt/Insets/WindowWithWarningTest/WindowWithWarning? Mercurial
> export for IcedTea6 HEAD (1.10pre) is included in this mail as attachment.
>
> Description of the fix:
>
> This test must be run in an environment similar to sandbox used for
> running regular applets, which among other things means that each window
> created by the test itself has to be labelled by warning message "Java
> Applet Window".
>
> But for the test to (probably successfuly) proceed it is also required
> that AWT Robot is enabled (and it is disabled by default for applets,
> which reasonable, of course).
>
> To guarantee both conditions to run this test I copied system security
> policy file, added new line to enable AWT robot and then configured the
> test itself to use this policy file, because JTreg harness usually
> starts such tests (applets) without security manager installed.
>
> PS: I've made this fix with great help of Andrew, Deepak and Omair -
> thank you very much colleagues!
>
> Cheers
> Pavel
This looks pretty standard, compared with other JDK tests.
Could we not just allow the needed robot permission? Are all the ones
for the policy file really needed?
> # HG changeset patch
> # User ptisnovs
> # Date 1290793199 -3600
> # Node ID d3ed5f2fd6d8288cb693d66a29b6bb7b99c21149
> # Parent 0aab3837f513e527e79c2e8f779f0c93a4b47c7a
> Regression test fix.
>
> diff -r 0aab3837f513 -r d3ed5f2fd6d8 ChangeLog
> --- a/ChangeLog Wed Nov 24 22:44:32 2010 +0000
> +++ b/ChangeLog Fri Nov 26 18:39:59 2010 +0100
> @@ -1,3 +1,10 @@
> +2010-11-26 Pavel Tisnovsky <ptisnovs at redhat.com>
> +
> + * Makefile.am:
> + * patches/jtreg-WindowWithWarningTest.patch:
> + Regression test fix - setup of SecurityManager to
> + run this test as regular applet but with AWT robot enabled.
> +
> 2010-11-24 Andrew John Hughes <ahughes at redhat.com>
>
> Final plugin & NetX cleanup.
> diff -r 0aab3837f513 -r d3ed5f2fd6d8 Makefile.am
> --- a/Makefile.am Wed Nov 24 22:44:32 2010 +0000
> +++ b/Makefile.am Fri Nov 26 18:39:59 2010 +0100
> @@ -300,7 +300,8 @@
> patches/openjdk/6850606-bigdecimal_regression.patch \
> patches/openjdk/6876282-bigdecimal_divide.patch \
> patches/f14-fonts.patch \
> - patches/jtreg-DeleteFont.patch
> + patches/jtreg-DeleteFont.patch \
> + patches/jtreg-WindowWithWarningTest.patch
>
> if WITH_ALT_HSBUILD
> ICEDTEA_PATCHES += \
> diff -r 0aab3837f513 -r d3ed5f2fd6d8 patches/jtreg-WindowWithWarningTest.patch
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jtreg-WindowWithWarningTest.patch Fri Nov 26 18:39:59 2010 +0100
> @@ -0,0 +1,90 @@
> +diff -uN /jck/icedtea6/openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/applet.policy ./applet.policy
> +--- /dev/null 1970-01-01 01:00:00.000000000 +0100
> ++++ openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/applet.policy 2010-11-26 18:01:32.000000000 +0100
> +@@ -0,0 +1,50 @@
> ++
> ++// Standard extensions get all permissions by default
> ++
> ++grant codeBase "file:${{java.ext.dirs}}/*" {
> ++ permission java.security.AllPermission;
> ++};
> ++
> ++// default permissions granted to all domains
> ++
> ++grant {
> ++ // Allows any thread to stop itself using the java.lang.Thread.stop()
> ++ // method that takes no argument.
> ++ // Note that this permission is granted by default only to remain
> ++ // backwards compatible.
> ++ // It is strongly recommended that you either remove this permission
> ++ // from this policy file or further restrict it to code sources
> ++ // that you specify, because Thread.stop() is potentially unsafe.
> ++ // See "http://java.sun.com/notes" for more information.
> ++ permission java.lang.RuntimePermission "stopThread";
> ++
> ++ // allows anyone to listen on un-privileged ports
> ++ permission java.net.SocketPermission "localhost:1024-", "listen";
> ++
> ++ // "standard" properies that can be read by anyone
> ++
> ++ permission java.util.PropertyPermission "java.version", "read";
> ++ permission java.util.PropertyPermission "java.vendor", "read";
> ++ permission java.util.PropertyPermission "java.vendor.url", "read";
> ++ permission java.util.PropertyPermission "java.class.version", "read";
> ++ permission java.util.PropertyPermission "os.name", "read";
> ++ permission java.util.PropertyPermission "os.version", "read";
> ++ permission java.util.PropertyPermission "os.arch", "read";
> ++ permission java.util.PropertyPermission "file.separator", "read";
> ++ permission java.util.PropertyPermission "path.separator", "read";
> ++ permission java.util.PropertyPermission "line.separator", "read";
> ++
> ++ permission java.util.PropertyPermission "java.specification.version", "read";
> ++ permission java.util.PropertyPermission "java.specification.vendor", "read";
> ++ permission java.util.PropertyPermission "java.specification.name", "read";
> ++
> ++ permission java.util.PropertyPermission "java.vm.specification.version", "read";
> ++ permission java.util.PropertyPermission "java.vm.specification.vendor", "read";
> ++ permission java.util.PropertyPermission "java.vm.specification.name", "read";
> ++ permission java.util.PropertyPermission "java.vm.version", "read";
> ++ permission java.util.PropertyPermission "java.vm.vendor", "read";
> ++ permission java.util.PropertyPermission "java.vm.name", "read";
> ++
> ++ permission java.awt.AWTPermission "createRobot", "enabled";
> ++};
> ++
> +diff -uN /jck/icedtea6/openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html ./WindowWithWarningTest.html
> +--- openjdk-old/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html 2010-06-21 23:15:49.000000000 +0200
> ++++ openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html 2010-11-26 18:29:25.622555000 +0100
> +@@ -4,7 +4,7 @@
> + @bug 6391770
> + @summary Content of the Window should be laid out in the area left after WarningWindow was added.
> + @author Yuri Nesterenko
> +- @run applet WindowWithWarningTest.html
> ++ @run applet/othervm/policy=applet.policy WindowWithWarningTest.html
> + -->
> +
> + <head>
> +diff -uN /jck/icedtea6/openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java ./WindowWithWarningTest.java
> +--- openjdk-old/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java 2010-06-21 23:15:49.000000000 +0200
> ++++ openjdk/jdk/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java 2010-11-26 18:10:15.000000000 +0100
> +@@ -53,6 +53,7 @@
> + import java.awt.*;
> + import java.awt.event.*;
> + import javax.swing.*;
> ++import java.security.*;
> +
> + //Automated tests should run as applet tests if possible because they
> + // get their environments cleaned up, including AWT threads, any
> +@@ -91,12 +92,6 @@
> + public void start ()
> + {
> + //Get things going. Request focus, set size, et cetera
> +- System.setSecurityManager( new SecurityManager() {
> +- // deny AWTPermission("showWindowWithoutWarningBanner")
> +- public boolean checkTopLevelWindow(Object window) {
> +- return false;
> +- }
> +- });
> + JFrame frame = new JFrame("Window Test");
> + frame.setBounds(50, 50, 200, 200);
> + frame.show();
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
More information about the distro-pkg-dev
mailing list