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

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

@@ -21,21 +21,31 @@
  * 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.MockNode;
+import test.javafx.scene.layout.MockBiased;
+import test.javafx.scene.layout.MockRegion;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.geometry.VPos;
+import javafx.scene.ParentShim;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.GridPaneShim;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.RowConstraints;
 import javafx.scene.shape.Rectangle;
 
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;

@@ -77,11 +87,11 @@
         Rectangle child0_1 = new Rectangle(100, 300);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         assertEquals(200, gridpane.minWidth(-1), 0);
         assertEquals(400, gridpane.minHeight(-1), 0);
         assertEquals(500, gridpane.prefWidth(-1), 0);
         assertEquals(400, gridpane.prefHeight(-1), 0);

@@ -118,11 +128,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(0,   child0_0.getLayoutX(), 1e-100);
         assertEquals(0,   child0_0.getLayoutY(), 1e-100);

@@ -153,11 +163,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(200,   child0_0.getLayoutX(), 1e-100);
         assertEquals(0,   child0_0.getLayoutY(), 1e-100);

@@ -188,11 +198,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(400,   child0_0.getLayoutX(), 1e-100);
         assertEquals(0,   child0_0.getLayoutY(), 1e-100);

@@ -223,11 +233,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(0,   child0_0.getLayoutX(), 1e-100);
         assertEquals(200,   child0_0.getLayoutY(), 1e-100);

@@ -258,11 +268,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(200,   child0_0.getLayoutX(), 1e-100);
         assertEquals(200,   child0_0.getLayoutY(), 1e-100);

@@ -293,11 +303,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(400,   child0_0.getLayoutX(), 1e-100);
         assertEquals(200,   child0_0.getLayoutY(), 1e-100);

@@ -328,11 +338,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(0,   child0_0.getLayoutX(), 1e-100);
         assertEquals(400,   child0_0.getLayoutY(), 1e-100);

@@ -363,11 +373,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(200,   child0_0.getLayoutX(), 1e-100);
         assertEquals(400,   child0_0.getLayoutY(), 1e-100);

@@ -398,11 +408,11 @@
         Rectangle child0_1 = new Rectangle(200,200);
         GridPane.setConstraints(child0_1, 0, 1);
         MockResizable child1_1 = new MockResizable(100,100);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child0_1, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child0_1, child1_1);
 
         gridpane.resize(800,800);
         gridpane.layout();
         assertEquals(400,   child0_0.getLayoutX(), 1e-100);
         assertEquals(400,   child0_0.getLayoutY(), 1e-100);

