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

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

@@ -21,19 +21,22 @@
  * 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 com.sun.javafx.test.TransformHelper;
+import test.com.sun.javafx.test.TransformHelper;
 import javafx.scene.transform.Translate;
 import javafx.scene.shape.Rectangle;
 import javafx.beans.Observable;
 import java.lang.reflect.Method;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.NodeShim;
 import javafx.scene.transform.Transform;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class Node_LocalToSceneTransform_Test {

@@ -60,11 +63,11 @@
 
         p.setTranslateX(10);
         p.setRotate(80);
 
         // n didn't react on its parent's transformation
-        TransformHelper.assertMatrix(n.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(n),
                 1, 0, 0, 0,
                 0, 1, 0, 0,
                 0, 0, 1, 0);
     }
 

@@ -212,27 +215,27 @@
 
         n.localToSceneTransformProperty().addListener(lstnr);
 
         // with listener on leave, parents update
         p2.setTranslateX(30);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 30,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // without listener on leave, parents don't update
         n.localToSceneTransformProperty().removeListener(lstnr);
         p2.setTranslateX(60);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 30,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // with listener on leave again, parents update again
         n.localToSceneTransformProperty().addListener(lstnr);
         p2.setTranslateX(90);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 90,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
     }
 

@@ -248,19 +251,19 @@
 
         n.localToSceneTransformProperty().addListener(lstnr);
 
         // with listener on leave, parents update
         p2.setTranslateX(30);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 30,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // without listener on leave, parents don't update immediately
         n.localToSceneTransformProperty().removeListener(lstnr);
         p2.setTranslateX(60);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 30,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // ... but must do it on request:

@@ -283,27 +286,27 @@
 
         n.localToSceneTransformProperty().addListener(lstnr);
 
         // with listener on leave, parents update
         p2.setTranslateX(30);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 30,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // child with listener is moved away, parents stop updating
         g.getChildren().add(n);
         p2.setTranslateX(60);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 30,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // leaf with listener moved back, parents update again
         p1.getChildren().add(n);
         p2.setTranslateX(90);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 90,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
     }
 

@@ -324,27 +327,27 @@
         n.localToSceneTransformProperty().addListener(nlstnr);
         p1.localToSceneTransformProperty().addListener(plstnr);
 
         // with listeners, parents update
         p2.setTranslateX(30);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 30,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // child moved away, but there is still listener on parent
         g.getChildren().add(n);
         p2.setTranslateX(60);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 60,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // removed even the listener on parent, now we can stop updating
         p1.localToSceneTransformProperty().removeListener(plstnr);
         p2.setTranslateX(90);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 60,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // return both listener and child

@@ -352,19 +355,19 @@
         p1.getChildren().add(n);
 
         // remove the listener, must still update because of the child
         p1.localToSceneTransformProperty().removeListener(plstnr);
         p2.setTranslateX(45);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 45,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
 
         // remove the child as well, now we can stop updating
         g.getChildren().add(n);
         p2.setTranslateX(25);
-        TransformHelper.assertMatrix(p1.getCurrentLocalToSceneTransformState(),
+        TransformHelper.assertMatrix(NodeShim.getCurrentLocalToSceneTransformState(p1),
                 1, 0, 0, 45,
                 0, 1, 0,  0,
                 0, 0, 1,  0);
     }