/hg/gfx-test: Added three Convolve operators, two helper methods...

[ptisnovs at icedtea.classpath.org]

changeset e4edaba131e8 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e4edaba131e8
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Mar 08 10:11:09 2013 +0100

	Added three Convolve operators, two helper methods and three new tests
	into the test suite BitBltConvolveOp.


diffstat:

 ChangeLog                                        |    6 +
 src/org/gfxtest/testsuites/BitBltConvolveOp.java |  116 ++++++++++++++++++++++-
 2 files changed, 121 insertions(+), 1 deletions(-)

diffs (152 lines):

diff -r ff7895f8ac1a -r e4edaba131e8 ChangeLog
--- a/ChangeLog	Thu Mar 07 10:04:26 2013 +0100
+++ b/ChangeLog	Fri Mar 08 10:11:09 2013 +0100
@@ -1,3 +1,9 @@
+2013-03-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltConvolveOp.java:
+	Added three Convolve operators, two helper methods and three new tests
+	into the test suite BitBltConvolveOp.
+
 2013-03-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltRescaleOp.java:
diff -r ff7895f8ac1a -r e4edaba131e8 src/org/gfxtest/testsuites/BitBltConvolveOp.java
--- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java	Thu Mar 07 10:04:26 2013 +0100
+++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java	Fri Mar 08 10:11:09 2013 +0100
@@ -1,7 +1,7 @@
 /*
   Java gfx-test framework
 
-   Copyright (C) 2012  Red Hat
+   Copyright (C) 2012, 2013  Red Hat
 
 This file is part of IcedTea.
 
@@ -40,12 +40,126 @@
 
 package org.gfxtest.testsuites;
 
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ConvolveOp;
+import java.awt.image.Kernel;
+
+
+
+import org.gfxtest.framework.CommonBitmapOperations;
 import org.gfxtest.framework.GfxTest;
+import org.gfxtest.framework.TestImage;
+import org.gfxtest.framework.TestResult;
+import org.gfxtest.framework.annotations.BitBltOperation;
+import org.gfxtest.framework.annotations.BitBltOperations;
+import org.gfxtest.framework.annotations.GraphicsPrimitive;
+import org.gfxtest.framework.annotations.GraphicsPrimitives;
+import org.gfxtest.framework.annotations.RenderStyle;
+import org.gfxtest.framework.annotations.RenderStyles;
+import org.gfxtest.framework.annotations.TestType;
+import org.gfxtest.framework.annotations.TestTypes;
+import org.gfxtest.framework.annotations.Transformation;
+import org.gfxtest.framework.annotations.Transformations;
+import org.gfxtest.framework.annotations.Zoom;
 
+
+
+ at TestType(TestTypes.RENDER_TEST)
+ at GraphicsPrimitive(GraphicsPrimitives.COMMON_BITMAP)
+ at RenderStyle(RenderStyles.NORMAL)
+ at BitBltOperation(BitBltOperations.BITBLT)
+ at Transformation(Transformations.NONE)
+ at Zoom(1)
 public class BitBltConvolveOp extends GfxTest
 {
+    private static final Kernel NoOpKernel = new Kernel(1, 1, new float[] {1});
+    private static final Kernel SmoothingKernel1 = new Kernel(2, 2, new float[] {1/4f, 1/4f, 1/4f, 1/4f});
+    private static final Kernel SmoothingKernel2 = new Kernel(3, 3, new float[] {1/9f, 1/9f, 1/9f, 1/9f, 1/9f, 1/9f, 1/9f, 1/9f, 1/9f});
+
+    private static final ConvolveOp noopROP = new ConvolveOp(NoOpKernel);
+    private static final ConvolveOp smoothingROP1 = new ConvolveOp(SmoothingKernel1);
+    private static final ConvolveOp smoothingROP2 = new ConvolveOp(SmoothingKernel2);
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    private TestResult doBitBltEmptyBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
+    }
+
+    /**
+     * Test basic BitBlt operation for buffered image containing checker pattern
+     * with type TYPE_3BYTE_BGR
+     * 
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @param rasterOp
+     *            selected raster operation
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    private TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
+                    BufferedImageOp rasterOp)
+    {
+        return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
+    }
     
     /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundNoOpROP(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, noopROP);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundSmoothingROP1(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, smoothingROP1);
+    }
+
+    /**
+     * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundSmoothingROP2(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, smoothingROP2);
+    }
+
+    /**
      * Entry point to the test suite.
      *
      * @param args not used in this case