@@ -473,11 +483,11 @@
     @Test public void testGridPaneSetColumnSpanConstraintWithHorizontalContentBias_RT_23718() {
         MockBiased child0_0 = new MockBiased(Orientation.HORIZONTAL, 300, 100);
 
         GridPane.setColumnSpan(child0_0, 2);
 
-        gridpane.getChildren().addAll(child0_0);
+        ParentShim.getChildren(gridpane).addAll(child0_0);
 
         gridpane.resize(500, 500);
         gridpane.layout();
 
         assertEquals(0, child0_0.getLayoutX(), 1e-100);

@@ -497,11 +507,11 @@
     @Test public void testGridPaneSetColumnSpanConstraintWithVerticalContentBias_RT_23718() {
         MockBiased child0_0 = new MockBiased(Orientation.VERTICAL, 100, 300);
 
         GridPane.setRowSpan(child0_0, 2);
 
-        gridpane.getChildren().addAll(child0_0);
+        ParentShim.getChildren(gridpane).addAll(child0_0);
 
         gridpane.resize(500, 500);
         gridpane.layout();
 
         assertEquals(0, child0_0.getLayoutX(), 1e-100);

@@ -655,11 +665,11 @@
     @Test public void testGridPaneCreateRow() {
         MockResizable child1 = new MockResizable(100,100);
         MockResizable child2 = new MockResizable(100,100);
         MockResizable child3 = new MockResizable(100,100);
 
-        GridPane.createRow(2, 0, child1,child2,child3);
+        GridPaneShim.createRow(2, 0, child1,child2,child3);
 
         assertEquals((Integer)2, GridPane.getRowIndex(child1));
         assertEquals((Integer)2, GridPane.getRowIndex(child2));
         assertEquals((Integer)2, GridPane.getRowIndex(child3));
 

@@ -671,11 +681,11 @@
     @Test public void testGridPaneCreateColumn() {
         MockResizable child1 = new MockResizable(100,100);
         MockResizable child2 = new MockResizable(100,100);
         MockResizable child3 = new MockResizable(100,100);
 
-        GridPane.createColumn(2, 0, child1,child2,child3);
+        GridPaneShim.createColumn(2, 0, child1,child2,child3);
 
         assertEquals((Integer)2, GridPane.getColumnIndex(child1));
         assertEquals((Integer)2, GridPane.getColumnIndex(child2));
         assertEquals((Integer)2, GridPane.getColumnIndex(child3));
 

@@ -714,14 +724,14 @@
 
         assertEquals((Integer)0, GridPane.getColumnIndex(child1));
         assertEquals((Integer)1, GridPane.getColumnIndex(child2));
         assertEquals((Integer)2, GridPane.getColumnIndex(child3));
 
-        assertEquals(3, gridpane.getChildren().size());
-        assertEquals(child1, gridpane.getChildren().get(0));
-        assertEquals(child2, gridpane.getChildren().get(1));
-        assertEquals(child3, gridpane.getChildren().get(2));
+        assertEquals(3, ParentShim.getChildren(gridpane).size());
+        assertEquals(child1, ParentShim.getChildren(gridpane).get(0));
+        assertEquals(child2, ParentShim.getChildren(gridpane).get(1));
+        assertEquals(child3, ParentShim.getChildren(gridpane).get(2));
     }
 
     @Test public void testGridPaneAddRowAppend() {
         MockResizable child1 = new MockResizable(100,100);
         MockResizable child2 = new MockResizable(100,100);

@@ -762,14 +772,14 @@
 
         assertEquals((Integer)0, GridPane.getRowIndex(child1));
         assertEquals((Integer)1, GridPane.getRowIndex(child2));
         assertEquals((Integer)2, GridPane.getRowIndex(child3));
 
-        assertEquals(3, gridpane.getChildren().size());
-        assertEquals(child1, gridpane.getChildren().get(0));
-        assertEquals(child2, gridpane.getChildren().get(1));
-        assertEquals(child3, gridpane.getChildren().get(2));
+        assertEquals(3, ParentShim.getChildren(gridpane).size());
+        assertEquals(child1, ParentShim.getChildren(gridpane).get(0));
+        assertEquals(child2, ParentShim.getChildren(gridpane).get(1));
+        assertEquals(child3, ParentShim.getChildren(gridpane).get(2));
     }
 
     @Test public void testGridPaneAddColumnAppend() {
         MockResizable child1 = new MockResizable(100,100);
         MockResizable child2 = new MockResizable(100,100);

@@ -782,14 +792,14 @@
 
         assertEquals((Integer)0, GridPane.getRowIndex(child1));
         assertEquals((Integer)1, GridPane.getRowIndex(child2));
         assertEquals((Integer)2, GridPane.getRowIndex(child3));
 
-        assertEquals(3, gridpane.getChildren().size());
-        assertEquals(child1, gridpane.getChildren().get(0));
-        assertEquals(child2, gridpane.getChildren().get(1));
-        assertEquals(child3, gridpane.getChildren().get(2));
+        assertEquals(3, ParentShim.getChildren(gridpane).size());
+        assertEquals(child1, ParentShim.getChildren(gridpane).get(0));
+        assertEquals(child2, ParentShim.getChildren(gridpane).get(1));
+        assertEquals(child3, ParentShim.getChildren(gridpane).get(2));
 
         MockResizable child4 = new MockResizable(100,100);
         MockResizable child5 = new MockResizable(100,100);
         MockResizable child6 = new MockResizable(100,100);
         gridpane.addColumn(2, child4,child5,child6);

@@ -1853,11 +1863,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child2_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child2_1, 2, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         assertNull(gridpane.getContentBias());
     }
 

@@ -1873,11 +1883,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child2_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child2_1, 2, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         assertEquals(Orientation.HORIZONTAL, gridpane.getContentBias());
     }
 

@@ -1893,11 +1903,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child2_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child2_1, 2, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         assertEquals(Orientation.HORIZONTAL, gridpane.getContentBias());
         assertEquals(300, gridpane.minWidth(-1), 0);
         assertEquals(800, gridpane.prefWidth(-1), 0);

@@ -1944,11 +1954,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child2_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child2_1, 2, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         assertEquals(Orientation.HORIZONTAL, gridpane.getContentBias());
         assertEquals(429, gridpane.prefHeight(600), 0);
 

@@ -1999,11 +2009,11 @@
         row.setFillHeight(false);
         gridpane.getRowConstraints().add(row);
 
         GridPane.setHgrow(child2_0, Priority.ALWAYS);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         assertEquals(Orientation.HORIZONTAL, gridpane.getContentBias());
         assertEquals(400, gridpane.prefHeight(1000), 0);
 

@@ -2054,11 +2064,11 @@
         RowConstraints row = new RowConstraints();
         row.setFillHeight(true);
         gridpane.getRowConstraints().add(row);
         GridPane.setHgrow(child2_0, Priority.ALWAYS);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         gridpane.resize(1000, 400);
         gridpane.layout();
 

@@ -2095,11 +2105,11 @@
         MockResizable child1_0 = new MockResizable(200, 100);
         GridPane.setConstraints(child1_0, 1, 0);
         MockBiased child1_1 = new MockBiased(Orientation.HORIZONTAL, 300, 400);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child1_1);
 
         gridpane.resize(500, 600);
         gridpane.layout();
 
         assertEquals(0, child0_0.getLayoutX(), 1e-100);

@@ -2128,11 +2138,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child2_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child2_1, 2, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         assertEquals(Orientation.VERTICAL, gridpane.getContentBias());
     }
 

