Reviewer needed - new rendering regression tests
Dr Andrew John Hughes
ahughes at redhat.com
Tue Dec 14 03:19:13 PST 2010
On 12:06 Tue 14 Dec , Pavel Tisnovsky wrote:
> Hi all,
>
> I'd like to add new regression tests to IcedTea6 HEAD. These tests check
> correct functionality of 2D renderer, mainly rendering dashed and scaled
> shapes.
>
> These tests are heavily based on sources developed by Denis (thank you
> VM Denis!). I only isolated them, added proper licence text, remarks and
> all required JTreg tags.
>
Looks ok. Please commit.
> If these tests will be approved to IcedTea6 HEAD, I'm going to ask
> Oracle guys for review them for OpenJDK7 & 6 too.
>
If this is upstreamed, please move the file in IcedTea6 to
patches/openjdk/<bugid>-rendering_engine_tests.patch as usual
so we can track it.
> Mercurial export generated against recent IcedTea6 HEAD are attached to
> this mail. This patch was already tested, of course (and the new tests
> passes on recent IcedTea6).
>
> Cheers,
> Pavel
> # HG changeset patch
> # User ptisnovs
> # Date 1292271938 -3600
> # Node ID d358dee04e3d51acef6501066651992b92b530dc
> # Parent 8c26dcba8a275a056e549cf06bd62b96964e5d9e
> Added new regression test used to check rendering engine behaviour.
>
> diff -r 8c26dcba8a27 -r d358dee04e3d ChangeLog
> --- a/ChangeLog Fri Dec 10 17:30:05 2010 -0500
> +++ b/ChangeLog Mon Dec 13 21:25:38 2010 +0100
> @@ -1,3 +1,9 @@
> +2010-12-13 Denis Lila <dlila at redhar.com>, Pavel Tisnovsky <ptisnovs at redhat.com>
> +
> + * Makefile.am: Add new patch.
> + * patches/rendering-engine-tests.patch:
> + Added new regression test used to check rendering engine behaviour.
> +
> 2010-12-10 Omair Majid <omajid at redhat.com>
>
> Backport S6979979.
> diff -r 8c26dcba8a27 -r d358dee04e3d Makefile.am
> --- a/Makefile.am Fri Dec 10 17:30:05 2010 -0500
> +++ b/Makefile.am Mon Dec 13 21:25:38 2010 +0100
> @@ -309,7 +309,8 @@
> patches/openjdk/6941936-broken-pipe.patch \
> patches/openjdk/6943219-failure-in-linux.patch \
> patches/jtreg-6929067-fix.patch \
> - patches/openjdk/6979979-gtk_font_size_rounding.patch
> + patches/openjdk/6979979-gtk_font_size_rounding.patch \
> + patches/rendering-engine-tests.patch
>
> if WITH_ALT_HSBUILD
> ICEDTEA_PATCHES += \
> diff -r 8c26dcba8a27 -r d358dee04e3d patches/rendering-engine-tests.patch
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/rendering-engine-tests.patch Mon Dec 13 21:25:38 2010 +0100
> @@ -0,0 +1,367 @@
> +diff -Nu openjdk-old/jdk/test/java/awt/Graphics2D/RenderingEngineTests/RenderingEngineTest.java openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/RenderingEngineTest.java
> +--- /dev/null
> ++++ openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/RenderingEngineTest.java 2010-12-13 16:55:44.000000000 +0100
> +@@ -0,0 +1,39 @@
> ++/*
> ++ * Copyright 2010 Red Hat, Inc. 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.
> ++ */
> ++
> ++import java.awt.Color;
> ++import java.awt.Graphics;
> ++import java.awt.Graphics2D;
> ++import java.awt.image.BufferedImage;
> ++
> ++/*
> ++ * Helper class for rendering engine tests.
> ++ */
> ++public class RenderingEngineTest {
> ++
> ++ protected static Object[] getGraphics(int w, int h) {
> ++ BufferedImage bi = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
> ++ Graphics2D g2 = (Graphics2D) bi.getGraphics();
> ++ g2.setColor(Color.white);
> ++ g2.fillRect(0, 0, w, h);
> ++ g2.setColor(Color.black);
> ++ return new Object[] {bi, g2};
> ++ }
> ++}
> ++
> +diff -Nu openjdk-old/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test661554.java openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test661554.java
> +--- /dev/null
> ++++ openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test661554.java 2010-12-13 16:56:26.000000000 +0100
> +@@ -0,0 +1,55 @@
> ++/*
> ++ * Copyright 2010 Red Hat, Inc. 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.
> ++ */
> ++
> ++import java.awt.*;
> ++import static java.awt.RenderingHints.*;
> ++import java.awt.image.*;
> ++
> ++/*
> ++ * @test
> ++ * bug 661554 - note that this is a Red Hat bugzilla bug ID, so we cannot
> ++ * use real tag "bug" (starting with "at" character) here.
> ++ * @summary This test check rendering of dashed lines with applied scaling.
> ++ * @run main Test661554
> ++ * @author Denis Lila <dlila at redhat.com>, Pavel Tisnovsky <ptisnovs at redhat.com>
> ++ */
> ++public class Test661554 extends RenderingEngineTest {
> ++ public void run() {
> ++ Graphics2D g2 = (Graphics2D) getGraphics(400, 400)[1];
> ++
> ++ g2.setRenderingHint(KEY_ANTIALIASING, VALUE_ANTIALIAS_ON);
> ++ g2.setStroke(new BasicStroke(2f));
> ++ g2.scale(0.0000001, 0.0000001);
> ++
> ++ // draw line using minification and check if divide by zero is not thrown
> ++ try {
> ++ g2.drawLine(10, 10, 10, 100);
> ++ }
> ++ catch (ArithmeticException e) {
> ++ // this might be kinda stupid. Maybe we should just let the DVZ
> ++ // fall through.
> ++ throw new RuntimeException("Divide by zero occurred; test failed.");
> ++ }
> ++ }
> ++
> ++ public static void main(String[] argv) {
> ++ new Test661554().run();
> ++ }
> ++}
> ++
> +diff -Nu openjdk-old/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967433.java openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967433.java
> +--- /dev/null
> ++++ openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967433.java 2010-12-13 16:57:42.000000000 +0100
> +@@ -0,0 +1,59 @@
> ++/*
> ++ * Copyright 2010 Red Hat, Inc. 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.
> ++ */
> ++
> ++import java.awt.*;
> ++import java.awt.image.*;
> ++import static java.awt.RenderingHints.*;
> ++
> ++/*
> ++ * @test
> ++ * @bug 6967433
> ++ * @summary This test check rendering of dashed lines with applied scaling.
> ++ * @run main Test6967433
> ++ * @author Denis Lila <dlila at redhat.com>, Pavel Tisnovsky <ptisnovs at redhat.com>
> ++ */
> ++
> ++// TODO: this test uses lines. That's good for now, but it should really use
> ++// Path2Ds as Shapes. That's because lines could be treated as special cases,
> ++// and the code we want to test (in the rendering engine) might not even run.
> ++// So we must use shapes that are as general as possible.
> ++public class Test6967433 extends RenderingEngineTest {
> ++
> ++ public void run() {
> ++ Object[] tmp = getGraphics(400, 400);
> ++ BufferedImage bi = (BufferedImage) tmp[0];
> ++ Graphics2D g2 = (Graphics2D) tmp[1];
> ++
> ++ // draw dashed line using scaling (magnification)
> ++ final int scale = 32;
> ++ g2.setStroke(new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 1, new float[] {1,1}, 0));
> ++ g2.scale(scale, scale);
> ++ g2.drawLine(0, 0, 10, 0);
> ++
> ++ // test if dashed shape rendering is correct
> ++ if (new Color(bi.getRGB(scale + scale/2, 0)).equals(Color.black)) {
> ++ throw new RuntimeException("ScaledDashedLines test failed.");
> ++ }
> ++ }
> ++
> ++ public static void main(String[] args) {
> ++ new Test6967433().run();
> ++ }
> ++}
> ++
> +diff -Nu openjdk-old/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967434.java openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967434.java
> +--- /dev/null
> ++++ openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967434.java 2010-12-13 16:57:53.000000000 +0100
> +@@ -0,0 +1,64 @@
> ++/*
> ++ * Copyright 2010 Red Hat, Inc. 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.
> ++ */
> ++
> ++import java.awt.*;
> ++import java.awt.image.*;
> ++import static java.awt.RenderingHints.*;
> ++
> ++/*
> ++ * @test
> ++ * @bug 6967434
> ++ * @summary This test check rendering of scaled up lines.
> ++ * @run main Test6967434
> ++ * @author Denis Lila <dlila at redhat.com>, Pavel Tisnovsky <ptisnovs at redhat.com>
> ++ */
> ++
> ++// TODO: this test uses lines. That's good for now, but it should really use
> ++// Path2Ds as Shapes. That's because lines could be treated as special cases,
> ++// and the code we want to test (in the rendering engine) might not even run.
> ++// So we must use shapes that are as general as possible.
> ++public class Test6967434 extends RenderingEngineTest {
> ++
> ++ public void run() {
> ++ Object[] tmp = getGraphics(400, 400);
> ++ BufferedImage bi = (BufferedImage) tmp[0];
> ++ Graphics2D g2 = (Graphics2D) tmp[1];
> ++
> ++ // draw line using custom transformation
> ++ final float scale = 100;
> ++ final float width = 1;
> ++ g2.setStroke(new BasicStroke(width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL));
> ++ final int sw = (int)(scale*width/2);
> ++ g2.translate(sw, sw);
> ++ g2.scale(scale, scale);
> ++ g2.drawLine(0, 0, 1, 0);
> ++ final int middle = sw/2;
> ++
> ++ // test if shape rendering is correct
> ++ if (!(new Color(bi.getRGB(middle-2, middle - 2)).equals(Color.black) &&
> ++ new Color(bi.getRGB(middle-2, sw + middle + 2)).equals(Color.black))) {
> ++ throw new RuntimeException("ScaledRoundCapsTest test failed.");
> ++ }
> ++ }
> ++
> ++ public static void main(String[] argv) {
> ++ new Test6967434().run();
> ++ }
> ++}
> ++
> +diff -Nu openjdk-old/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967436.java openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967436.java
> +--- /dev/null
> ++++ openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6967436.java 2010-12-13 16:58:34.000000000 +0100
> +@@ -0,0 +1,69 @@
> ++/*
> ++ * Copyright 2010 Red Hat, Inc. 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.
> ++ */
> ++
> ++import java.awt.*;
> ++import java.awt.image.*;
> ++import static java.awt.RenderingHints.*;
> ++
> ++/*
> ++ * @test
> ++ * @bug 6967436
> ++ * @summary This test check proper rendering of diagonal line when line coordinates are bigger than 16bit integer.
> ++ * @run main Test6967436
> ++ * @author Denis Lila <dlila at redhat.com>, Pavel Tisnovsky <ptisnovs at redhat.com>
> ++ */
> ++
> ++// TODO: this test use lines. That's good for now, but it should really use
> ++// Path2Ds as Shapes. That's because lines could be treated as special cases,
> ++// and the code we want to test (in the rendering engine) might not even run.
> ++// So we must use shapes that are as general as possible.
> ++public class Test6967436 extends RenderingEngineTest {
> ++
> ++ public void run() {
> ++ // NOTE - the rendering area should be square, not generic rectangle
> ++ Object[] tmp = getGraphics(400, 400);
> ++ BufferedImage bi = (BufferedImage) tmp[0];
> ++ Graphics2D g2 = (Graphics2D) tmp[1];
> ++
> ++ g2.setStroke(new BasicStroke(5));
> ++ g2.setRenderingHint(KEY_ANTIALIASING, VALUE_ANTIALIAS_ON);
> ++
> ++ g2.drawLine(0, 0, 1<<15, 1<<15);
> ++
> ++ // test if two areas (above line and below line) contains only
> ++ // white pixels
> ++ int w = bi.getWidth(), h = bi.getHeight();
> ++ for (int i = 0; i < h; i++) {
> ++ for (int j = i + 10; j < w; j++) {
> ++ if (!(new Color(bi.getRGB(j, i)).equals(Color.white) &&
> ++ new Color(bi.getRGB(i, j)).equals(Color.white)))
> ++ {
> ++ throw new RuntimeException(
> ++ "A non white background pixel was found.\n" +
> ++ "OverflowTest failed");
> ++ }
> ++ }
> ++ }
> ++ }
> ++
> ++ public static void main(String[] argv) {
> ++ new Test6967436().run();
> ++ }
> ++}
> ++
> +diff -Nu openjdk-old/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6976265.java openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6976265.java
> +--- /dev/null
> ++++ openjdk/jdk/test/java/awt/Graphics2D/RenderingEngineTests/Test6976265.java 2010-12-13 16:32:29.000000000 +0100
> +@@ -0,0 +1,57 @@
> ++/*
> ++ * Copyright 2010 Red Hat, Inc. 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.
> ++ */
> ++
> ++import java.awt.*;
> ++import java.awt.image.*;
> ++import static java.awt.RenderingHints.*;
> ++
> ++/*
> ++ * @test
> ++ * @bug 6976265
> ++ * @summary This test check if STROKE_CONTROL is supported.
> ++ * @run main Test6976265
> ++ * @author Denis Lila <dlila at redhat.com>, Pavel Tisnovsky <ptisnovs at redhat.com>
> ++ */
> ++
> ++// TODO: this test uses lines. That's good for now, but it should really use
> ++// Path2Ds as Shapes. That's because lines could be treated as special cases,
> ++// and the code we want to test (in the rendering engine) might not even run.
> ++// So we must use shapes that are as general as possible.
> ++public class Test6976265 extends RenderingEngineTest {
> ++
> ++ public void run() {
> ++ Object[] tmp = getGraphics(400, 400);
> ++ BufferedImage bi = (BufferedImage) tmp[0];
> ++ Graphics2D g2 = (Graphics2D) tmp[1];
> ++
> ++ g2.setRenderingHint(KEY_STROKE_CONTROL, VALUE_STROKE_NORMALIZE);
> ++ g2.setRenderingHint(KEY_ANTIALIASING, VALUE_ANTIALIAS_ON);
> ++ g2.drawLine(10, 10, 10, 100);
> ++
> ++ // test if rendering is correct
> ++ if (! new Color(bi.getRGB(10, 10)).equals(Color.black)) {
> ++ throw new RuntimeException("StrokeControlTest test failed.");
> ++ }
> ++ }
> ++
> ++ public static void main(String[] args) {
> ++ new Test6976265().run();
> ++ }
> ++}
> ++
--
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
More information about the distro-pkg-dev
mailing list