/hg/gfx-test: Added three new test suites - rendering of dashed ...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Sep 17 04:31:23 PDT 2010
changeset 8bdbaf02b8e6 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=8bdbaf02b8e6
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Sep 17 13:31:48 2010 +0200
Added three new test suites - rendering of dashed arcs, dashed
polygons and dashed round rectangles.
diffstat:
4 files changed, 283 insertions(+), 2 deletions(-)
Makefile | 10 +
src/org/gfxtest/testsuites/DashedArcs.java | 92 ++++++++++++++++
src/org/gfxtest/testsuites/DashedPolygons.java | 89 ++++++++++++++++
src/org/gfxtest/testsuites/DashedRoundRectangles.java | 94 +++++++++++++++++
diffs (322 lines):
diff -r 3ae4c8d1a562 -r 8bdbaf02b8e6 Makefile
--- a/Makefile Fri Sep 17 10:47:02 2010 +0200
+++ b/Makefile Fri Sep 17 13:31:48 2010 +0200
@@ -98,11 +98,14 @@ TESTSUITE_CLASSES = \
$(CLASSES)/$(TESTSUITE_DIR)/ScaledLines.class \
$(CLASSES)/$(TESTSUITE_DIR)/ScaledPolylines.class \
$(CLASSES)/$(TESTSUITE_DIR)/ScaledRectangles.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/DashedArcs.class \
$(CLASSES)/$(TESTSUITE_DIR)/DashedCircles.class \
$(CLASSES)/$(TESTSUITE_DIR)/DashedEllipses.class \
$(CLASSES)/$(TESTSUITE_DIR)/DashedLines.class \
$(CLASSES)/$(TESTSUITE_DIR)/DashedPolylines.class \
- $(CLASSES)/$(TESTSUITE_DIR)/DashedRectangles.class
+ $(CLASSES)/$(TESTSUITE_DIR)/DashedPolygons.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/DashedRectangles.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/DashedRoundRectangles.class
COMPARE_RESULTS = \
$(RESULTS)/AALines \
@@ -125,11 +128,14 @@ COMPARE_RESULTS = \
$(RESULTS)/ScaledLines \
$(RESULTS)/ScaledPolylines \
$(RESULTS)/ScaledRectangles \
+ $(RESULTS)/DashedArcs \
$(RESULTS)/DashedCircles \
$(RESULTS)/DashedEllipses \
$(RESULTS)/DashedLines \
$(RESULTS)/DashedPolylines \
- $(RESULTS)/DashedRectangles
+ $(RESULTS)/DashedPolygons \
+ $(RESULTS)/DashedRectangles \
+ $(RESULTS)/DashedRoundRectangles
# targets for all test suites
TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/\([A-Za-z0-9]*\)\.java/\1/p')
diff -r 3ae4c8d1a562 -r 8bdbaf02b8e6 src/org/gfxtest/testsuites/DashedArcs.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/DashedArcs.java Fri Sep 17 13:31:48 2010 +0200
@@ -0,0 +1,92 @@
+/*
+ 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 org.gfxtest.framework.*;
+import org.gfxtest.framework.annotations.*;
+
+import org.gfxtest.framework.GfxTestConfiguration;
+
+/**
+ * This test renders various dashed arcs using identity transformation matrix.
+ *
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.ARC)
+ at RenderStyle(RenderStyles.DASH)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
+public class DashedArcs extends GfxTest
+{
+
+ @Override
+ protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle)
+ {
+ graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f));
+ int xc = image.getCenterX();
+ int yc = image.getCenterY();
+ int majorRadius = (xc > yc ? yc : xc) - 20;
+
+ for (int radius = majorRadius; radius >= MINOR_RADIUS; 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);
+ }
+
+ @Override
+ protected void runOtherTests(GfxTestConfiguration configuration)
+ {
+ drawEntityWithVariousStyles(configuration, false, false, true, false, true, false);
+ }
+
+ public static void main(String[] args)
+ {
+ new DashedArcs().runTestSuite(args);
+ }
+
+}
diff -r 3ae4c8d1a562 -r 8bdbaf02b8e6 src/org/gfxtest/testsuites/DashedPolygons.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/DashedPolygons.java Fri Sep 17 13:31:48 2010 +0200
@@ -0,0 +1,89 @@
+/*
+ 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 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.DASH)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
+public class DashedPolygons extends GfxTest
+{
+ @Override
+ protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle)
+ {
+ graphics.setColor(Color.BLACK);
+ graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f));
+
+ 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);
+ }
+
+ @Override
+ protected void runOtherTests(GfxTestConfiguration configuration)
+ {
+ drawEntityWithVariousStyles(configuration, true, true, true, false, true);
+ }
+
+ public static void main(String[] args)
+ {
+ new DashedPolygons().runTestSuite(args);
+ }
+}
diff -r 3ae4c8d1a562 -r 8bdbaf02b8e6 src/org/gfxtest/testsuites/DashedRoundRectangles.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/DashedRoundRectangles.java Fri Sep 17 13:31:48 2010 +0200
@@ -0,0 +1,94 @@
+/*
+ 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 org.gfxtest.framework.*;
+import org.gfxtest.framework.annotations.*;
+
+/**
+ * Dashed round rectangle test.
+ *
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.ROUND_RECTANGLE)
+ at RenderStyle(RenderStyles.DASH)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
+public class DashedRoundRectangles extends GfxTest
+{
+
+ @Override
+ protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle)
+ {
+ graphics.setColor(Color.BLACK);
+ graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f));
+
+ int xc = image.getCenterX();
+ int yc = image.getCenterY();
+ double rmaj = (xc > yc ? yc : xc) - (MAJOR_RADIUS - MINOR_RADIUS);
+
+ for (float m = 1.0f; m >= 0.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.drawRoundRect(x - radius, y - radius, radius << 1, radius << 1, 40, 40);
+ }
+ drawCross(graphics, xc, yc, CROSS_SIZE);
+ }
+
+ @Override
+ protected void runOtherTests(GfxTestConfiguration configuration)
+ {
+ drawEntityWithVariousStyles(configuration, true, false, true, false, true);
+ }
+
+ public static void main(String[] args)
+ {
+ new DashedRoundRectangles().runTestSuite(args);
+ }
+}
More information about the distro-pkg-dev
mailing list