/hg/gfx-test: Added support for creating crossed closed paths wi...

[ptisnovs at icedtea.classpath.org]

changeset 2887645db444 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=2887645db444
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Nov 22 10:27:36 2012 +0100

	Added support for creating crossed closed paths with one quadratic segment.
	Added new test into the suite ClippingPathByEllipseShape.


diffstat:

 ChangeLog                                                  |   8 ++
 src/org/gfxtest/framework/CommonPathsGenerator.java        |  38 +++++++++++++-
 src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java |  38 ++++++++++++++
 3 files changed, 82 insertions(+), 2 deletions(-)

diffs (125 lines):

diff -r ed3de89b5f79 -r 2887645db444 ChangeLog
--- a/ChangeLog	Wed Nov 21 13:12:47 2012 +0100
+++ b/ChangeLog	Thu Nov 22 10:27:36 2012 +0100
@@ -1,3 +1,11 @@
+2012-11-22  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/framework/CommonPathsGenerator.java:
+	Added support for creating crossed closed paths with one quadratic
+	segment.
+	* src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java:
+	Added new test.
+
 2012-11-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltBasicTests.java:
diff -r ed3de89b5f79 -r 2887645db444 src/org/gfxtest/framework/CommonPathsGenerator.java
--- a/src/org/gfxtest/framework/CommonPathsGenerator.java	Wed Nov 21 13:12:47 2012 +0100
+++ b/src/org/gfxtest/framework/CommonPathsGenerator.java	Thu Nov 22 10:27:36 2012 +0100
@@ -821,7 +821,24 @@
 
     public static Path2D createCrossedClosedPathContainingQuadraticSegmentFloat(int width, int height)
     {
-        return null;
+        Path2D path = new Path2D.Float();
+        // 1st vertex
+        int x1 = LINE_PATH_OFFSET;
+        int y1 = LINE_PATH_OFFSET;
+        // 2nd vertex
+        int x2 = width - LINE_PATH_OFFSET;
+        int y2 = height - LINE_PATH_OFFSET * 4;
+        // 3rd vertex
+        int x3 = x2;
+        int y3 = y1;
+        // 4rd vertex
+        int x4 = x1;
+        int y4 = y2;
+        path.moveTo(x1, y1);
+        path.quadTo(x2, y2, x3, y3);
+        path.lineTo(x4, y4);
+        path.closePath();
+        return path;
     }
 
     public static Path2D createCrossedClosedPathContainingQuadraticSegmentDouble(TestImage image)
@@ -831,7 +848,24 @@
 
     public static Path2D createCrossedClosedPathContainingQuadraticSegmentDouble(int width, int height)
     {
-        return null;
+        Path2D path = new Path2D.Double();
+        // 1st vertex
+        int x1 = LINE_PATH_OFFSET;
+        int y1 = LINE_PATH_OFFSET;
+        // 2nd vertex
+        int x2 = width - LINE_PATH_OFFSET;
+        int y2 = height - LINE_PATH_OFFSET * 4;
+        // 3rd vertex
+        int x3 = x2;
+        int y3 = y1;
+        // 4rd vertex
+        int x4 = x1;
+        int y4 = y2;
+        path.moveTo(x1, y1);
+        path.quadTo(x2, y2, x3, y3);
+        path.lineTo(x4, y4);
+        path.closePath();
+        return path;
     }
 
     public static Path2D createCrossedClosedPathContainingCubicSegmentFloat(TestImage image)
diff -r ed3de89b5f79 -r 2887645db444 src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java
--- a/src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java	Wed Nov 21 13:12:47 2012 +0100
+++ b/src/org/gfxtest/testsuites/ClippingPathByEllipseShape.java	Thu Nov 22 10:27:36 2012 +0100
@@ -201,6 +201,24 @@
     }
 
     /**
+     * Draw crossed path containing quadratic segment clipped by an ellipse shape.
+     * 
+     * @param image
+     *            work image
+     * @param graphics2d
+     *            graphics canvas
+     */
+    private static void drawCrossedPathContainingQuadraticSegmentClippedByEllipseShape(TestImage image, Graphics2D graphics2d)
+    {
+        // prepare canvas for the rendering
+        basicSetupForRendering(image, graphics2d);
+        // set stroke color
+        CommonRenderingStyles.setStrokeColor(graphics2d);
+        // draw the crossed path
+        graphics2d.draw(CommonPathsGenerator.createCrossedClosedPathContainingQuadraticSegmentFloat(image));
+    }
+
+    /**
      * Check if line path could be clipped by an ellipse shape. Path is rendered
      * using stroke paint with default stroke width.
      * Line path is constructed using new Path.Float()
@@ -323,6 +341,26 @@
     }
 
     /**
+     * Check if crossed closed path could be clipped by an ellipse shape. Path
+     * is rendered using stroke paint with default stroke width.
+     * 
+     * @param image
+     *            work image
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testClipCrossedClosedPathContainingQuadraticSegmentByEllipseShapeStrokePaint(TestImage image, Graphics2D graphics2d)
+    {
+        // render ellipse which is used as a clip shape
+        CommonClippingOperations.renderClipEllipse(image, graphics2d);
+        // set clip region and draw the path
+        drawCrossedPathContainingQuadraticSegmentClippedByEllipseShape(image, graphics2d);
+        // test result
+        return TestResult.PASSED;
+    }
+
+    /**
      * Check if line path could be clipped by an ellipse shape. Path is
      * rendered using stroke paint with zero stroke width.
      * Line path is constructed using new Path.Float()