modules/graphics/src/test/java/test/javafx/scene/layout/BorderPaneTest.java

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

@@ -21,15 +21,18 @@
  * 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.layout;
+package test.javafx.scene.layout;
 
+import test.javafx.scene.layout.MockBiased;
 import javafx.geometry.Insets;
 import static org.junit.Assert.*;
 import javafx.geometry.Orientation;
+import javafx.scene.ParentShim;
+import javafx.scene.layout.BorderPane;
 import org.junit.Before;
 import org.junit.Ignore;
 
 import org.junit.Test;
 

@@ -65,11 +68,11 @@
         assertEquals(0, node.getLayoutX(), 1e-100);
         assertEquals(0, node.getLayoutY(), 1e-100);
         assertEquals(100, node.getWidth(), 1e-100);
         assertEquals(200, node.getHeight(), 1e-100);
 
-        borderpane.getChildren().remove(node);
+        ParentShim.getChildren(borderpane).remove(node);
         assertNull(borderpane.getCenter());
 
         borderpane.setLeft(node);
         assertNull(borderpane.getCenter());
         assertSame(node, borderpane.getLeft());

@@ -82,11 +85,11 @@
         assertEquals(0, node.getLayoutX(), 1e-100);
         assertEquals(0, node.getLayoutY(), 1e-100);
         assertEquals(100, node.getWidth(), 1e-100);
         assertEquals(200, node.getHeight(), 1e-100);
 
-        borderpane.getChildren().remove(node);
+        ParentShim.getChildren(borderpane).remove(node);
         assertNull(borderpane.getLeft());
 
         borderpane.setRight(node);
         assertNull(borderpane.getCenter());
         assertNull(borderpane.getLeft());

@@ -99,11 +102,11 @@
         assertEquals(0, node.getLayoutX(), 1e-100);
         assertEquals(0, node.getLayoutY(), 1e-100);
         assertEquals(100, node.getWidth(), 1e-100);
         assertEquals(200, node.getHeight(), 1e-100);
 
-        borderpane.getChildren().remove(node);
+        ParentShim.getChildren(borderpane).remove(node);
         assertNull(borderpane.getRight());
 
         borderpane.setBottom(node);
         assertNull(borderpane.getCenter());
         assertNull(borderpane.getLeft());

@@ -116,11 +119,11 @@
         assertEquals(0, node.getLayoutX(), 1e-100);
         assertEquals(0, node.getLayoutY(), 1e-100);
         assertEquals(100, node.getWidth(), 1e-100);
         assertEquals(200, node.getHeight(), 1e-100);
 
-        borderpane.getChildren().remove(node);
+        ParentShim.getChildren(borderpane).remove(node);
         assertNull(borderpane.getBottom());
 
         borderpane.setTop(node);
         assertNull(borderpane.getCenter());
         assertNull(borderpane.getLeft());

@@ -133,22 +136,22 @@
         assertEquals(0, node.getLayoutX(), 1e-100);
         assertEquals(0, node.getLayoutY(), 1e-100);
         assertEquals(100, node.getWidth(), 1e-100);
         assertEquals(200, node.getHeight(), 1e-100);
 
