/hg/gfx-test: * src/org/gfxtest/callbacks/CommonCircleDrawCallba...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Fri Jun 15 06:52:41 PDT 2012
changeset 0036389a51c8 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=0036389a51c8
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Jun 15 15:55:10 2012 +0200
* src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java:
* src/org/gfxtest/callbacks/CommonLineDrawCallbacks.java:
* src/org/gfxtest/callbacks/DiagonalLineDrawCallbacks.java:
* src/org/gfxtest/callbacks/HorizontalLineDrawCallbacks.java:
* src/org/gfxtest/callbacks/VerticalLineDrawCallbacks.java:
* src/org/gfxtest/testsuites/PrintTestCircles.java:
* src/org/gfxtest/testsuites/PrintTestLines.java:
Refactoring: all classes containing callback methods were
moved to a new package. All concerned tests were updated too.
* Makefile: Updated according to previous changes.
diffstat:
ChangeLog | 13 +
Makefile | 24 ++-
src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java | 110 +++++++++++++
src/org/gfxtest/callbacks/CommonLineDrawCallbacks.java | 94 +++++++++++
src/org/gfxtest/callbacks/DiagonalLineDrawCallbacks.java | 62 +++++++
src/org/gfxtest/callbacks/HorizontalLineDrawCallbacks.java | 62 +++++++
src/org/gfxtest/callbacks/VerticalLineDrawCallbacks.java | 62 +++++++
src/org/gfxtest/testsuites/PrintTestCircles.java | 59 +------
src/org/gfxtest/testsuites/PrintTestLines.java | 110 +------------
9 files changed, 428 insertions(+), 168 deletions(-)
diffs (truncated from 719 to 500 lines):
diff -r ca41265056e8 -r 0036389a51c8 ChangeLog
--- a/ChangeLog Fri Jun 15 14:19:25 2012 +0200
+++ b/ChangeLog Fri Jun 15 15:55:10 2012 +0200
@@ -1,3 +1,16 @@
+2012-06-15 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java:
+ * src/org/gfxtest/callbacks/CommonLineDrawCallbacks.java:
+ * src/org/gfxtest/callbacks/DiagonalLineDrawCallbacks.java:
+ * src/org/gfxtest/callbacks/HorizontalLineDrawCallbacks.java:
+ * src/org/gfxtest/callbacks/VerticalLineDrawCallbacks.java:
+ * src/org/gfxtest/testsuites/PrintTestCircles.java:
+ * src/org/gfxtest/testsuites/PrintTestLines.java:
+ Refactoring: all classes containing callback methods were
+ moved to a new package. All concerned tests were updated too.
+ * Makefile: Updated according to previous changes.
+
2012-06-15 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/gfxtest/testsuites/PrintTestArcs.java:
diff -r ca41265056e8 -r 0036389a51c8 Makefile
--- a/Makefile Fri Jun 15 14:19:25 2012 +0200
+++ b/Makefile Fri Jun 15 15:55:10 2012 +0200
@@ -45,6 +45,7 @@
DOCS=docs
COMMON_DIR=org/gfxtest/common
+CALLBACKS_DIR=org/gfxtest/callbacks
FRAMEWORK_DIR=org/gfxtest/framework
TESTSUITE_DIR=org/gfxtest/testsuites
REPORTER_DIR=org/gfxtest/reporter
@@ -95,6 +96,11 @@
$(CLASSES)/$(FRAMEWORK_DIR)/ImageFactory.class \
$(CLASSES)/$(FRAMEWORK_DIR)/PostScriptToPngConverter.class \
$(CLASSES)/$(FRAMEWORK_DIR)/PrintJobWatcher.class \
+ $(CLASSES)/$(CALLBACKS_DIR)/CommonCircleDrawCallbacks.class \
+ $(CLASSES)/$(CALLBACKS_DIR)/CommonLineDrawCallbacks.class \
+ $(CLASSES)/$(CALLBACKS_DIR)/HorizontalLineDrawCallbacks.class \
+ $(CLASSES)/$(CALLBACKS_DIR)/VerticalLineDrawCallbacks.class \
+ $(CLASSES)/$(CALLBACKS_DIR)/DiagonalLineDrawCallbacks.class \
$(CLASSES)/$(IMAGE_DIFFER_DIR)/ComparisonResult.class \
$(CLASSES)/$(IMAGE_DIFFER_DIR)/Configuration.class \
$(CLASSES)/$(IMAGE_DIFFER_DIR)/ImageComparator.class \
@@ -177,18 +183,18 @@
$(CLASSES)/$(TESTSUITE_DIR)/ClippingPathBySelfIntersectingPolygonalShape.class \
$(CLASSES)/$(TESTSUITE_DIR)/ClippingPathByRoundRectangleShape.class \
$(CLASSES)/$(TESTSUITE_DIR)/PrintTestBasic.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/PrintTestArcs.class \
$(CLASSES)/$(TESTSUITE_DIR)/PrintTestCubicCurves.class \
$(CLASSES)/$(TESTSUITE_DIR)/PrintTestLines.class \
$(CLASSES)/$(TESTSUITE_DIR)/PrintTestPaths.class \
$(CLASSES)/$(TESTSUITE_DIR)/PrintTestPolylines.class \
$(CLASSES)/$(TESTSUITE_DIR)/PrintTestQuadraticCurves.class \
- $(CLASSES)/$(TESTSUITE_DIR)/PrintTestArcs.java \
- $(CLASSES)/$(TESTSUITE_DIR)/PrintTestBitBlt.java \
- $(CLASSES)/$(TESTSUITE_DIR)/PrintTestCircles.java \
- $(CLASSES)/$(TESTSUITE_DIR)/PrintTestDrawText.java \
- $(CLASSES)/$(TESTSUITE_DIR)/PrintTestColorPaint.java \
- $(CLASSES)/$(TESTSUITE_DIR)/PrintTestGradientPaint.java \
- $(CLASSES)/$(TESTSUITE_DIR)/PrintTestTexturePaint.java
+ $(CLASSES)/$(TESTSUITE_DIR)/PrintTestBitBlt.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/PrintTestCircles.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/PrintTestDrawText.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/PrintTestColorPaint.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/PrintTestGradientPaint.class \
+ $(CLASSES)/$(TESTSUITE_DIR)/PrintTestTexturePaint.class
COMPARE_RESULTS = \
$(RESULTS)/Areas \
@@ -261,6 +267,7 @@
$(RESULTS)/ClippingPathByRoundRectangleShape \
$(RESULTS)/ClippingPathByRectangleShape \
$(RESULTS)/PrintTestBasic \
+ $(RESULTS)/PrintTestArcs \
$(RESULTS)/PrintTestCubicCurves \
$(RESULTS)/PrintTestLines \
$(RESULTS)/PrintTestPaths \
@@ -305,6 +312,9 @@
$(CLASSES)/$(FRAMEWORK_DIR)/%.class: $(SOURCEPATH)/$(FRAMEWORK_DIR)/%.java
$(JAVAC) -d $(CLASSES) -sourcepath src/ $<
+$(CLASSES)/$(CALLBACKS_DIR)/%.class: $(SOURCEPATH)/$(CALLBACKS_DIR)/%.java
+ $(JAVAC) -d $(CLASSES) -sourcepath src/ $<
+
$(CLASSES)/$(TESTSUITE_DIR)/%.class: $(SOURCEPATH)/$(TESTSUITE_DIR)/%.java
$(JAVAC) -d $(CLASSES) -sourcepath src/ $<
diff -r ca41265056e8 -r 0036389a51c8 src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/callbacks/CommonCircleDrawCallbacks.java Fri Jun 15 15:55:10 2012 +0200
@@ -0,0 +1,110 @@
+/*
+ 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.callbacks;
+
+
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+
+
+
+import org.gfxtest.framework.TestImage;
+
+
+
+/**
+ * Class representing set of callback methods called for each rendered circle.
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class CommonCircleDrawCallbacks
+{
+ /**
+ * Image to which circles are to be drawn.
+ */
+ protected TestImage image;
+
+ /**
+ * Graphics canvas.
+ */
+ protected Graphics2D graphics;
+
+ /**
+ * Setup phase.
+ *
+ * @param image
+ * image to which circles are to be drawn
+ * @param graphics2d
+ * graphics canvas
+ */
+ public void setup(TestImage image, Graphics2D graphics)
+ {
+ this.image = image;
+ this.graphics = graphics;
+ // set drawing color
+ graphics.setColor(Color.BLACK);
+ }
+
+ /**
+ * This method is called for each rendered horizontal circle.
+ *
+ * @param x
+ * horizontal coordinate of a circle center
+ * @param y
+ * vertical coordinate of a circle center
+ * @param radius
+ * circle radius
+ * @param maxRadius
+ * maximum allowable circle radius
+ * @param colorIndex
+ * color index
+ */
+ public abstract void iterationCallBack(int x, int y, int radius, int maxRadius, int colorIndex);
+
+ /**
+ * Cleanup phase.
+ */
+ public void cleanup()
+ {
+ return;
+ }
+}
diff -r ca41265056e8 -r 0036389a51c8 src/org/gfxtest/callbacks/CommonLineDrawCallbacks.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/callbacks/CommonLineDrawCallbacks.java Fri Jun 15 15:55:10 2012 +0200
@@ -0,0 +1,94 @@
+/*
+ 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.callbacks;
+
+
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+
+
+
+import org.gfxtest.framework.TestImage;
+
+
+
+/**
+ * Class representing set of callback methods called for each rendered line.
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class CommonLineDrawCallbacks
+{
+ /**
+ * Image to which lines are to be drawn.
+ */
+ protected TestImage image;
+
+ /**
+ * Graphics canvas.
+ */
+ protected Graphics2D graphics;
+
+ /**
+ * Setup phase.
+ *
+ * @param image
+ * image to which lines are to be drawn
+ * @param graphics2d
+ * graphics canvas
+ */
+ public void setup(TestImage image, Graphics2D graphics)
+ {
+ this.image = image;
+ this.graphics = graphics;
+ // set drawing color
+ graphics.setColor(Color.BLACK);
+ }
+
+ /**
+ * Cleanup phase.
+ */
+ public void cleanup()
+ {
+ return;
+ }
+}
diff -r ca41265056e8 -r 0036389a51c8 src/org/gfxtest/callbacks/DiagonalLineDrawCallbacks.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/callbacks/DiagonalLineDrawCallbacks.java Fri Jun 15 15:55:10 2012 +0200
@@ -0,0 +1,62 @@
+/*
+ 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.callbacks;
+
+
+
+/**
+ * Class representing set of callback methods called for each rendered diagonal
+ * line.
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class DiagonalLineDrawCallbacks extends CommonLineDrawCallbacks
+{
+ /**
+ * Called for each rendered diagonal line.
+ *
+ * @param length
+ * horizontal + vertical coordinate of a line
+ * @param index
+ * line index
+ */
+ public abstract void iterationCallBack(int length, int index);
+}
diff -r ca41265056e8 -r 0036389a51c8 src/org/gfxtest/callbacks/HorizontalLineDrawCallbacks.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/callbacks/HorizontalLineDrawCallbacks.java Fri Jun 15 15:55:10 2012 +0200
@@ -0,0 +1,62 @@
+/*
+ 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.callbacks;
+
+
+
+/**
+ * Class representing set of callback methods called for each rendered
+ * horizontal line.
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class HorizontalLineDrawCallbacks extends CommonLineDrawCallbacks
+{
+ /**
+ * Called for each rendered horizontal line.
+ *
+ * @param y
+ * vertical coordinate of a line
+ * @param index
+ * line index
+ */
+ public abstract void iterationCallBack(int y, int index);
+}
diff -r ca41265056e8 -r 0036389a51c8 src/org/gfxtest/callbacks/VerticalLineDrawCallbacks.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/gfxtest/callbacks/VerticalLineDrawCallbacks.java Fri Jun 15 15:55:10 2012 +0200
@@ -0,0 +1,62 @@
+/*
+ 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.callbacks;
+
+
+
+/**
+ * Class representing set of callback methods called for each rendered vertical
+ * line.
+ *
+ * @author Pavel Tisnovsky
+ */
+public abstract class VerticalLineDrawCallbacks extends CommonLineDrawCallbacks
+{
+ /**
+ * Called for each rendered vertical line.
+ *
+ * @param x
+ * horizontal coordinate of a line
+ * @param index
+ * line index
+ */
+ public abstract void iterationCallBack(int x, int index);
+}
diff -r ca41265056e8 -r 0036389a51c8 src/org/gfxtest/testsuites/PrintTestCircles.java
--- a/src/org/gfxtest/testsuites/PrintTestCircles.java Fri Jun 15 14:19:25 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestCircles.java Fri Jun 15 15:55:10 2012 +0200
More information about the distro-pkg-dev
mailing list