modules/graphics/src/test/java/test/com/sun/prism/StrokedShapeTest.java

rev 9250 : 8134762: Refactor Javafx graphics module tests for clear separation of tests
Reviewed-by:

@@ -21,14 +21,16 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.sun.prism;
+package test.com.sun.prism;
 
 import com.sun.javafx.geom.Path2D;
 import com.sun.javafx.geom.transform.BaseTransform;
+import com.sun.prism.BasicStroke;
+import com.sun.prism.BasicStrokeShim;
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class StrokedShapeTest {

@@ -37,11 +39,11 @@
     Path2D path;
 
     @Before
     public void setUp() {
         stroke = new BasicStroke();
-        stroke.width = 10;
+        BasicStrokeShim.set_width(stroke, 10);
         path = new Path2D();
         path.moveTo(0, 0);
     }
 
     @Test

@@ -51,15 +53,15 @@
     }
 
     @Test
     public void lineTo_cap() {
         path.lineTo(3, 4);
-        stroke.cap = BasicStroke.CAP_SQUARE;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_SQUARE);
         assertBounds(-7, -7, 10, 11);
-        stroke.cap = BasicStroke.CAP_BUTT;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_BUTT);
         assertBounds(-4, -3, 7, 7);
-        stroke.cap = BasicStroke.CAP_ROUND;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_ROUND);
         assertBounds(-5, -5, 8, 9);
     }
 
     @Test
     public void quadTo() {

@@ -68,15 +70,15 @@
     }
 
     @Test
     public void quadTo_cap() {
         path.quadTo(3, 4, 6, 0);
-        stroke.cap = BasicStroke.CAP_SQUARE;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_SQUARE);
         assertBounds(-7, -7, 13, 7);
-        stroke.cap = BasicStroke.CAP_BUTT;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_BUTT);
         assertBounds(-4, -3, 10, 7);
-        stroke.cap = BasicStroke.CAP_ROUND;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_ROUND);
         assertBounds(-5, -5, 11, 7);
     }
     
     @Test
     public void curveTo() {

@@ -86,55 +88,55 @@
     }
     
     @Test
     public void curveTo_cap() {
         path.curveTo(3, 4, 6, 0, 9, 4);
-        stroke.cap = BasicStroke.CAP_SQUARE;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_SQUARE);
         assertBounds(-7, -7, 16, 11);
-        stroke.cap = BasicStroke.CAP_BUTT;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_BUTT);
         assertBounds(-4, -3, 13, 7);
-        stroke.cap = BasicStroke.CAP_ROUND;
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_ROUND);
         assertBounds(-5, -5, 14, 9);
     }
     
     @Test
     public void lineLine_join() {
-        stroke.cap = BasicStroke.CAP_ROUND; // for easy computation
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_ROUND); // for easy computation
         path.lineTo(3, 4);
         path.lineTo(6, 0);
-        stroke.join = BasicStroke.JOIN_MITER;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_MITER);
         assertBounds(-5, -5, 11, 12.33f);
-        stroke.join = BasicStroke.JOIN_BEVEL;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_BEVEL);
         assertBounds(-5, -5, 11, 7);
-        stroke.join = BasicStroke.JOIN_ROUND;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_ROUND);
         assertBounds(-5, -5, 11, 9);
     }
     
     @Test
     public void lineQuad_join() {
-        stroke.cap = BasicStroke.CAP_ROUND; // for easy computation
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_ROUND); // for easy computation
         path.lineTo(3, 4);
         path.quadTo(6, 0, 10, 4);
-        stroke.join = BasicStroke.JOIN_MITER;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_MITER);
         assertBounds(-5, -5, 15, 12.33f);
-        stroke.join = BasicStroke.JOIN_BEVEL;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_BEVEL);
         assertBounds(-5, -5, 15, 9); //a better test here? (width accumulates more than join)
-        stroke.join = BasicStroke.JOIN_ROUND;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_ROUND);
         assertBounds(-5, -5, 15, 9);
     }
     
     
     @Test
     public void lineCurve_join() {
-        stroke.cap = BasicStroke.CAP_ROUND; // for easy computation
+        BasicStrokeShim.set_cap(stroke, BasicStroke.CAP_ROUND); // for easy computation
         path.lineTo(3, 4);
         path.curveTo(6, 0, 0, 0, 10, 4);
-        stroke.join = BasicStroke.JOIN_MITER;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_MITER);
         assertBounds(-5, -5, 15, 12.33f);
-        stroke.join = BasicStroke.JOIN_BEVEL;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_BEVEL);
         assertBounds(-5, -5, 15, 9); //a better test here? (width accumulates more than join)
-        stroke.join = BasicStroke.JOIN_ROUND;
+        BasicStrokeShim.set_join(stroke, BasicStroke.JOIN_ROUND);
         assertBounds(-5, -5, 15, 9);
     }
     
     private void assertBounds(float x0, float y0, float x1, float y1) {
         float[] bbox = new float[]{0, 0, 0, 0};