modules/graphics/src/test/java/test/com/sun/javafx/sg/prism/NGShapeTest.java

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

@@ -21,17 +21,19 @@
  * 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.javafx.sg.prism;
+package test.com.sun.javafx.sg.prism;
 
 import java.util.Arrays;
 import com.sun.javafx.geom.Ellipse2D;
 import com.sun.javafx.geom.RectBounds;
 import com.sun.javafx.geom.Shape;
 import com.sun.javafx.geom.transform.BaseTransform;
+import com.sun.javafx.sg.prism.NGNodeShim;
+import com.sun.javafx.sg.prism.NGShape;
 import com.sun.prism.paint.Color;
 import com.sun.prism.paint.LinearGradient;
 import com.sun.prism.paint.Stop;
 import org.junit.Before;
 import org.junit.Test;

@@ -72,41 +74,41 @@
     }
 
     @Test
     public void hasOpaqueRegionReturnsFalseIfModeIsStroke() {
         shape.setMode(NGShape.Mode.STROKE);
-        assertFalse(shape.hasOpaqueRegion());
+        assertFalse(NGNodeShim.hasOpaqueRegion(shape));
     }
 
     @Test
     public void hasOpaqueRegionReturnsFalseIfModeIsEmpty() {
         shape.setMode(NGShape.Mode.EMPTY);
-        assertFalse(shape.hasOpaqueRegion());
+        assertFalse(NGNodeShim.hasOpaqueRegion(shape));
     }
 
     @Test
     public void hasOpaqueRegionReturnsFalseIfFillPaintIsNull() {
         shape.setFillPaint(null);
-        assertFalse(shape.hasOpaqueRegion());
+        assertFalse(NGNodeShim.hasOpaqueRegion(shape));
     }
 
     @Test
     public void hasOpaqueRegionReturnsFalseIfFillPaintIsNotOpaque() {
         shape.setFillPaint(new LinearGradient(0, 0, 1, 1, BaseTransform.IDENTITY_TRANSFORM, true, 0, Arrays.asList(
                 new Stop(Color.BLACK, 0), new Stop(Color.TRANSPARENT, 1))));
-        assertFalse(shape.hasOpaqueRegion());
+        assertFalse(NGNodeShim.hasOpaqueRegion(shape));
     }
 
     @Test
     public void hasOpaqueRegionReturnsTrueIfModeIsSTROKE_FILE() {
         shape.setMode(NGShape.Mode.STROKE_FILL);
-        assertTrue(shape.hasOpaqueRegion());
+        assertTrue(NGNodeShim.hasOpaqueRegion(shape));
     }
 
     @Test
     public void hasOpaqueRegionReturnsTrueIfModeIsFILL() {
-        assertTrue(shape.hasOpaqueRegion());
+        assertTrue(NGNodeShim.hasOpaqueRegion(shape));
     }
 
     @Test
     public void getOpaqueRegionChangesWhenFillChanged() {
         RectBounds or = shape.getOpaqueRegion();