/hg/gfx-test: * src/org/gfxtest/framework/GfxTest.java:
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Thu May 10 03:06:02 PDT 2012
changeset bb8cea44ceaf in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=bb8cea44ceaf
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu May 10 12:08:40 2012 +0200
* src/org/gfxtest/framework/GfxTest.java:
Improved JavaDoc and fixed issue with logging.
* src/org/gfxtest/framework/GrayscalePalette.java:
Added class common for all print test.
* src/org/gfxtest/framework/PrintTest.java:
This abstract class is an ancestor of all print tests.
* src/org/gfxtest/testsuites/PrintTestArcs.java:
* src/org/gfxtest/testsuites/PrintTestBasic.java:
* src/org/gfxtest/testsuites/PrintTestBitBlt.java:
* src/org/gfxtest/testsuites/PrintTestCircles.java:
* src/org/gfxtest/testsuites/PrintTestCubicCurves.java:
* src/org/gfxtest/testsuites/PrintTestDrawText.java:
* src/org/gfxtest/testsuites/PrintTestLines.java:
* src/org/gfxtest/testsuites/PrintTestPaths.java:
* src/org/gfxtest/testsuites/PrintTestPolylines.java:
* src/org/gfxtest/testsuites/PrintTestQuadraticCurves.java:
Changed hierarchy of all print tests.
diffstat:
ChangeLog | 20 ++++
src/org/gfxtest/framework/GfxTest.java | 34 ++++++-
src/org/gfxtest/framework/GrayscalePalette.java | 69 ++++++++++++++
src/org/gfxtest/framework/PrintTest.java | 77 ++++++++++++++++
src/org/gfxtest/testsuites/PrintTestArcs.java | 4 +-
src/org/gfxtest/testsuites/PrintTestBasic.java | 15 +-
src/org/gfxtest/testsuites/PrintTestBitBlt.java | 4 +-
src/org/gfxtest/testsuites/PrintTestCircles.java | 14 ++-
src/org/gfxtest/testsuites/PrintTestCubicCurves.java | 4 +-
src/org/gfxtest/testsuites/PrintTestDrawText.java | 4 +-
src/org/gfxtest/testsuites/PrintTestLines.java | 41 ++-----
src/org/gfxtest/testsuites/PrintTestPaths.java | 4 +-
src/org/gfxtest/testsuites/PrintTestPolylines.java | 4 +-
src/org/gfxtest/testsuites/PrintTestQuadraticCurves.java | 4 +-
14 files changed, 240 insertions(+), 58 deletions(-)
diffs (truncated from 571 to 500 lines):
diff -r 19fa0d60ad2d -r bb8cea44ceaf ChangeLog
--- a/ChangeLog Wed May 09 11:11:42 2012 +0200
+++ b/ChangeLog Thu May 10 12:08:40 2012 +0200
@@ -1,3 +1,23 @@
+2012-05-10 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/gfxtest/framework/GfxTest.java:
+ Improved JavaDoc and fixed issue with logging.
+ * src/org/gfxtest/framework/GrayscalePalette.java:
+ Added class common for all print test.
+ * src/org/gfxtest/framework/PrintTest.java:
+ This abstract class is an ancestor of all print tests.
+ * src/org/gfxtest/testsuites/PrintTestArcs.java:
+ * src/org/gfxtest/testsuites/PrintTestBasic.java:
+ * src/org/gfxtest/testsuites/PrintTestBitBlt.java:
+ * src/org/gfxtest/testsuites/PrintTestCircles.java:
+ * src/org/gfxtest/testsuites/PrintTestCubicCurves.java:
+ * src/org/gfxtest/testsuites/PrintTestDrawText.java:
+ * src/org/gfxtest/testsuites/PrintTestLines.java:
+ * src/org/gfxtest/testsuites/PrintTestPaths.java:
+ * src/org/gfxtest/testsuites/PrintTestPolylines.java:
+ * src/org/gfxtest/testsuites/PrintTestQuadraticCurves.java:
+ Changed hierarchy of all print tests.
+
2012-05-09 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/gfxtest/testsuites/PrintTestLines.java:
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/framework/GfxTest.java
--- a/src/org/gfxtest/framework/GfxTest.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/framework/GfxTest.java Thu May 10 12:08:40 2012 +0200
@@ -79,6 +79,10 @@
*/
public abstract class GfxTest
{
+ /**
+ * Simple logger that writes everything out to standard output and can use
+ * color codes for ANSI-compatible terminals.
+ */
protected Log log = null;
/**
@@ -187,9 +191,11 @@
/**
* Write test suite duration to the log file.
- *
- * @param t1 time when the test suite has been started
- * @param t2 time when the test suite was completed
+ *
+ * @param t1
+ * time when the test suite has been started
+ * @param t2
+ * time when the test suite was completed
*/
private void printDuration(long t1, long t2)
{
@@ -441,6 +447,17 @@
this.log.logSet("arc height", entityRenderingStyle.getArcHeight());
}
+ /**
+ * Run test configured to use bitmap or postscript file as its output.
+ *
+ * @param testType
+ * type of test - either RENDER_TEST or PRINT_TEST should be used
+ * at this moment
+ * @param configuration
+ * configuration set by gfx-test harness for each test suite
+ * @param method
+ * test method
+ */
private void tryToInvokeTestMethod(TestType testType, GfxTestConfiguration configuration, Method method)
{
String methodName = method.getName();
@@ -456,15 +473,19 @@
tryToRunPrintTest(configuration, method, methodName);
break;
}
+ this.log.logEnd(methodName);
}
}
/**
* Run test configured to use bitmap as its output.
- *
+ *
* @param configuration
+ * configuration set by gfx-test harness for each test suite
* @param method
+ * test method
* @param methodName
+ * name of test method
*/
private void tryToRunRenderTest(GfxTestConfiguration configuration, Method method, String methodName)
{
@@ -499,10 +520,13 @@
/**
* Run test configured to use printer as its output.
- *
+ *
* @param configuration
+ * configuration set by gfx-test harness for each test suite
* @param method
+ * test method
* @param methodName
+ * name of test method
*/
private void tryToRunPrintTest(GfxTestConfiguration configuration, Method method, String methodName)
{
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/framework/GrayscalePalette.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/framework/GrayscalePalette.java Thu May 10 12:08:40 2012 +0200
@@ -0,0 +1,69 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2012 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.framework;
+
+
+
+import java.awt.Color;
+
+
+
+/**
+ * Grayscale palette used by various tests.
+ *
+ * @author Pavel Tisnovsky
+ */
+public class GrayscalePalette
+{
+
+ /**
+ * Return grayscale color.
+ *
+ * @param gray
+ * value of r,g,b components
+ * @return
+ */
+ public static Color createGrayscaleColor(float gray)
+ {
+ return new Color(gray, gray, gray);
+ }
+
+}
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/framework/PrintTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/framework/PrintTest.java Thu May 10 12:08:40 2012 +0200
@@ -0,0 +1,77 @@
+/*
+ Java gfx-test framework
+
+ Copyright (C) 2012 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.framework;
+
+
+
+/**
+ * Abstract class used by all print tests.
+ *
+ * @author Pavel Tisnovsky
+ */
+abstract public class PrintTest extends GfxTest
+{
+ /**
+ * Maximum width of line rendered onto a paper.
+ */
+ protected static final float MAX_STROKE_WIDTH = 15.0f;
+
+ /**
+ * Border around the test picture.
+ */
+ protected static final int BORDER = 10;
+
+ /**
+ * Offset between two circles.
+ */
+ protected static final int CIRCLE_RADIUS_STEP = 10;
+
+ /**
+ * Horizontal distance between two lines.
+ */
+ protected static final int HOR_STEP = 10;
+
+ /**
+ * Vertical distance between two lines.
+ */
+ protected static final int VER_STEP = 10;
+
+}
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/testsuites/PrintTestArcs.java
--- a/src/org/gfxtest/testsuites/PrintTestArcs.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestArcs.java Thu May 10 12:08:40 2012 +0200
@@ -40,7 +40,7 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.PrintTest;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
import org.gfxtest.framework.annotations.GraphicsPrimitives;
import org.gfxtest.framework.annotations.RenderStyle;
@@ -63,7 +63,7 @@
@RenderStyle(RenderStyles.NORMAL)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class PrintTestArcs extends GfxTest
+public class PrintTestArcs extends PrintTest
{
/**
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/testsuites/PrintTestBasic.java
--- a/src/org/gfxtest/testsuites/PrintTestBasic.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestBasic.java Thu May 10 12:08:40 2012 +0200
@@ -45,7 +45,7 @@
-import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.PrintTest;
import org.gfxtest.framework.TestImage;
import org.gfxtest.framework.TestResult;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
@@ -70,12 +70,9 @@
@RenderStyle(RenderStyles.NORMAL)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class PrintTestBasic extends GfxTest
+public class PrintTestBasic extends PrintTest
{
- private static final int HOR_STEP = 10;
- private static final int VER_STEP = 10;
-
/**
* Test basic behavior of method Graphics.drawLine().
*
@@ -133,8 +130,8 @@
graphics.setColor(Color.BLACK);
// image width and height
- int width = image.getWidth();
- int height = image.getHeight();
+ final int width = image.getWidth();
+ final int height = image.getHeight();
// horizontal coordinates of line endpoints
int x1 = 0;
@@ -168,8 +165,8 @@
graphics.setColor(Color.BLACK);
// image width and height
- int width = image.getWidth();
- int height = image.getHeight();
+ final int width = image.getWidth();
+ final int height = image.getHeight();
// vertical coordinates of line endpoints
int y1 = 0;
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/testsuites/PrintTestBitBlt.java
--- a/src/org/gfxtest/testsuites/PrintTestBitBlt.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestBitBlt.java Thu May 10 12:08:40 2012 +0200
@@ -40,7 +40,7 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.PrintTest;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
import org.gfxtest.framework.annotations.GraphicsPrimitives;
import org.gfxtest.framework.annotations.RenderStyle;
@@ -63,7 +63,7 @@
@RenderStyle(RenderStyles.NORMAL)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class PrintTestBitBlt extends GfxTest
+public class PrintTestBitBlt extends PrintTest
{
/**
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/testsuites/PrintTestCircles.java
--- a/src/org/gfxtest/testsuites/PrintTestCircles.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestCircles.java Thu May 10 12:08:40 2012 +0200
@@ -40,7 +40,17 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Graphics2D;
+
+
+
+import org.gfxtest.framework.ColorPalette;
+import org.gfxtest.framework.GrayscalePalette;
+import org.gfxtest.framework.PrintTest;
+import org.gfxtest.framework.TestImage;
+import org.gfxtest.framework.TestResult;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
import org.gfxtest.framework.annotations.GraphicsPrimitives;
import org.gfxtest.framework.annotations.RenderStyle;
@@ -63,7 +73,7 @@
@RenderStyle(RenderStyles.NORMAL)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class PrintTestCircles extends GfxTest
+public class PrintTestCircles extends PrintTest
{
/**
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/testsuites/PrintTestCubicCurves.java
--- a/src/org/gfxtest/testsuites/PrintTestCubicCurves.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestCubicCurves.java Thu May 10 12:08:40 2012 +0200
@@ -40,7 +40,7 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.PrintTest;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
import org.gfxtest.framework.annotations.GraphicsPrimitives;
import org.gfxtest.framework.annotations.RenderStyle;
@@ -61,7 +61,7 @@
@RenderStyle(RenderStyles.NORMAL)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class PrintTestCubicCurves extends GfxTest
+public class PrintTestCubicCurves extends PrintTest
{
/**
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/testsuites/PrintTestDrawText.java
--- a/src/org/gfxtest/testsuites/PrintTestDrawText.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestDrawText.java Thu May 10 12:08:40 2012 +0200
@@ -40,7 +40,7 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.PrintTest;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
import org.gfxtest.framework.annotations.GraphicsPrimitives;
import org.gfxtest.framework.annotations.RenderStyle;
@@ -63,7 +63,7 @@
@RenderStyle(RenderStyles.NORMAL)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class PrintTestDrawText extends GfxTest
+public class PrintTestDrawText extends PrintTest
{
/**
diff -r 19fa0d60ad2d -r bb8cea44ceaf src/org/gfxtest/testsuites/PrintTestLines.java
--- a/src/org/gfxtest/testsuites/PrintTestLines.java Wed May 09 11:11:42 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestLines.java Thu May 10 12:08:40 2012 +0200
@@ -47,7 +47,8 @@
import org.gfxtest.framework.ColorPalette;
-import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.GrayscalePalette;
+import org.gfxtest.framework.PrintTest;
import org.gfxtest.framework.TestImage;
import org.gfxtest.framework.TestResult;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
@@ -72,33 +73,13 @@
@RenderStyle(RenderStyles.NORMAL)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class PrintTestLines extends GfxTest
+public class PrintTestLines extends PrintTest
{
/**
- * Maximum width of line rendered onto a paper.
- */
- private static final float MAX_STROKE_WIDTH = 15.0f;
-
- /**
- * Border around the test picture.
- */
- private static final int BORDER = 10;
-
- /**
- * Horizontal distance between two lines.
- */
- private static final int HOR_STEP = 10;
-
- /**
- * Vertical distance between two lines.
- */
- private static final int VER_STEP = 10;
-
- /**
- * Test basic behavior of method Graphics.drawLine().
- * Horizontal lines are rendered with default width and default end caps.
- * Color of all rendered lines are set to black.
- *
+ * Test basic behavior of method Graphics.drawLine(). Horizontal lines are
+ * rendered with default width and default end caps. Color of all rendered
+ * lines are set to black.
+ *
* @param image
* image to which lines are to be drawn
* @param graphics2d
@@ -197,7 +178,8 @@
for (int y = 0; y < height; y += VER_STEP)
{
float gray = y * 1.0f / height;
- graphics.setColor(new Color(gray, gray, gray));
+ // set line color
+ graphics.setColor(GrayscalePalette.createGrayscaleColor(gray));
// render the line
graphics.drawLine(x1, y, x2, y);
}
@@ -229,6 +211,8 @@
// horizontal coordinates of line endpoints
final int x1 = BORDER;
final int x2 = width - BORDER;
+
+ // stroke width
float strokeWidth = 0.0f;
// draw all lines onto a paper
@@ -461,7 +445,8 @@
for (int x = 0; x < width; x += HOR_STEP)
More information about the distro-pkg-dev
mailing list