Mercurial > hg > gfx-test

changeset 727:bc696a59a1b9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated several tests.
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Wed, 03 Jun 2015 10:16:35 +0200
parents e4c14af50378
children e6c0df111443
files ChangeLog src/org/gfxtest/testsuites/BitBltUsingBgColor.java
diffstat 2 files changed, 123 insertions(+), 118 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jun 02 10:59:23 2015 +0200
+++ b/ChangeLog	Wed Jun 03 10:16:35 2015 +0200
@@ -1,3 +1,8 @@
+2015-06-03  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
+	Updated several tests.
+
 2015-06-02  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltUsingBgColor.java:
--- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Tue Jun 02 10:59:23 2015 +0200
+++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java	Wed Jun 03 10:16:35 2015 +0200
@@ -13591,7 +13591,7 @@
     }
 
     /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR.
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_BYTE_INDEXED}.
      * Background color is set to Color.white.
      *
      * @param image
@@ -13600,13 +13600,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGRbackgroundWhite(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGR(image, graphics2d, Color.white);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeByteIndexedBackgroundWhite(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeByteIndexed(image, graphics2d, Color.white);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.black.
      *
      * @param image
@@ -13615,13 +13615,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundBlack(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.black);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundBlack(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.black);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.blue.
      *
      * @param image
@@ -13630,13 +13630,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundBlue(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.blue);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundBlue(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.blue);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.green.
      *
      * @param image
@@ -13645,13 +13645,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundGreen(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.green);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundGreen(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.green);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.cyan.
      *
      * @param image
@@ -13660,13 +13660,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundCyan(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.cyan);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundCyan(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.cyan);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.red.
      *
      * @param image
@@ -13675,13 +13675,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundRed(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.red);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundRed(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.red);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.magenta.
      *
      * @param image
@@ -13690,13 +13690,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundMagenta(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.magenta);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.magenta);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.yellow.
      *
      * @param image
@@ -13705,13 +13705,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundYellow(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.yellow);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_Pre.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundYellow(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.yellow);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_555_RGB}.
      * Background color is set to Color.white.
      *
      * @param image
@@ -13720,13 +13720,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType4ByteABGR_Pre_backgroundWhite(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageType4ByteABGRPre(image, graphics2d, Color.white);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_INT_BGR.
+    public TestResult testBitBltGridBufferedImageTypeUshort555RGBBackgroundWhite(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort555RGB(image, graphics2d, Color.white);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}.
      * Background color is set to Color.black.
      *
      * @param image
@@ -13735,13 +13735,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageTypeIntBGRbackgroundBlack(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageTypeIntBGR(image, graphics2d, Color.black);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_INT_BGR.
+    public TestResult testBitBltGridBufferedImageTypeUshort565RGBBackgroundBlack(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort565RGB(image, graphics2d, Color.black);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}.
      * Background color is set to Color.blue.
      *
      * @param image
@@ -13750,13 +13750,13 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageTypeIntBGRbackgroundBlue(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageTypeIntBGR(image, graphics2d, Color.blue);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type TYPE_INT_BGR.
+    public TestResult testBitBltGridBufferedImageTypeUshort565RGBBackgroundBlue(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort565RGB(image, graphics2d, Color.blue);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}.
      * Background color is set to Color.green.
      *
      * @param image
@@ -13765,13 +13765,43 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageTypeIntBGRbackgroundGreen(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageTypeIntBGR(image, graphics2d, Color.green);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}.
+    public TestResult testBitBltGridBufferedImageTypeUshort565RGBBackgroundGreen(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort565RGB(image, graphics2d, Color.green);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}.
+     * Background color is set to Color.cyan.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltGridBufferedImageTypeUshort565RGBBackgroundCyan(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort565RGB(image, graphics2d, Color.cyan);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}.
+     * Background color is set to Color.red.
+     *
+     * @param image
+     *            image to be used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltGridBufferedImageTypeUshort565RGBBackgroundRed(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort565RGB(image, graphics2d, Color.red);
+    }
+
+    /**
+     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_USHORT_565_RGB}.
      * Background color is set to Color.magenta.
      *
      * @param image
@@ -13780,39 +13810,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageTypeUshortGrayBackgroundMagenta(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageTypeUshortGray(image, graphics2d, Color.magenta);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}.
-     * Background color is set to Color.yellow.
-     *
-     * @param image
-     *            image to be used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltGridBufferedImageTypeUshortGrayBackgroundYellow(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageTypeUshortGray(image, graphics2d, Color.yellow);
-    }
-
-    /**
-     * Test basic BitBlt operation for grid buffered image with type {@link BufferedImage#TYPE_BYTE_GRAY}.
-     * Background color is set to Color.white.
-     *
-     * @param image
-     *            image to be used as a destination for BitBlt-type operations
-     * @param graphics2d
-     *            graphics canvas
-     * @return test result status - PASSED, FAILED or ERROR
-     */
-    public TestResult testBitBltGridBufferedImageTypeUshortGrayBackgroundWhite(TestImage image, Graphics2D graphics2d)
-    {
-        return doBitBltGridBufferedImageTypeUshortGray(image, graphics2d, Color.white);
+    public TestResult testBitBltGridBufferedImageTypeUshort565RGBBackgroundMagenta(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltGridBufferedImageTypeUshort565RGB(image, graphics2d, Color.magenta);
     }
 
     /**