/hg/icedtea6: Testcase correction - the test should also work on...

[ptisnovs at icedtea.classpath.org]

changeset 2a1bf7104cc8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2a1bf7104cc8
author: ptisnovs
date: Thu Dec 16 18:34:51 2010 +0100

	Testcase correction - the test should also work on Gnome with upper
	panel displayed.


diffstat:

3 files changed, 34 insertions(+), 1 deletion(-)
ChangeLog                                |    7 +++++++
Makefile.am                              |    3 ++-
patches/jtreg-TestXEmbedServer-fix.patch |   25 +++++++++++++++++++++++++

diffs (56 lines):

diff -r b27bf2cfbdd7 -r 2a1bf7104cc8 ChangeLog
--- a/ChangeLog	Tue Dec 14 12:52:52 2010 +0100
+++ b/ChangeLog	Thu Dec 16 18:34:51 2010 +0100
@@ -1,3 +1,10 @@ 2010-12-14  Denis Lila  <dlila at redhar.co
+2010-12-16  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/jtreg-TestXEmbedServer-fix.patch:
+	Testcase correction - the test should also work on Gnome with upper
+	panel displayed.
+
 2010-12-14  Denis Lila  <dlila at redhar.com>, Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r b27bf2cfbdd7 -r 2a1bf7104cc8 Makefile.am
--- a/Makefile.am	Tue Dec 14 12:52:52 2010 +0100
+++ b/Makefile.am	Thu Dec 16 18:34:51 2010 +0100
@@ -311,7 +311,8 @@ ICEDTEA_PATCHES = \
 	patches/jtreg-6929067-fix.patch \
 	patches/openjdk/6979979-gtk_font_size_rounding.patch \
 	patches/openjdk/6795356-proxylazyvalue-leak.patch \
-	patches/rendering-engine-tests.patch
+	patches/rendering-engine-tests.patch \
+	patches/jtreg-TestXEmbedServer-fix.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r b27bf2cfbdd7 -r 2a1bf7104cc8 patches/jtreg-TestXEmbedServer-fix.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-TestXEmbedServer-fix.patch	Thu Dec 16 18:34:51 2010 +0100
@@ -0,0 +1,25 @@
+--- openjdk-old/jdk/test/java/awt/xembed/server/TestXEmbedServer.java	2010-06-21 23:15:49.000000000 +0200
++++ openjdk/jdk/test/java/awt/xembed/server/TestXEmbedServer.java	2010-06-21 23:15:49.000000000 +0200
+@@ -31,6 +31,9 @@
+ import java.awt.datatransfer.*;
+ 
+ public abstract class TestXEmbedServer {
++    // vertical position of server AND client windows
++    private static final int VERTICAL_POSITION = 200;
++
+     private static final Logger log = Logger.getLogger("test.xembed");
+     Frame f;
+     Canvas client;
+@@ -161,10 +164,10 @@
+         dummy = new JFrame("Dummy");
+         dummy.getContentPane().add(new JButton("Button"));
+         dummy.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+-        dummy.setBounds(0, 0, 100, 100);
++        dummy.setBounds(0, VERTICAL_POSITION, 100, 100);
+         dummy.setVisible(true);
+ 
+-        f.setBounds(300, 0, 800, 300);
++        f.setBounds(300, VERTICAL_POSITION, 800, 300);
+         f.setVisible(true);
+     }
+