modules/graphics/src/test/java/test/javafx/scene/PickAndContainsTest.java

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

@@ -21,12 +21,15 @@
  * 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 javafx.scene;
+package test.javafx.scene;
 
+import javafx.scene.Group;
+import javafx.scene.Scene;
+import javafx.scene.SceneShim;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import javafx.scene.shape.Circle;

@@ -50,25 +53,25 @@
         Rectangle rect = new Rectangle(50, 25, 100, 50);
         Group g = new Group();
         g.getChildren().add(rect);
         Scene scene = new Scene(g);
 
-        assertSame(rect, scene.test_pick(100, 50));
-        assertNull(scene.test_pick(0, 0));
-        assertNull(scene.test_pick(160, 50));
+        assertSame(rect, SceneShim.test_pick(scene,100, 50));
+        assertNull(SceneShim.test_pick(scene,0, 0));
+        assertNull(SceneShim.test_pick(scene,160, 50));
     }
 
     @Test
     public void testScenePickingCircle() {
         Circle circle = new Circle(60, 60, 50);
         Group g = new Group();
         g.getChildren().add(circle);
         Scene scene = new Scene(g);
 
-        assertSame(circle, scene.test_pick(100, 50));
-        assertNull(scene.test_pick(0, 0));
-        assertNull(scene.test_pick(160, 50));
+        assertSame(circle, SceneShim.test_pick(scene,100, 50));
+        assertNull(SceneShim.test_pick(scene,0, 0));
+        assertNull(SceneShim.test_pick(scene,160, 50));
     }
 
     @Test
     public void testScenePickingGroup() {
         Group grp;

@@ -87,43 +90,43 @@
         r1.setId("Rect 1");
         r2.setId("Rect 2");
         
         int pickX = 100;
         int pickY = 100;
-        assertSame(r0, scene.test_pick(pickX, pickY));
+        assertSame(r0, SceneShim.test_pick(scene,pickX, pickY));
         assertFalse(grp.contains(pickX, pickY));
         assertTrue(r0.contains(pickX, pickY));
         assertFalse(r1.contains(pickX, pickY));
         assertFalse(r2.contains(pickX, pickY));
 
         pickX = 45;
         pickY = 50;
-        assertNull(scene.test_pick(pickX, pickY));
+        assertNull(SceneShim.test_pick(scene,pickX, pickY));
         assertFalse(grp.contains(pickX, pickY));
         assertFalse(r0.contains(pickX, pickY));
         assertFalse(r1.contains(pickX, pickY));
         assertFalse(r2.contains(pickX, pickY));
 
         pickX = 38;
         pickY = 18;
-        assertSame(r1, scene.test_pick(pickX, pickY));
+        assertSame(r1, SceneShim.test_pick(scene,pickX, pickY));
         assertTrue(grp.contains(pickX, pickY));
         assertFalse(r0.contains(pickX, pickY));
         assertTrue(r1.contains(pickX, pickY));
         assertFalse(r2.contains(pickX, pickY));
 
         pickX = 230;
         pickY = 215;
-        assertSame(r2, scene.test_pick(pickX, pickY));
+        assertSame(r2, SceneShim.test_pick(scene,pickX, pickY));
         assertTrue(grp.contains(pickX, pickY));
         assertFalse(r0.contains(pickX, pickY));
         assertFalse(r1.contains(pickX, pickY));
         assertTrue(r2.contains(pickX, pickY));
 
         pickX = 120;
         pickY = 110;
-        assertSame(r0, scene.test_pick(pickX, pickY));
+        assertSame(r0, SceneShim.test_pick(scene,pickX, pickY));
     }
 
     @Test
     public void testScenePickingGroupAndClip() {
         Group grp;

@@ -141,27 +144,27 @@
         r2.setId("Rect 2");
         grp.setClip(new Circle(120,120,120));
 
         int pickX = 38;
         int pickY = 18;
-        assertNull(scene.test_pick(pickX, pickY));
+        assertNull(SceneShim.test_pick(scene,pickX, pickY));
         assertFalse(grp.contains(pickX, pickY));
         assertFalse(r0.contains(pickX, pickY));
         assertFalse(r1.contains(pickX, pickY));
         assertFalse(r2.contains(pickX, pickY));
 
         pickX = 230;
         pickY = 215;
-        assertNull(scene.test_pick(pickX, pickY));
+        assertNull(SceneShim.test_pick(scene,pickX, pickY));
         assertFalse(grp.contains(pickX, pickY));
         assertFalse(r0.contains(pickX, pickY));
         assertFalse(r1.contains(pickX, pickY));
         assertTrue(r2.contains(pickX, pickY));
 
         pickX = 120;
         pickY = 110;
-        assertSame(r0, scene.test_pick(pickX, pickY));
+        assertSame(r0, SceneShim.test_pick(scene,pickX, pickY));
     }
 
     @Test
     public void testScenePickingGroupAndClipWithPickOnBounds() {
         Group grp;

@@ -180,23 +183,23 @@
         grp.setClip(new Circle(120,120,120));
         grp.getClip().setPickOnBounds(true);
 
         int pickX = 38;
         int pickY = 18;
-        assertNull(scene.test_pick(pickX, pickY));
+        assertNull(SceneShim.test_pick(scene,pickX, pickY));
         assertFalse(grp.contains(pickX, pickY));
         assertFalse(r0.contains(pickX, pickY));
         assertFalse(r1.contains(pickX, pickY));
         assertFalse(r2.contains(pickX, pickY));
 
         pickX = 230;
         pickY = 215;
-        assertSame(r2, scene.test_pick(pickX, pickY));
+        assertSame(r2, SceneShim.test_pick(scene,pickX, pickY));
 
         pickX = 120;
         pickY = 110;
-        assertSame(r0, scene.test_pick(pickX, pickY));
+        assertSame(r0, SceneShim.test_pick(scene,pickX, pickY));
     }
 
     @Test
     public void testSceneGroupPickOnBounds() {
         Group grp;

@@ -214,15 +217,15 @@
         r2.setId("Rect 2");
 
         int pickX = 45;
         int pickY = 50;
 
-        assertNull(scene.test_pick(pickX, pickY));
+        assertNull(SceneShim.test_pick(scene,pickX, pickY));
         
         grp.setPickOnBounds(true);
 
-        assertSame(grp, scene.test_pick(pickX, pickY));
+        assertSame(grp, SceneShim.test_pick(scene,pickX, pickY));
         assertTrue(grp.contains(pickX, pickY));
         assertFalse(r0.contains(pickX, pickY));
         assertFalse(r1.contains(pickX, pickY));
         assertFalse(r2.contains(pickX, pickY));
     }