@@ -2148,11 +2158,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child2_1 = new MockResizable(100,100, 200, 200, 800, 800);
         GridPane.setConstraints(child2_1, 2, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0,
                                       child0_1, child1_1, child2_1);
 
         assertEquals(Orientation.VERTICAL, gridpane.getContentBias());
         assertEquals(200, gridpane.minHeight(-1), 0);
         assertEquals(800, gridpane.prefWidth(-1), 0);

@@ -2200,11 +2210,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 100, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child1_2 = new MockResizable(100,100, 200, 150, 800, 800);
         GridPane.setConstraints(child1_2, 1, 2);
 
-        gridpane.getChildren().addAll(child0_0, child1_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0,
                                       child0_1, child1_1,
                                       child0_2, child1_2);
 
         assertEquals(Orientation.VERTICAL, gridpane.getContentBias());
         assertEquals(300, gridpane.prefWidth(-1), 0);

@@ -2253,11 +2263,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 100, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child1_2 = new MockResizable(100,100, 200, 150, 800, 800);
         GridPane.setConstraints(child1_2, 1, 2);
 
-        gridpane.getChildren().addAll(child0_0, child1_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0,
                                       child0_1, child1_1,
                                       child0_2, child1_2);
 
         ColumnConstraints col = new ColumnConstraints();
         col.setFillWidth(false);

@@ -2308,11 +2318,11 @@
         MockResizable child1_1 = new MockResizable(100,100, 200, 100, 800, 800);
         GridPane.setConstraints(child1_1, 1, 1);
         MockResizable child1_2 = new MockResizable(100,100, 200, 150, 800, 800);
         GridPane.setConstraints(child1_2, 1, 2);
 
-        gridpane.getChildren().addAll(child0_0, child1_0,
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0,
                                       child0_1, child1_1,
                                       child0_2, child1_2);
 
         ColumnConstraints col = new ColumnConstraints();
         col.setFillWidth(true);

@@ -2360,11 +2370,11 @@
         MockResizable child1_0 = new MockResizable(200, 100);
         GridPane.setConstraints(child1_0, 1, 0);
         MockBiased child1_1 = new MockBiased(Orientation.VERTICAL, 300, 400);
         GridPane.setConstraints(child1_1, 1, 1);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child1_1);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child1_1);
 
         gridpane.resize(500, 600);
         gridpane.layout();
 
         assertEquals(0, child0_0.getLayoutX(), 1e-100);

@@ -2387,16 +2397,16 @@
         MockResizable child1_0 = new MockResizable(100,200);
         GridPane.setConstraints(child1_0, 1, 0);
         MockResizable child2_0 = new MockResizable(100,200);
         GridPane.setConstraints(child2_0, 2, 0);
 
-        gridpane.getChildren().addAll(child0_0, child1_0, child2_0);
+        ParentShim.getChildren(gridpane).addAll(child0_0, child1_0, child2_0);
 
         assertEquals(300, gridpane.prefWidth(-1), 0);
         assertEquals(200, gridpane.prefHeight(-1), 0);
 
-        gridpane.getChildren().remove(child1_0);
+        ParentShim.getChildren(gridpane).remove(child1_0);
 
         assertEquals(200, gridpane.prefWidth(-1), 0);
         assertEquals(200, gridpane.prefHeight(-1), 0);
     }
 

@@ -2412,14 +2422,14 @@
 
         gridpane.getColumnConstraints().addAll(cc, cc2);
 
         MockResizable child1_0 = new MockResizable(50,50);
         GridPane.setConstraints(child1_0, 1, 0);
-        gridpane.getChildren().add(child1_0);
+        ParentShim.getChildren(gridpane).add(child1_0);
         MockResizable child0_0 = new MockResizable(110, 110);
         GridPane.setConstraints(child0_0, 0, 0);
-        gridpane.getChildren().add(child0_0);
+        ParentShim.getChildren(gridpane).add(child0_0);
 
         gridpane.resize(200,200);
         gridpane.layout();
 
         assertEquals(110, child0_0.getLayoutBounds().getWidth(), 1e-100);