/hg/gfx-test: Added new test cases: rendering of arcs, circles, ...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Tue Jul 20 04:09:58 PDT 2010
changeset a4d9db570b97 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=a4d9db570b97
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Jul 20 13:10:11 2010 +0200
Added new test cases: rendering of arcs, circles, polygons and
polylines.
diffstat:
8 files changed, 607 insertions(+), 3 deletions(-)
Makefile | 17 +
src/org/gfxtest/framework/annotations/GraphicsPrimitives.java | 1
src/org/gfxtest/testsuites/NormalArcs.java | 115 +++++++++
src/org/gfxtest/testsuites/NormalCircles.java | 114 +++++++++
src/org/gfxtest/testsuites/NormalLines.java | 120 +++++++++
src/org/gfxtest/testsuites/NormalPolygon.java | 115 +++++++++
src/org/gfxtest/testsuites/NormalPolylines.java | 125 ++++++++++
src/org/gfxtest/testsuites/ScaledLines.java | 3
diffs (truncated from 670 to 500 lines):
diff -r 43d70c352682 -r a4d9db570b97 Makefile
--- a/Makefile Fri Jul 16 17:44:09 2010 +0200
+++ b/Makefile Tue Jul 20 13:10:11 2010 +0200
@@ -49,6 +49,14 @@ JAVAC=javac
JAVAC=javac
FRAMEWORK_CLASSES = \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/GraphicsPrimitives.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/GraphicsPrimitive.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/RenderStyles.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/RenderStyle.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/TestTypes.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/TestType.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/Transformations.class \
+ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/Transformation.class \
$(CLASSES)/$(FRAMEWORK_DIR)/TestResult.class \
$(CLASSES)/$(FRAMEWORK_DIR)/ConfigurationException.class \
$(CLASSES)/$(FRAMEWORK_DIR)/InvalidParameterValueException.class \
@@ -60,11 +68,16 @@ FRAMEWORK_CLASSES = \
TESTSUITE_CLASSES = \
$(CLASSES)/$(TESTSUITE_DIR)/BlankImage.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/NormalArcs.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/NormalLines.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/NormalCircles.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/NormalPolygon.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/NormalPolylines.class \
$(CLASSES)/$(TESTSUITE_DIR)/ScaledLines.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/ScaledPolylines.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/ScaledRectangles.class \
$(CLASSES)/$(TESTSUITE_DIR)/DashedLines.class \
- $(CLASSES)/$(TESTSUITE_DIR)/ScaledPolylines.class \
$(CLASSES)/$(TESTSUITE_DIR)/DashedPolylines.class \
- $(CLASSES)/$(TESTSUITE_DIR)/ScaledRectangles.class \
$(CLASSES)/$(TESTSUITE_DIR)/DashedRectangles.class
# targets for all test suites
diff -r 43d70c352682 -r a4d9db570b97 src/org/gfxtest/framework/annotations/GraphicsPrimitives.java
--- a/src/org/gfxtest/framework/annotations/GraphicsPrimitives.java Fri Jul 16 17:44:09 2010 +0200
+++ b/src/org/gfxtest/framework/annotations/GraphicsPrimitives.java Tue Jul 20 13:10:11 2010 +0200
@@ -46,6 +46,7 @@ public enum GraphicsPrimitives
LINE,
RECTANGLE,
POLYLINE,
+ POLYGON,
ARC,
CIRCLE,
}
diff -r 43d70c352682 -r a4d9db570b97 src/org/gfxtest/testsuites/NormalArcs.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/NormalArcs.java Tue Jul 20 13:10:11 2010 +0200
@@ -0,0 +1,115 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.testsuites;
+
+import java.awt.*;
+import java.io.IOException;
+
+import org.gfxtest.framework.*;
+import org.gfxtest.framework.annotations.*;
+
+/**
+ * This test renders arcs using identity transformation matrix.
+ *
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.ARC)
+ at RenderStyle(RenderStyles.NORMAL)
+ at Transformation(Transformations.NONE)
+public class NormalArcs extends GfxTest
+{
+ private static final int MINOR_RADIUS = 50;
+ private static final int RADIUS_STEP = 30;
+
+ private void drawArc(TestImage image, Graphics2D graphics, float width, int cap)
+ {
+ graphics.setStroke(new BasicStroke(width, // width
+ cap, // cap
+ BasicStroke.JOIN_BEVEL)); // join
+ int xc = image.getWidth() >> 1;
+ int yc = image.getHeight() >> 1;
+ int majorRadius = (xc > yc ? yc : xc) - 20;
+
+ for (int radius = MINOR_RADIUS; radius < majorRadius; radius += RADIUS_STEP)
+ {
+ double r = ((double) radius - MINOR_RADIUS) / (majorRadius - MINOR_RADIUS);
+ Color color = new Color(Color.HSBtoRGB((float)r, 1.0f, 1.0f));
+ graphics.setColor(color);
+ graphics.drawArc(xc - radius, yc - radius, radius << 1, radius << 1, (int) (r * 360.0), 180);
+ }
+ drawCross(graphics, xc, yc, CROSS_SIZE);
+ }
+
+ protected void runOtherTests(Configuration configuration)
+ {
+ float[] widths = { 1.0f, 5.0f, 10.0f, 20.0f, 40.0f };
+ int[] caps = { BasicStroke.CAP_SQUARE, BasicStroke.CAP_BUTT, BasicStroke.CAP_ROUND };
+ int testNumber = 0;
+ for (int cap : caps)
+ {
+ for (float width : widths)
+ {
+ String testName = "test" + testNumber;
+ log.logBegin(testName);
+ TestImage image = new TestImage(configuration);
+ Graphics2D graphics = (Graphics2D) image.getGraphics();
+ drawArc(image, graphics, width, cap);
+ graphics.dispose();
+ try
+ {
+ image.writeImage(configuration, suiteName, testName);
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ log.logEnd(testName);
+ testNumber++;
+ }
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ new NormalArcs().runTestSuite(args);
+ }
+}
diff -r 43d70c352682 -r a4d9db570b97 src/org/gfxtest/testsuites/NormalCircles.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/NormalCircles.java Tue Jul 20 13:10:11 2010 +0200
@@ -0,0 +1,114 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.testsuites;
+
+import java.awt.*;
+import java.io.IOException;
+
+import org.gfxtest.framework.*;
+import org.gfxtest.framework.annotations.*;
+
+/**
+ * This test renders various circles using identity transformation matrix.
+ *
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.CIRCLE)
+ at RenderStyle(RenderStyles.NORMAL)
+ at Transformation(Transformations.NONE)
+public class NormalCircles extends GfxTest
+{
+ private static final int MINOR_RADIUS = 10;
+ private static final int MAJOR_RADIUS = 100;
+
+ private void drawCircle(TestImage image, Graphics2D graphics, float width)
+ {
+ graphics.setStroke(new BasicStroke(width, // width
+ BasicStroke.JOIN_MITER, // cap
+ BasicStroke.JOIN_BEVEL)); // join
+ int xc = image.getWidth() >> 1;
+ int yc = image.getHeight() >> 1;
+ double rmaj = (xc > yc ? yc : xc) - (MAJOR_RADIUS - MINOR_RADIUS);
+
+ for (float m = 0.0f; m < 1.0f; m += 1.0 / 16.0)
+ {
+ Color color = new Color(Color.HSBtoRGB(m, 1.0f, 1.0f));
+ graphics.setColor(color);
+ double angle = Math.PI * 2 * m;
+ int x = (int) (xc + rmaj * Math.cos(angle));
+ int y = (int) (yc + rmaj * Math.sin(angle));
+ int radius = (int) (MINOR_RADIUS + m * (MAJOR_RADIUS - MINOR_RADIUS));
+ graphics.drawOval(x - radius, y - radius, radius << 1, radius << 1);
+ }
+ drawCross(graphics, xc, yc, CROSS_SIZE);
+ }
+
+ protected void runOtherTests(Configuration configuration)
+ {
+ float[] widths = { 1.0f, 2.0f, 5.0f, 10.0f, 20.0f, 40.0f };
+ int testNumber = 0;
+ for (float width : widths)
+ {
+ String testName = "test" + testNumber;
+ log.logBegin(testName);
+ TestImage image = new TestImage(configuration);
+ Graphics2D graphics = (Graphics2D) image.getGraphics();
+ drawCircle(image, graphics, width);
+ graphics.dispose();
+ try
+ {
+ image.writeImage(configuration, suiteName, testName);
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ log.logEnd(testName);
+ testNumber++;
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ new NormalCircles().runTestSuite(args);
+ }
+}
diff -r 43d70c352682 -r a4d9db570b97 src/org/gfxtest/testsuites/NormalLines.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/NormalLines.java Tue Jul 20 13:10:11 2010 +0200
@@ -0,0 +1,120 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.testsuites;
+
+import java.awt.*;
+import java.io.IOException;
+
+import org.gfxtest.framework.*;
+import org.gfxtest.framework.annotations.*;
+
+/**
+ * This test renders various lines using identity transformation matrix.
+ *
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.LINE)
+ at RenderStyle(RenderStyles.NORMAL)
+ at Transformation(Transformations.NONE)
+public class NormalLines extends GfxTest
+{
+ private static final int MINOR_RADIUS = 50;
+ private static final int ANGLES = 16;
+
+ private void drawLines(TestImage image, Graphics2D graphics, float width, int cap)
+ {
+ graphics.setStroke(new BasicStroke(width, // width
+ cap, // cap
+ BasicStroke.JOIN_ROUND)); // join
+ int xc = image.getWidth() >> 1;
+ int yc = image.getHeight() >> 1;
+ for (int i = 0; i < ANGLES; i++)
+ {
+ Color color = new Color(Color.HSBtoRGB((float)i/ANGLES, 1.0f, 1.0f));
+ graphics.setColor(color);
+ int majorRadius = (xc > yc ? yc : xc) - 20;
+ double angle = 2.0 * i / ANGLES * Math.PI;
+ double cos = Math.cos(angle);
+ double sin = Math.sin(angle);
+ int x1 = xc + (int)(MINOR_RADIUS*cos);
+ int y1 = yc + (int)(MINOR_RADIUS*sin);
+ int x2 = xc + (int)(majorRadius*cos);
+ int y2 = yc + (int)(majorRadius*sin);
+ graphics.drawLine(x1, y1, x2, y2);
+ }
+ drawCross(graphics, xc, yc, CROSS_SIZE);
+ }
+
+ protected void runOtherTests(Configuration configuration)
+ {
+ float[] widths = { 1.0f, 10.0f, 20.0f, 40.0f, 80.0f };
+ int[] caps = { BasicStroke.CAP_SQUARE, BasicStroke.CAP_BUTT, BasicStroke.CAP_ROUND };
+ int testNumber = 0;
+ for (int cap : caps)
+ {
+ for (float width : widths)
+ {
+ String testName = "test" + testNumber;
+ log.logBegin(testName);
+ TestImage image = new TestImage(configuration);
+ Graphics2D graphics = (Graphics2D) image.getGraphics();
+ drawLines(image, graphics, width, cap);
+ graphics.dispose();
+ try
+ {
+ image.writeImage(configuration, suiteName, testName);
+ }
+ catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+ log.logEnd(testName);
+ testNumber++;
+ }
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ new NormalLines().runTestSuite(args);
+ }
+}
diff -r 43d70c352682 -r a4d9db570b97 src/org/gfxtest/testsuites/NormalPolygon.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/NormalPolygon.java Tue Jul 20 13:10:11 2010 +0200
@@ -0,0 +1,115 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010 Red Hat
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+IcedTea 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 for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package org.gfxtest.testsuites;
+
+import java.awt.*;
+import java.io.IOException;
+
+import org.gfxtest.framework.*;
+import org.gfxtest.framework.annotations.*;
+
+/**
+ * This test renders various polygons using identity transformation matrix.
+ *
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.POLYGON)
+ at RenderStyle(RenderStyles.NORMAL)
+ at Transformation(Transformations.NONE)
+public class NormalPolygon extends GfxTest
+{
+ private static final int OFFSET = 80;
+
+ private void drawPolygon(TestImage image, Graphics2D graphics, float width, int cap, int join)
+ {
+ graphics.setColor(Color.BLACK);
+ graphics.setStroke(new BasicStroke(width, // width
+ cap, // cap
+ join)); // join
+ int w = image.getWidth();
+ int h = image.getHeight();
+ int xPoints[] = new int[] { OFFSET, w >> 1, w >> 1, w - OFFSET };
+ int yPoints[] = new int[] { h >> 1, OFFSET, h - OFFSET, h >> 1 };
+
+ graphics.drawPolygon(xPoints, yPoints, xPoints.length);
+
+ drawCross(graphics, OFFSET, h >> 1, CROSS_SIZE);
+ drawCross(graphics, w >> 1, OFFSET, CROSS_SIZE);
+ drawCross(graphics, w >> 1, h - OFFSET, CROSS_SIZE);
+ drawCross(graphics, w - OFFSET, h >> 1, CROSS_SIZE);
+ }
+
+ protected void runOtherTests(Configuration configuration)
+ {
+ float[] widths = { 1.0f, 10.0f, 20.0f, 40.0f, 80.0f };
+ int cap = BasicStroke.CAP_SQUARE;
+ int[] joins = { BasicStroke.JOIN_BEVEL, BasicStroke.JOIN_MITER, BasicStroke.CAP_ROUND };
+ int testNumber = 0;
+ for (int join : joins)
More information about the distro-pkg-dev
mailing list