/hg/gfx-test: Added new build targets - doc and clean-doc, fixed...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Wed Jul 27 08:17:16 PDT 2011
changeset 623e7a4847bf in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=623e7a4847bf
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Wed Jul 27 17:18:56 2011 +0200
Added new build targets - doc and clean-doc, fixed javadoc tool
warnings, added doc to all methods and attributes of the TestImage
class.
diffstat:
ChangeLog | 10 +-
Makefile | 8 +-
diff.diff | 318 +++++++++++++
src/org/gfxtest/framework/GfxTest.java | 13 +-
src/org/gfxtest/framework/TestImage.java | 143 +++++-
src/org/gfxtest/testsuites/NormalCubicCurves.java | 501 ++++++++++++++++++++++
6 files changed, 978 insertions(+), 15 deletions(-)
diffs (truncated from 1170 to 500 lines):
diff -r e2ffa5184756 -r 623e7a4847bf ChangeLog
--- a/ChangeLog Wed Jul 27 15:38:53 2011 +0200
+++ b/ChangeLog Wed Jul 27 17:18:56 2011 +0200
@@ -1,6 +1,14 @@
+2011-07-27 Pavel Tisnovsky <ptisnovs at redhat.com>
+ * Makefile:
+ Added new build targets - doc and clean-doc
+ * src/org/gfxtest/framework/GfxTest.java:
+ Fixed javadoc tool warnings.
+ * src/org/gfxtest/framework/TestImage.java:
+ Fixed javadoc tool warnings, added doc to all methods and attributes.
+
2011-07-27 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile: added new class to compile & run: NormalCubicCurves.java
- * src/org/gfxtest/testsuites/NormalCubicCurves.java: cretaded
+ * src/org/gfxtest/testsuites/NormalCubicCurves.java: created
Added new test suite - drawing of normal cubic curves.
2011-07-26 Pavel Tisnovsky <ptisnovs at redhat.com>
diff -r e2ffa5184756 -r 623e7a4847bf Makefile
--- a/Makefile Wed Jul 27 15:38:53 2011 +0200
+++ b/Makefile Wed Jul 27 17:18:56 2011 +0200
@@ -42,6 +42,7 @@
SAMPLES=samples
RESULTS=results
TEST_BUILD=test-build
+DOCS=docs
COMMON_DIR=org/gfxtest/common
FRAMEWORK_DIR=org/gfxtest/framework
@@ -210,6 +211,9 @@
runtests: gfxtest.jar $(TESTSUITES)
+doc:
+ javadoc -sourcepath src -d $(DOCS) org.gfxtest.ImageDiffer org.gfxtest.common org.gfxtest.framework org.gfxtest.harness org.gfxtest.reporter org.gfxtest.testsuites
+
# multiple targets - one for each test suite
$(TESTSUITES): gfxtest.jar
mkdir -p $(OUTPUT)/$@
@@ -238,7 +242,7 @@
harness: gfxtest.jar
java -cp gfxtest.jar org.gfxtest.harness.MainWindow
-cleanall: clean clean-output clean-results clean-samples clean-test-build
+cleanall: clean clean-output clean-results clean-samples clean-test-build clean-doc
clean-all: cleanall
@@ -260,3 +264,5 @@
clean-samples:
rm -rf $(SAMPLES)
+clean-doc:
+ rm -rf $(DOCS)
diff -r e2ffa5184756 -r 623e7a4847bf diff.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/diff.diff Wed Jul 27 17:18:56 2011 +0200
@@ -0,0 +1,321 @@
+diff -r e2ffa5184756 Makefile
+--- a/Makefile Wed Jul 27 15:38:53 2011 +0200
++++ b/Makefile Wed Jul 27 17:15:32 2011 +0200
+@@ -42,6 +42,7 @@
+ SAMPLES=samples
+ RESULTS=results
+ TEST_BUILD=test-build
++DOCS=docs
+
+ COMMON_DIR=org/gfxtest/common
+ FRAMEWORK_DIR=org/gfxtest/framework
+@@ -210,6 +211,9 @@
+
+ runtests: gfxtest.jar $(TESTSUITES)
+
++doc:
++ javadoc -sourcepath src -d $(DOCS) org.gfxtest.ImageDiffer org.gfxtest.common org.gfxtest.framework org.gfxtest.harness org.gfxtest.reporter org.gfxtest.testsuites
++
+ # multiple targets - one for each test suite
+ $(TESTSUITES): gfxtest.jar
+ mkdir -p $(OUTPUT)/$@
+@@ -238,7 +242,7 @@
+ harness: gfxtest.jar
+ java -cp gfxtest.jar org.gfxtest.harness.MainWindow
+
+-cleanall: clean clean-output clean-results clean-samples clean-test-build
++cleanall: clean clean-output clean-results clean-samples clean-test-build clean-doc
+
+ clean-all: cleanall
+
+@@ -260,3 +264,5 @@
+ clean-samples:
+ rm -rf $(SAMPLES)
+
++clean-doc:
++ rm -rf $(DOCS)
+diff -r e2ffa5184756 src/org/gfxtest/framework/GfxTest.java
+--- a/src/org/gfxtest/framework/GfxTest.java Wed Jul 27 15:38:53 2011 +0200
++++ b/src/org/gfxtest/framework/GfxTest.java Wed Jul 27 17:15:32 2011 +0200
+@@ -219,11 +219,18 @@
+ {
+ // to be overrided by test cases
+ }
+-
++
+ /**
+ * Method which can be overridden by inherited classes.
+- *
+- * @param configuration configuration of current test case.
++ *
++ * @param image
++ * image representing drawing destination
++ * @param graphics
++ * graphics canvas derived from image object
++ * @param testNumber
++ * test number
++ * @param entityRenderingStyle
++ * object containing entity rendering style
+ */
+ protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle)
+ {
+diff -r e2ffa5184756 src/org/gfxtest/framework/TestImage.java
+--- a/src/org/gfxtest/framework/TestImage.java Wed Jul 27 15:38:53 2011 +0200
++++ b/src/org/gfxtest/framework/TestImage.java Wed Jul 27 17:15:32 2011 +0200
+@@ -48,12 +48,47 @@
+
+ import javax.imageio.ImageIO;
+
++
++
++/**
++ * Class representing raster image on which shapes are rendered.
++ *
++ * @author Pavel Tisnovsky
++ */
+ public class TestImage
+ {
++ /**
++ * Simple logger object.
++ */
+ private Log log = null;
++
++ /**
++ * Size of grid used to draw image background.
++ */
+ private static final int GRID_SIZE = 20;
++
++ /**
++ * Object representing the raster canvas.
++ */
+ private BufferedImage image = null;
+
++ /**
++ * Implicit constructor should be disabled for this object type.
++ */
++ @SuppressWarnings("unused")
++ private TestImage()
++ {
++ // empty as expected :-)
++ }
++
++ /**
++ * Initialization of TestImage object.
++ *
++ * @param configuration
++ * configuration of current test suite
++ * @param zoom
++ * zoom factor
++ */
+ public TestImage(GfxTestConfiguration configuration, int zoom)
+ {
+ this.log = new Log(this.getClass().getName(), false);
+@@ -62,9 +97,11 @@
+
+ /**
+ * Create new buffered image with given width, height and image type.
+- * @param configuration configuration of current test suite
+- * @param zoom zoom factor
+- * @return
++ *
++ * @param configuration
++ * configuration of current test suite
++ * @param zoom
++ * zoom factor
+ */
+ public void createImage(GfxTestConfiguration configuration, int zoom)
+ {
+@@ -77,11 +114,21 @@
+ }
+ }
+
++ /**
++ * Clear the background of the test image ie. fill the whole image with
++ * white color.
++ */
+ protected void clearImage()
+ {
+ fillImage(Color.WHITE);
+ }
+
++ /**
++ * Fill whole image using given color.
++ *
++ * @param color
++ * color used to fill whole image.
++ */
+ public void fillImage(Color color)
+ {
+ Graphics2D graphics = this.image.createGraphics();
+@@ -90,6 +137,16 @@
+ graphics.dispose();
+ }
+
++ /**
++ * Read raster image from external file.
++ *
++ * @param directory
++ * directory containing the image
++ * @param fileName
++ * raster image file name
++ * @return image read from external file
++ * @throws IOException
++ */
+ @SuppressWarnings("nls")
+ protected BufferedImage readImage(File directory, String fileName) throws IOException
+ {
+@@ -98,6 +155,15 @@
+ return ImageIO.read(imageFile);
+ }
+
++ /**
++ * Write raster image to an external file.
++ *
++ * @param directory
++ * directory containing the image
++ * @param fileName
++ * raster image file name
++ * @throws IOException
++ */
+ @SuppressWarnings("nls")
+ private void writeImage(File directory, String fileName) throws IOException
+ {
+@@ -107,30 +173,38 @@
+
+ /**
+ * Write given buffered image to PNG file.
+- *
+- * @param image
++ *
+ * @param configuration
++ * current configuration of GfxTest framework
++ * @param suiteName
++ * name of test suite
+ * @param testName
++ * name of test from the given test suite
+ * @throws IOException
++ * can occurs during PNG file creation
+ */
+ @SuppressWarnings("nls")
+ public void writeImage(GfxTestConfiguration configuration, String suiteName, String testName) throws IOException
+ {
+ this.writeImage(configuration.getOutputPath(), suiteName + "_" + testName + ".png");
+ }
+-
++
+ /**
+ * This method draws grid below the test (rendered) pattern.
+- * @param image reference to the image created by test case
++ *
++ * @param image
++ * reference to the image created by test case
+ */
+ private void drawGrid()
+ {
+ Graphics2D graphics = this.image.createGraphics();
+ graphics.setColor(new Color(0xa0, 0xa0, 0xff));
++ // draw vertical lines
+ for (int x = 0; x < this.image.getWidth(); x += GRID_SIZE)
+ {
+ graphics.drawLine(x, 0, x, this.image.getHeight() - 1);
+ }
++ // draw horizontal lines
+ for (int y = 0; y < this.image.getHeight(); y += GRID_SIZE)
+ {
+ graphics.drawLine(0, y, this.image.getWidth() - 1, y);
+@@ -138,43 +212,92 @@
+ graphics.dispose();
+ }
+
++ /**
++ * Returns graphics2d object for this instance of test image.
++ *
++ * @return graphics2d object for this instance of test image.
++ */
+ public Graphics2D getGraphics()
+ {
+- Graphics2D g2d = (Graphics2D) this.image.getGraphics();
+- g2d.setRenderingHint(java.awt.RenderingHints.KEY_STROKE_CONTROL, java.awt.RenderingHints.VALUE_STROKE_PURE);
+- return g2d;
++ Graphics2D graphics2d = (Graphics2D) this.image.getGraphics();
++ graphics2d.setRenderingHint(java.awt.RenderingHints.KEY_STROKE_CONTROL, java.awt.RenderingHints.VALUE_STROKE_PURE);
++ return graphics2d;
+ }
+
++ /**
++ * Return width of the test image.
++ *
++ * @return width of the test image.
++ */
+ public int getWidth()
+ {
+ return this.image.getWidth();
+ }
+
++ /**
++ * Return height of the test image.
++ *
++ * @return height of the test image.
++ */
+ public int getHeight()
+ {
+ return this.image.getHeight();
+ }
+
++ /**
++ * Return x-coordinate of the center of the test image.
++ *
++ * @return x-coordinate of the center of the test image.
++ */
+ public int getCenterX()
+ {
+ return this.getWidth() >> 1;
+ }
+
++ /**
++ * Return y-coordinate of the center of the test image.
++ *
++ * @return y-coordinate of the center of the test image.
++ */
+ public int getCenterY()
+ {
+ return this.getHeight() >> 1;
+ }
+
++ /**
++ * Return pixel color at given coordinates.
++ *
++ * @param x
++ * the x coordinate of the pixel from which to get the color
++ * @param y
++ * the y coordinate of the pixel from which to get the color
++ * @return color in the default sRGB color space
++ */
+ public int getRGB(int x, int y)
+ {
+ return this.image.getRGB(x, y);
+ }
+
++ /**
++ * Set color of pixel at given coordinates.
++ *
++ * @param x
++ * the x coordinate of the pixel to set the color
++ * @param y
++ * the y coordinate of the pixel to set the color
++ * @param rgb
++ * color in the default sRGB color space
++ */
+ public void setRGB(int x, int y, int rgb)
+ {
+ this.image.setRGB(x, y, rgb);
+ }
+
++ /**
++ * Get the raster image on which this project is based.
++ *
++ * @return raster image
++ */
+ public BufferedImage getImage()
+ {
+ return this.image;
diff -r e2ffa5184756 -r 623e7a4847bf src/org/gfxtest/framework/GfxTest.java
--- a/src/org/gfxtest/framework/GfxTest.java Wed Jul 27 15:38:53 2011 +0200
+++ b/src/org/gfxtest/framework/GfxTest.java Wed Jul 27 17:18:56 2011 +0200
@@ -219,11 +219,18 @@
{
// to be overrided by test cases
}
-
+
/**
* Method which can be overridden by inherited classes.
- *
- * @param configuration configuration of current test case.
+ *
+ * @param image
+ * image representing drawing destination
+ * @param graphics
+ * graphics canvas derived from image object
+ * @param testNumber
+ * test number
+ * @param entityRenderingStyle
+ * object containing entity rendering style
*/
protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle)
{
diff -r e2ffa5184756 -r 623e7a4847bf src/org/gfxtest/framework/TestImage.java
--- a/src/org/gfxtest/framework/TestImage.java Wed Jul 27 15:38:53 2011 +0200
+++ b/src/org/gfxtest/framework/TestImage.java Wed Jul 27 17:18:56 2011 +0200
@@ -48,12 +48,47 @@
import javax.imageio.ImageIO;
+
+
+/**
+ * Class representing raster image on which shapes are rendered.
+ *
+ * @author Pavel Tisnovsky
+ */
public class TestImage
{
+ /**
+ * Simple logger object.
+ */
private Log log = null;
+
+ /**
+ * Size of grid used to draw image background.
+ */
private static final int GRID_SIZE = 20;
+
+ /**
+ * Object representing the raster canvas.
+ */
private BufferedImage image = null;
+ /**
+ * Implicit constructor should be disabled for this object type.
+ */
+ @SuppressWarnings("unused")
+ private TestImage()
+ {
+ // empty as expected :-)
+ }
+
+ /**
+ * Initialization of TestImage object.
+ *
+ * @param configuration
+ * configuration of current test suite
+ * @param zoom
+ * zoom factor
+ */
public TestImage(GfxTestConfiguration configuration, int zoom)
{
this.log = new Log(this.getClass().getName(), false);
@@ -62,9 +97,11 @@
/**
* Create new buffered image with given width, height and image type.
- * @param configuration configuration of current test suite
- * @param zoom zoom factor
- * @return
+ *
+ * @param configuration
+ * configuration of current test suite
+ * @param zoom
+ * zoom factor
*/
public void createImage(GfxTestConfiguration configuration, int zoom)
{
@@ -77,11 +114,21 @@
}
}
+ /**
+ * Clear the background of the test image ie. fill the whole image with
+ * white color.
+ */
protected void clearImage()
{
fillImage(Color.WHITE);
}
+ /**
+ * Fill whole image using given color.
+ *
+ * @param color
+ * color used to fill whole image.
+ */
public void fillImage(Color color)
{
Graphics2D graphics = this.image.createGraphics();
@@ -90,6 +137,16 @@
graphics.dispose();
}
+ /**
+ * Read raster image from external file.
+ *
More information about the distro-pkg-dev
mailing list