/hg/gfx-test: Added another helper method into CommonBitmapOpera...

[ptisnovs at icedtea.classpath.org]

changeset d4dc0f90ced3 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=d4dc0f90ced3
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Tue Feb 26 11:27:37 2013 +0100

	Added another helper method into CommonBitmapOperations.
	RasterOp attributes added to the test BitBltRescaleOp.java.


diffstat:

 ChangeLog                                             |   7 +++
 src/org/gfxtest/framework/CommonBitmapOperations.java |  27 ++++++++++++
 src/org/gfxtest/testsuites/BitBltRescaleOp.java       |  41 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 1 deletions(-)

diffs (113 lines):

diff -r ac1a36500a48 -r d4dc0f90ced3 ChangeLog
--- a/ChangeLog	Mon Feb 25 11:27:41 2013 +0100
+++ b/ChangeLog	Tue Feb 26 11:27:37 2013 +0100
@@ -1,3 +1,10 @@
+2013-02-26  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/framework/CommonBitmapOperations.java:
+	Added another helper method into CommonBitmapOperations.
+	* src/org/gfxtest/testsuites/BitBltRescaleOp.java:
+	RasterOp attributes added to this test.
+
 2013-02-25  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/framework/CommonBitmapOperations.java:
diff -r ac1a36500a48 -r d4dc0f90ced3 src/org/gfxtest/framework/CommonBitmapOperations.java
--- a/src/org/gfxtest/framework/CommonBitmapOperations.java	Mon Feb 25 11:27:41 2013 +0100
+++ b/src/org/gfxtest/framework/CommonBitmapOperations.java	Tue Feb 26 11:27:37 2013 +0100
@@ -707,6 +707,33 @@
     }
 
     /**
+     * Create new buffered image containing checker pattern and then perform
+     * basic BitBlt test.
+     * 
+     * @param image
+     *            image to which another image is to be drawn
+     * @param graphics2d
+     *            graphics canvas
+     * @param imageType
+     *            type of the created image
+     * @param rop
+     *            selected raster operation
+     */
+    public static TestResult doBitBltTestWithCheckerImage(TestImage image, Graphics2D graphics2d, int imageType, BufferedImageOp rop)
+    {
+        // create new buffered bitmap with given type
+        // bitmap should contains checker pattern
+        BufferedImage bufferedImage = ImageFactory.createCheckerImage(GRID_SIZE, DEFAULT_TEST_IMAGE_WIDTH, DEFAULT_TEST_IMAGE_HEIGHT, imageType);
+        // basic check if buffered image was created
+        if (bufferedImage == null)
+        {
+            return TestResult.FAILED;
+        }
+        // BitBlt with 1:1 scaling, no flipping and no cropping and using RescaleOp
+        return performBitBlt(bufferedImage, image, graphics2d, rop) ? TestResult.PASSED : TestResult.FAILED;
+    }
+
+    /**
      * Create new buffered image containing diagonal checker pattern and then perform basic BitBlt test.
      *
      * @param image
diff -r ac1a36500a48 -r d4dc0f90ced3 src/org/gfxtest/testsuites/BitBltRescaleOp.java
--- a/src/org/gfxtest/testsuites/BitBltRescaleOp.java	Mon Feb 25 11:27:41 2013 +0100
+++ b/src/org/gfxtest/testsuites/BitBltRescaleOp.java	Tue Feb 26 11:27:37 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,10 +40,49 @@
 
 package org.gfxtest.testsuites;
 
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.RescaleOp;
+
+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 BitBltRescaleOp extends GfxTest
 {
+    private static final float NoFilterScale = 1.0f;
+    private static final float ZeroOffset = 0.0f;
+    private static final float DarkeningOffset = -128;
+    private static final float LighteningOffset =  127f;
+
+    private static final float WhiteImageOffset = 255f;
+    private static final float BlackImageOffset = -255f;
+
+    private static final RescaleOp noOpROP = new RescaleOp(NoFilterScale, ZeroOffset, null);
+    private static final RescaleOp darkenROP = new RescaleOp(NoFilterScale, DarkeningOffset, null);
+    private static final RescaleOp lightenROP = new RescaleOp(NoFilterScale, LighteningOffset, null);
+
     
     /**
      * Entry point to the test suite.