/hg/gfx-test: Test BitBltConvolveOp now extend BitBltBufferedIma...
ptisnovs at icedtea.classpath.org
ptisnovs at icedtea.classpath.org
Mon Jul 22 01:00:31 PDT 2013
changeset 865e71729bdf in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=865e71729bdf
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon Jul 22 10:04:10 2013 +0200
Test BitBltConvolveOp now extend BitBltBufferedImageOp, all related methods are
now in the super class (refactoring only).
BitBltAffineQuadrantRotateTransformOp, BitBltAffineRotateTransformOp,
BitBltAffineScaleTransformOp, BitBltAffineShearTransformOp, BitBltAffineTransformOp,
BitBltAffineTranslateTransformOp:
That classes now extend BitBltAffineTransformOp, not GfxTest directly.
diffstat:
ChangeLog | 13 +
src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java | 3 +-
src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java | 3 +-
src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java | 3 +-
src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java | 3 +-
src/org/gfxtest/testsuites/BitBltAffineTransformOp.java | 192 +---------
src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java | 3 +-
src/org/gfxtest/testsuites/BitBltConvolveOp.java | 113 +-----
8 files changed, 21 insertions(+), 312 deletions(-)
diffs (479 lines):
diff -r 2832ec70cb82 -r 865e71729bdf ChangeLog
--- a/ChangeLog Fri Jul 19 11:06:54 2013 +0200
+++ b/ChangeLog Mon Jul 22 10:04:10 2013 +0200
@@ -1,3 +1,16 @@
+2013-07-22 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java:
+ * src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java:
+ * src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java:
+ * src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java:
+ * src/org/gfxtest/testsuites/BitBltAffineTransformOp.java:
+ * src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java:
+ That classes now extend BitBltAffineTransformOp, not GfxTest directly.
+ * src/org/gfxtest/testsuites/BitBltConvolveOp.java:
+ That test now extend BitBltBufferedImageOp, all related methods are
+ now in the super class (refactoring only).
+
2013-07-19 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/org/gfxtest/testsuites/BitBltBufferedImageOp.java:
diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Fri Jul 19 11:06:54 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineQuadrantRotateTransformOp.java Mon Jul 22 10:04:10 2013 +0200
@@ -40,7 +40,6 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
import org.gfxtest.framework.annotations.BitBltOperation;
import org.gfxtest.framework.annotations.BitBltOperations;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
@@ -61,7 +60,7 @@
@BitBltOperation(BitBltOperations.BITBLT)
@Transformation(Transformations.ROTATION)
@Zoom(1)
-public class BitBltAffineQuadrantRotateTransformOp extends GfxTest
+public class BitBltAffineQuadrantRotateTransformOp extends BitBltAffineTransformOp
{
/**
* Entry point to the test suite.
diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java Fri Jul 19 11:06:54 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineRotateTransformOp.java Mon Jul 22 10:04:10 2013 +0200
@@ -40,7 +40,6 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
import org.gfxtest.framework.annotations.BitBltOperation;
import org.gfxtest.framework.annotations.BitBltOperations;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
@@ -61,7 +60,7 @@
@BitBltOperation(BitBltOperations.BITBLT)
@Transformation(Transformations.ROTATION)
@Zoom(1)
-public class BitBltAffineRotateTransformOp extends GfxTest
+public class BitBltAffineRotateTransformOp extends BitBltAffineTransformOp
{
/**
* Entry point to the test suite.
diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java Fri Jul 19 11:06:54 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineScaleTransformOp.java Mon Jul 22 10:04:10 2013 +0200
@@ -40,7 +40,6 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
import org.gfxtest.framework.annotations.BitBltOperation;
import org.gfxtest.framework.annotations.BitBltOperations;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
@@ -61,7 +60,7 @@
@BitBltOperation(BitBltOperations.BITBLT)
@Transformation(Transformations.SCALE)
@Zoom(1)
-public class BitBltAffineScaleTransformOp extends GfxTest
+public class BitBltAffineScaleTransformOp extends BitBltAffineTransformOp
{
/**
* Entry point to the test suite.
diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java Fri Jul 19 11:06:54 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineShearTransformOp.java Mon Jul 22 10:04:10 2013 +0200
@@ -40,7 +40,6 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
import org.gfxtest.framework.annotations.BitBltOperation;
import org.gfxtest.framework.annotations.BitBltOperations;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
@@ -61,7 +60,7 @@
@BitBltOperation(BitBltOperations.BITBLT)
@Transformation(Transformations.SKEW)
@Zoom(1)
-public class BitBltAffineShearTransformOp extends GfxTest
+public class BitBltAffineShearTransformOp extends BitBltAffineTransformOp
{
/**
* Entry point to the test suite.
diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Fri Jul 19 11:06:54 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineTransformOp.java Mon Jul 22 10:04:10 2013 +0200
@@ -40,18 +40,6 @@
package org.gfxtest.testsuites;
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-
-
-
-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;
@@ -72,186 +60,8 @@
@BitBltOperation(BitBltOperations.BITBLT)
@Transformation(Transformations.VARIOUS)
@Zoom(1)
-public class BitBltAffineTransformOp extends GfxTest
+public class BitBltAffineTransformOp extends BitBltBufferedImageOp
{
- private static final AffineTransform IdentifyTransformation = new AffineTransform();
-
- private static final AffineTransformOp IdentifyTranspormationOp1 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_NEAREST_NEIGHBOR);
- private static final AffineTransformOp IdentifyTranspormationOp2 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BILINEAR);
- private static final AffineTransformOp IdentifyTranspormationOp3 = new AffineTransformOp(IdentifyTransformation, AffineTransformOp.TYPE_BICUBIC);
-
- /**
- * 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
- */
- protected 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
- */
- protected TestResult doBitBltCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
- }
-
- /**
- * Test basic BitBlt operation for buffered image containing diagonal 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
- */
- protected TestResult doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
- }
-
- /**
- * Test basic BitBlt operation for buffered image containing grid 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
- */
- protected TestResult doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
- }
-
- /**
- * Test basic BitBlt operation for buffered image containing diagonal grid 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
- */
- protected TestResult doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
- }
-
- /**
- * 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
- * @return test result status - PASSED, FAILED or ERROR
- */
- public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
- {
- return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1);
- }
-
- /**
- * 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
- * @return test result status - PASSED, FAILED or ERROR
- */
- public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
- {
- return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2);
- }
-
- /**
- * 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
- * @return test result status - PASSED, FAILED or ERROR
- */
- public TestResult testBitBltEmptyBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
- {
- return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3);
- }
-
- /**
- * 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 testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp1(TestImage image, Graphics2D graphics2d)
- {
- return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp1);
- }
-
- /**
- * 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 testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp2(TestImage image, Graphics2D graphics2d)
- {
- return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp2);
- }
-
- /**
- * 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 testBitBltCheckerBufferedImageType3ByteBGRIdentifyTranspormationOp3(TestImage image, Graphics2D graphics2d)
- {
- return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, IdentifyTranspormationOp3);
- }
/**
* Entry point to the test suite.
diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java
--- a/src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java Fri Jul 19 11:06:54 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltAffineTranslateTransformOp.java Mon Jul 22 10:04:10 2013 +0200
@@ -40,7 +40,6 @@
package org.gfxtest.testsuites;
-import org.gfxtest.framework.GfxTest;
import org.gfxtest.framework.annotations.BitBltOperation;
import org.gfxtest.framework.annotations.BitBltOperations;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
@@ -61,7 +60,7 @@
@BitBltOperation(BitBltOperations.BITBLT)
@Transformation(Transformations.TRANSLATE)
@Zoom(1)
-public class BitBltAffineTranslateTransformOp extends GfxTest
+public class BitBltAffineTranslateTransformOp extends BitBltAffineTransformOp
{
/**
* Entry point to the test suite.
diff -r 2832ec70cb82 -r 865e71729bdf src/org/gfxtest/testsuites/BitBltConvolveOp.java
--- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java Fri Jul 19 11:06:54 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java Mon Jul 22 10:04:10 2013 +0200
@@ -41,15 +41,11 @@
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;
@@ -72,7 +68,7 @@
@BitBltOperation(BitBltOperations.BITBLT)
@Transformation(Transformations.NONE)
@Zoom(1)
-public class BitBltConvolveOp extends GfxTest
+public class BitBltConvolveOp extends BitBltBufferedImageOp
{
private static final Kernel NoOpKernel1x1 = new Kernel(1, 1, new float[] {1});
@@ -121,6 +117,7 @@
-1f, -2f, -1f
});
+
private static final ConvolveOp noopKernel1x1ROP = new ConvolveOp(NoOpKernel1x1);
private static final ConvolveOp noopKernel3x3ROP = new ConvolveOp(NoOpKernel3x3);
private static final ConvolveOp noopKernel5x5ROP = new ConvolveOp(NoOpKernel5x5);
@@ -133,112 +130,6 @@
private static final ConvolveOp sobelOperatorGyROP = new ConvolveOp(SobelOperatorGy);
/**
- * 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 empty buffered image with type TYPE_4BYTE_ABGR
- *
- * @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 doBitBltEmptyBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithEmptyImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR, 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 buffered image containing diagonal 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 doBitBltDiagonalCheckerBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithDiagonalCheckerImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
- }
-
- /**
- * Test basic BitBlt operation for buffered image containing grid 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 doBitBltGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
- }
-
- /**
- * Test basic BitBlt operation for buffered image containing diagonal grid 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 doBitBltDiagonalGridBufferedImageType3ByteRGB(TestImage image, Graphics2D graphics2d,
- BufferedImageOp rasterOp)
- {
- return CommonBitmapOperations.doBitBltTestWithDiagonalGridImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR, rasterOp);
- }
-
- /**
* Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR.
*
* @param image
More information about the distro-pkg-dev
mailing list