Reviewer needed - fix for regression test java/awt/xembed/server/RunTestXEmbed.java

[Dr Andrew John Hughes]

On 17:48 Thu 16 Dec     , Pavel Tisnovsky wrote:
> Hi all,
> 
> I've created patch for regression test
> java/awt/xembed/server/RunTestXEmbed.java.
> 
> This test fails when it's started on default desktop in Fedora 1x and
> RHEL 5/6.
> 
> Original version of this test works correctly only in cases where the
> top of the screen is "free" (it can contains common windows, icons etc.
> of course). But in default Gnome configuration on Fedoras and RHELs top
> of the screen is occupied by panel containing Gnome menu and several
> widgets (NetworkManager, clocks, sound volume...).
> 
> It means that common window (frame) cannot be created with y-coordinate
> set to zero, because such window is automatically moved down by circa 25
> pixels (depending on theme used, of course). And this test does not
> correctly compute y-coordinates of both its windows (client and server).
> 
> There are several ways to fix this issue but the simplest one is to
> create client and server window using non-zero y-coordinates.
> 
> Can anyone review patch for this test (it's included in attachment as hg
> diff - as usual).
> 
> (I'd like to send this fix to awt-dev mail list to, as it should be
> included in OpenJDK7)
> 

Looks ok (assuming this makes the test pass).

> Cheers
> Pavel

> diff -r b27bf2cfbdd7 ChangeLog
> --- a/ChangeLog	Tue Dec 14 12:52:52 2010 +0100
> +++ b/ChangeLog	Thu Dec 16 17:39:39 2010 +0100
> @@ -1,3 +1,10 @@
> +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 Makefile.am
> --- a/Makefile.am	Tue Dec 14 12:52:52 2010 +0100
> +++ b/Makefile.am	Thu Dec 16 17:39:39 2010 +0100
> @@ -311,7 +311,8 @@
>  	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 patches/jtreg-TestXEmbedServer-fix.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/jtreg-TestXEmbedServer-fix.patch	Thu Dec 16 17:39:39 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);
> +     }
> + 


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8