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

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

@@ -21,12 +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 javafx.scene;
+package test.javafx.scene;
 
+import javafx.scene.DepthTest;
+import javafx.scene.Group;
+import javafx.scene.Node;
+import javafx.scene.NodeShim;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import javafx.scene.shape.Rectangle;
 

@@ -42,150 +46,150 @@
      * Tests the default value for a single node with no parent
      */
     @Test public void testDepthTestSingleDefault() {
         Node node = new Rectangle();
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
     }
 
     /**
      * Tests the default values for a group node with a child node
      */
     @Test public void testDepthTestParentChildDefaults() {
         Group group = new Group();
         Node node = new Rectangle();
         group.getChildren().add(node);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
     }
 
     /**
      * Tests setting the value for a single node with no parent
      */
     @Test public void testDepthTestSingleSet() {
         Node node = new Rectangle();
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
 
         node.setDepthTest(DepthTest.DISABLE);
         assertEquals(node.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
 
         node.setDepthTest(DepthTest.ENABLE);
         assertEquals(node.getDepthTest(), DepthTest.ENABLE);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
 
         node.setDepthTest(DepthTest.INHERIT);
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
     }
 
     /**
      * Tests setting values for a group node with a child node
      */
     @Test public void testDepthTestParentChildSet() {
         Group group = new Group();
         Node node = new Rectangle();
         group.getChildren().add(node);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.DISABLE);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.ENABLE);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.ENABLE);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.INHERIT);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.DISABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.DISABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.ENABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.ENABLE);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.INHERIT);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.INHERIT);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.DISABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.ENABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.ENABLE);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         node.setDepthTest(DepthTest.DISABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.INHERIT);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.ENABLE);
         assertEquals(group.getDepthTest(), DepthTest.ENABLE);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
     }
 
     /**
      * Tests setting values for a group node with a child node, and ensures

@@ -194,72 +198,72 @@
     @Test public void testDepthTestParentChildRemove() {
         Group group = new Group();
         Node node = new Rectangle();
         group.getChildren().add(node);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.DISABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.getChildren().remove(node);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
         validate(node, true);
 
         group.getChildren().add(node);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.INHERIT);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.getChildren().remove(node);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
         validate(node, true);
 
         group.setDepthTest(DepthTest.DISABLE);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
         validate(node, true);
 
         group.getChildren().add(node);
         assertEquals(group.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
 
         group.setDepthTest(DepthTest.INHERIT);
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(group, true);
     }
 
     /**
      * Tests two levels of children and ensures that the state is correct when

@@ -273,43 +277,43 @@
         group.getChildren().add(node);
         validate(root, true);
 
         root.setDepthTest(DepthTest.DISABLE);
         assertEquals(root.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(root.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(root));
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(root, true);
 
         root.getChildren().remove(group);
         assertEquals(root.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(root.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(root));
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(root, true);
         validate(group, true);
 
         root.getChildren().add(group);
         assertEquals(root.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(root.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(root));
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(root, true);
 
         root.setDepthTest(DepthTest.INHERIT);
         assertEquals(root.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(root.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(root));
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(root, true);
     }
 
     /**
      * Tests two levels of children and ensures that the state is correct when

@@ -326,50 +330,50 @@
         validate(root1, true);
         validate(root2, true);
 
         root1.setDepthTest(DepthTest.DISABLE);
         assertEquals(root1.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(root1.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(root1));
         assertEquals(root2.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(root2.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(root2));
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(root1, true);
         validate(root2, true);
 
         root2.getChildren().add(group);
         assertEquals(root1.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(root1.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(root1));
         assertEquals(root2.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(root2.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(root2));
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(group.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertTrue(node.isDerivedDepthTest());
+        assertTrue(NodeShim.isDerivedDepthTest(node));
         validate(root1, true);
         validate(root2, true);
 
         root2.setDepthTest(DepthTest.DISABLE);
         assertEquals(root1.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(root1.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(root1));
         assertEquals(root2.getDepthTest(), DepthTest.DISABLE);
-        assertFalse(root2.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(root2));
         assertEquals(group.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(group.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(group));
         assertEquals(node.getDepthTest(), DepthTest.INHERIT);
-        assertFalse(node.isDerivedDepthTest());
+        assertFalse(NodeShim.isDerivedDepthTest(node));
         validate(root1, true);
         validate(root2, true);
     }
 
     private void validate(Node n, boolean parentDerivedDepthTest) {
         boolean nodeDerivedDepthTest = n.getDepthTest() == DepthTest.INHERIT
                 ? parentDerivedDepthTest
                 : n.getDepthTest() == DepthTest.ENABLE;
-        assertEquals(nodeDerivedDepthTest, n.isDerivedDepthTest());
+        assertEquals(nodeDerivedDepthTest, NodeShim.isDerivedDepthTest(n));
         if (n instanceof Group) {
             Group g = (Group) n;
             for (Node child : g.getChildren()) {
                 validate(child, nodeDerivedDepthTest);
             }