/hg/gfx-test: Added new test suite - drawing of normal quadratic...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Tue Jul 26 06:50:45 PDT 2011
changeset a9d264b14ae5 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=a9d264b14ae5
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Jul 26 15:52:18 2011 +0200
Added new test suite - drawing of normal quadratic curves using
Path2D.
diffstat:
ChangeLog | 6 +
Makefile | 5 +-
gfx_harness.properties | 4 +-
src/org/gfxtest/testsuites/NormalQuadraticCurve.java | 379 --------
src/org/gfxtest/testsuites/NormalQuadraticCurves.java | 468 ++++++++++
src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java | 494 +++++++++++
6 files changed, 974 insertions(+), 382 deletions(-)
diffs (truncated from 1399 to 500 lines):
diff -r 06963bda3bcb -r a9d264b14ae5 ChangeLog
--- a/ChangeLog Tue Jul 26 11:49:25 2011 +0200
+++ b/ChangeLog Tue Jul 26 15:52:18 2011 +0200
@@ -1,3 +1,9 @@
+2011-07-26 Pavel Tisnovsky <ptisnovs at redhat.com>
+ * src/org/gfxtest/testsuites/NormalQuadraticCurve.java: renamed
+ * src/org/gfxtest/testsuites/NormalQuadraticCurves.java: renamed
+ * src/org/gfxtest/testsuites/NormalQuadraticCurvesAsPaths.java: created
+ Added new test suite - drawing of normal quadratic curves using Path2D.
+
2011-07-26 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/gfxtest/testsuites/NormalQuadraticCurve.java: created
Added new test suite - drawing of normal quadratic curves.
diff -r 06963bda3bcb -r a9d264b14ae5 Makefile
--- a/Makefile Tue Jul 26 11:49:25 2011 +0200
+++ b/Makefile Tue Jul 26 15:52:18 2011 +0200
@@ -104,7 +104,8 @@
$(CLASSES)/$(TESTSUITE_DIR)/NormalRectangles.class \
$(CLASSES)/$(TESTSUITE_DIR)/NormalRoundRectangles.class \
$(CLASSES)/$(TESTSUITE_DIR)/Normal3DRectangles.class \
- $(CLASSES)/$(TESTSUITE_DIR)/NormalQuadraticCurve.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/NormalQuadraticCurves.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/NormalQuadraticCurvesAsPaths.class \
$(CLASSES)/$(TESTSUITE_DIR)/FilledArcs.class \
$(CLASSES)/$(TESTSUITE_DIR)/FilledCircles.class \
$(CLASSES)/$(TESTSUITE_DIR)/FilledEllipses.class \
@@ -136,6 +137,8 @@
$(RESULTS)/NormalRectangles \
$(RESULTS)/NormalRoundRectangles \
$(RESULTS)/Normal3DRectangles \
+ $(RESULTS)/NormalQuadraticCurves \
+ $(RESULTS)/NormalQuadraticCurvesAsPaths \
$(RESULTS)/FilledArcs \
$(RESULTS)/FilledCircles \
$(RESULTS)/FilledEllipses \
diff -r 06963bda3bcb -r a9d264b14ae5 gfx_harness.properties
--- a/gfx_harness.properties Tue Jul 26 11:49:25 2011 +0200
+++ b/gfx_harness.properties Tue Jul 26 15:52:18 2011 +0200
@@ -5,5 +5,5 @@
jre.tested=/usr/lib/jvm/java/bin/java
jre.reference=/usr/lib/jvm/java/bin/java
run.verbose=false
-mainWindow.height=768
-mainWindow.width=1024
+mainWindow.height=1000
+mainWindow.width=1200
diff -r 06963bda3bcb -r a9d264b14ae5 src/org/gfxtest/testsuites/NormalQuadraticCurve.java
--- a/src/org/gfxtest/testsuites/NormalQuadraticCurve.java Tue Jul 26 11:49:25 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,379 +0,0 @@
-/*
- Java gfx-test framework
-
- Copyright (C) 2010, 2011 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.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.geom.QuadCurve2D;
-
-import org.gfxtest.framework.*;
-import org.gfxtest.framework.annotations.*;
-
-/**
- * This test renders various quadratic curves using identity transformation
- * matrix. Quadratic curves are constructed as Paths or using QuadCurve2D class.
- *
- * @author Pavel Tisnovsky
- */
- at TestType(TestTypes.RENDER_TEST)
- at GraphicsPrimitive(GraphicsPrimitives.QUADRATIC_CURVE)
- at RenderStyle(RenderStyles.NORMAL)
- at Transformation(Transformations.NONE)
- at Zoom(1)
-public class NormalQuadraticCurve extends GfxTest
-{
-
- /**
- * Draw quadratic curve onto canvas specified by Graphics2D class.
- *
- * @param graphics
- * graphics canvas
- * @param width
- * canvas width
- * @param height
- * canvas height
- * @param quadCurve
- * curve to be drawn
- * @param color
- * curve color or null when Color.BLACK can be used.
- * @return test status
- */
- private TestResult drawQuadraticCurve(Graphics2D graphics, int width, int height, QuadCurve2D quadCurve, Color color)
- {
- // construct QuadCurve2D.Float with set coordinates
- quadCurve.setCurve(width/4, 20, width/2, 20 + height*2/3, width*3/4, 20);
-
- // set the specified color
- graphics.setColor(color == null ? Color.BLACK : color);
-
- // draw QuadCurve2D
- graphics.draw(quadCurve);
-
- return TestResult.PASSED;
- }
-
- /**
- * Draw quadratic curve onto canvas specified by Graphics2D class using
- * black color.
- *
- * @param graphics
- * graphics canvas
- * @param width
- * canvas width
- * @param height
- * canvas height
- * @param quadCurve
- * curve to be drawn
- * @return test status
- */
- private TestResult drawQuadraticCurve(Graphics2D graphics, int w, int h, QuadCurve2D quadCurve)
- {
- return drawQuadraticCurve(graphics, w, h, quadCurve, Color.BLACK);
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Float() is rendered
- * correctly.
- *
- * @param image image to which two dimensional shape is to be rendered
- * @param graphics graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test0(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Float();
-
- // draw quadratic curve
- return drawQuadraticCurve(graphics, w, h, quadCurve);
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Double() is rendered
- * correctly.
- *
- * @param image image to which two dimensional shape is to be rendered
- * @param graphics graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test1(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Double();
-
- // draw quadratic curve
- return drawQuadraticCurve(graphics, w, h, quadCurve);
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Float() is rendered
- * correctly. Curve is to be drawn with 10 pixels wide line and default
- * caps.
- *
- * @param image
- * image to which two dimensional shape is to be rendered
- * @param graphics
- * graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test2(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- // set 10 pixels wide line
- graphics.setStroke(new BasicStroke(10));
-
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Float();
-
- // draw quadratic curve
- return drawQuadraticCurve(graphics, w, h, quadCurve);
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Float() is rendered
- * correctly. Curve is to be drawn with 10 pixels wide line and default
- * CAP_BUTT.
- *
- * @param image
- * image to which two dimensional shape is to be rendered
- * @param graphics
- * graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test3(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- // set 10 pixels wide line and CAP_BUTT
- graphics.setStroke(new BasicStroke(10, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
-
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Float();
-
- // draw quadratic curve
- return drawQuadraticCurve(graphics, w, h, quadCurve);
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Float() is rendered
- * correctly. Curve is to be drawn with 10 pixels wide line and default
- * CAP_ROUND.
- *
- * @param image
- * image to which two dimensional shape is to be rendered
- * @param graphics
- * graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test4(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- // set 10 pixels wide line and CAP_ROUND
- graphics.setStroke(new BasicStroke(10, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL));
-
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Float();
-
- // draw quadratic curve
- return drawQuadraticCurve(graphics, w, h, quadCurve);
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Float() is rendered
- * correctly. Curve is to be drawn with 10 pixels wide line and default
- * CAP_SQUARE.
- *
- * @param image
- * image to which two dimensional shape is to be rendered
- * @param graphics
- * graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test5(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- // set 10 pixels wide line and CAP_SQUARE
- graphics.setStroke(new BasicStroke(10, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_BEVEL));
-
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Float();
-
- // draw quadratic curve
- return drawQuadraticCurve(graphics, w, h, quadCurve);
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Float() is rendered
- * correctly. Curve is drawn using different colors.
- *
- * @param image
- * image to which two dimensional shape is to be rendered
- * @param graphics
- * graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test6(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- Color[] colors = new Color[]
- {
- Color.BLACK,
- Color.BLUE,
- Color.CYAN,
- Color.GREEN,
- Color.ORANGE,
- Color.RED,
- Color.YELLOW,
- Color.GRAY
- };
-
- int offset = 0;
-
- // Draw each curve with different color.
- for (Color color : colors)
- {
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Float();
-
- // construct QuadCurve2D.Float with set coordinates
- quadCurve.setCurve(w/4, offset, w/2, h*2/3 + offset, w*3/4, offset);
-
- // set the specified color
- graphics.setColor(color);
-
- // draw QuadCurve2D
- graphics.draw(quadCurve);
-
- // move next curve down
- offset += 20;
- }
-
- return TestResult.PASSED;
- }
-
- /**
- * Test if quadratic curve created by QuadCurve2D.Float() is rendered
- * correctly. Curve is drawn using different colors.
- *
- * @param image
- * image to which two dimensional shape is to be rendered
- * @param graphics
- * graphics context for image
- * @return test result - PASSED, FAILED or ERROR
- */
- public TestResult test7(TestImage image, Graphics2D graphics)
- {
- // calculate image dimensions
- int w = image.getWidth();
- int h = image.getHeight();
-
- Color[] colors = new Color[]
- {
- Color.BLACK,
- Color.BLUE,
- Color.CYAN,
- Color.GREEN,
- Color.ORANGE,
- Color.RED,
- Color.YELLOW,
- Color.GRAY
- };
-
- // set 10 pixels wide line and CAP_ROUND
- graphics.setStroke(new BasicStroke(10, BasicStroke.CAP_ROUND, BasicStroke.JOIN_BEVEL));
-
- int offset = 0;
-
- // Draw each curve with different color.
- for (Color color : colors)
- {
- // create new QuadCurve2D.Float
- QuadCurve2D quadCurve = new QuadCurve2D.Float();
-
- // construct QuadCurve2D.Float with set coordinates
- quadCurve.setCurve(w/4, offset, w/2, h*2/3 + offset, w*3/4, offset);
-
- // set the specified color
- graphics.setColor(color);
-
- // draw QuadCurve2D
- graphics.draw(quadCurve);
-
- // move next curve down
- offset += 20;
- }
-
- return TestResult.PASSED;
- }
-
- /**
- * Entry point to the test suite.
- *
- * @param args not used in this case
- */
- public static void main(String[] args)
- {
- new NormalQuadraticCurve().runTestSuite(args);
- }
-}
diff -r 06963bda3bcb -r a9d264b14ae5 src/org/gfxtest/testsuites/NormalQuadraticCurves.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/testsuites/NormalQuadraticCurves.java Tue Jul 26 15:52:18 2011 +0200
@@ -0,0 +1,468 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2010, 2011 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.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.QuadCurve2D;
+
+import org.gfxtest.framework.*;
+import org.gfxtest.framework.annotations.*;
+
+
+
+/**
+ * This test renders various quadratic curves using identity transformation
+ * matrix. Quadratic curves are constructed using QuadCurve2D class. Curves
+ * are drawn using various colors and stroke width.
+ *
+ * @author Pavel Tisnovsky
+ */
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.QUADRATIC_CURVE)
+ at RenderStyle(RenderStyles.NORMAL)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
+public class NormalQuadraticCurves extends GfxTest
+{
+ /**
More information about the distro-pkg-dev
mailing list