-        borderpane.getChildren().remove(node);
+        ParentShim.getChildren(borderpane).remove(node);
         assertNull(borderpane.getTop());
 
     }
 
     @Test public void testCenterChildOnly() {
         MockResizable center = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setCenter(center);
 
         assertEquals(center, borderpane.getCenter());
-        assertEquals(1, borderpane.getChildren().size());
-        assertEquals(center, borderpane.getChildren().get(0));
+        assertEquals(1, ParentShim.getChildren(borderpane).size());
+        assertEquals(center, ParentShim.getChildren(borderpane).get(0));
         assertEquals(10, borderpane.minWidth(-1), 1e-100);
         assertEquals(20, borderpane.minHeight(-1), 1e-100);
         assertEquals(100, borderpane.prefWidth(-1), 1e-100);
         assertEquals(200, borderpane.prefHeight(-1), 1e-100);
         assertEquals(Double.MAX_VALUE, borderpane.maxWidth(-1), 1e-100);

@@ -166,12 +169,12 @@
     @Test public void testTopChildOnly() {
         MockResizable top = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setTop(top);
 
         assertEquals(top, borderpane.getTop());
-        assertEquals(1, borderpane.getChildren().size());
-        assertEquals(top, borderpane.getChildren().get(0));
+        assertEquals(1, ParentShim.getChildren(borderpane).size());
+        assertEquals(top, ParentShim.getChildren(borderpane).get(0));
         assertEquals(10, borderpane.minWidth(-1), 1e-100);
         assertEquals(200, borderpane.minHeight(-1), 1e-100); // Top is always at it's pref height
         assertEquals(100, borderpane.prefWidth(-1), 1e-100);
         assertEquals(200, borderpane.prefHeight(-1), 1e-100);
         assertEquals(Double.MAX_VALUE, borderpane.maxWidth(-1), 1e-100);

@@ -188,12 +191,12 @@
     @Test public void testBottomChildOnly() {
         MockResizable bottom = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setBottom(bottom);
 
         assertEquals(bottom, borderpane.getBottom());
-        assertEquals(1, borderpane.getChildren().size());
-        assertEquals(bottom, borderpane.getChildren().get(0));
+        assertEquals(1, ParentShim.getChildren(borderpane).size());
+        assertEquals(bottom, ParentShim.getChildren(borderpane).get(0));
         assertEquals(10, borderpane.minWidth(-1), 1e-100);
         assertEquals(200, borderpane.minHeight(-1), 1e-100);  // Bottom is always at it's pref height
         assertEquals(100, borderpane.prefWidth(-1), 1e-100);
         assertEquals(200, borderpane.prefHeight(-1), 1e-100);
         assertEquals(Double.MAX_VALUE, borderpane.maxWidth(-1), 1e-100);

@@ -210,12 +213,12 @@
     @Test public void testRightChildOnly() {
         MockResizable right = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setRight(right);
 
         assertEquals(right, borderpane.getRight());
-        assertEquals(1, borderpane.getChildren().size());
-        assertEquals(right, borderpane.getChildren().get(0));
+        assertEquals(1, ParentShim.getChildren(borderpane).size());
+        assertEquals(right, ParentShim.getChildren(borderpane).get(0));
         assertEquals(100, borderpane.minWidth(-1), 1e-100);
         assertEquals(20, borderpane.minHeight(-1), 1e-100);
         assertEquals(100, borderpane.prefWidth(-1), 1e-100);
         assertEquals(200, borderpane.prefHeight(-1), 1e-100);
         assertEquals(Double.MAX_VALUE, borderpane.maxWidth(-1), 1e-100);

@@ -232,12 +235,12 @@
     @Test public void testLeftChildOnly() {
         MockResizable left = new MockResizable(10,20, 100,200, 700,800);
         borderpane.setLeft(left);
 
         assertEquals(left, borderpane.getLeft());
-        assertEquals(1, borderpane.getChildren().size());
-        assertEquals(left, borderpane.getChildren().get(0));
+        assertEquals(1, ParentShim.getChildren(borderpane).size());
+        assertEquals(left, ParentShim.getChildren(borderpane).get(0));
         assertEquals(100, borderpane.minWidth(-1), 1e-100);
         assertEquals(20, borderpane.minHeight(-1), 1e-100);
         assertEquals(100, borderpane.prefWidth(-1), 1e-100);
         assertEquals(200, borderpane.prefHeight(-1), 1e-100);
         assertEquals(Double.MAX_VALUE, borderpane.maxWidth(-1), 1e-100);

@@ -261,21 +264,21 @@
         MockResizable left = new MockResizable(10,100, 15,150, 1000,1000);
         borderpane.setLeft(left);
         MockResizable right = new MockResizable(50,115, 60,120, 1000,1000);
         borderpane.setRight(right);
 
-        assertEquals(5, borderpane.getChildren().size());
+        assertEquals(5, ParentShim.getChildren(borderpane).size());
         assertEquals(center, borderpane.getCenter());
         assertEquals(top, borderpane.getTop());
         assertEquals(bottom, borderpane.getBottom());
         assertEquals(left, borderpane.getLeft());
         assertEquals(right, borderpane.getRight());
-        assertTrue(borderpane.getChildren().contains(center));
-        assertTrue(borderpane.getChildren().contains(top));
-        assertTrue(borderpane.getChildren().contains(bottom));
-        assertTrue(borderpane.getChildren().contains(left));
-        assertTrue(borderpane.getChildren().contains(right));
+        assertTrue(ParentShim.getChildren(borderpane).contains(center));
+        assertTrue(ParentShim.getChildren(borderpane).contains(top));
+        assertTrue(ParentShim.getChildren(borderpane).contains(bottom));
+        assertTrue(ParentShim.getChildren(borderpane).contains(left));
+        assertTrue(ParentShim.getChildren(borderpane).contains(right));
 
         assertEquals(100, borderpane.minWidth(-1), 1e-100);
         assertEquals(top.prefHeight(-1) + bottom.prefHeight(-1) +
                 Math.max(center.minHeight(-1), Math.max(left.minHeight(-1), right.minHeight(-1))),
                 borderpane.minHeight(-1), 1e-100);