/hg/icedtea6: Regression test fix - setup of SecurityManager to ...

Mon Nov 29 08:11:26 PST 2010

changeset d66a310d5c94 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d66a310d5c94
author: ptisnovs
date: Mon Nov 29 17:15:17 2010 +0100

	Regression test fix - setup of SecurityManager to run this test as
	regular applet but with AWT robot enabled.


diffstat:

3 files changed, 60 insertions(+), 1 deletion(-)
ChangeLog                                 |    8 ++++
Makefile.am                               |    3 +
patches/jtreg-WindowWithWarningTest.patch |   50 +++++++++++++++++++++++++++++

diffs (82 lines):

diff -r 7940436316db -r d66a310d5c94 ChangeLog

--- a/ChangeLog	Mon Nov 29 15:54:26 2010 +0100
+++ b/ChangeLog	Mon Nov 29 17:15:17 2010 +0100
@@ -1,3 +1,11 @@ 2010-11-29  Matthias Klose  <doko at ubuntu
+2010-11-29  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Updated.
+	* patches/jtreg-WindowWithWarningTest.patch:
+	Regression test fix - setup of SecurityManager to
+	run this test as regular applet but with AWT robot enabled.
+
 2010-11-29  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/hotspot/hs19/ia64-fix.patch: Reapply chunk from
diff -r 7940436316db -r d66a310d5c94 Makefile.am
--- a/Makefile.am	Mon Nov 29 15:54:26 2010 +0100
+++ b/Makefile.am	Mon Nov 29 17:15:17 2010 +0100
@@ -300,7 +300,8 @@ ICEDTEA_PATCHES = \
 	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 7940436316db -r d66a310d5c94 patches/jtreg-WindowWithWarningTest.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-WindowWithWarningTest.patch	Mon Nov 29 17:15:17 2010 +0100
@@ -0,0 +1,50 @@
+--- /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,13 @@
++
++// Standard extensions get all permissions by default
++
++grant codeBase "file:${{java.ext.dirs}}/*" {
++	permission java.security.AllPermission;
++};
++
++// default permissions granted to all domains
++
++grant { 
++	permission java.awt.AWTPermission "createRobot", "enabled";
++};
++
+--- 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>
+--- 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();

