# HG changeset patch
# User arusakov
# Date 1472743004 -10800
#      Thu Sep 01 18:16:44 2016 +0300
# Node ID 9d823c0fa0e9f3f47a3cc4aa3df2e6d40c7ad0fd
# Parent  3c17dfa835667fe40dfbe4ddc46bcae699ab9657
8165238: [TEST BUG] FXCssAutomated StylesRegionTest/testfxborderimagewidth fails with array comparison
Summary: Tests were expecting incorrect values, changed that values to fx8 defaults.

diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/BaseStyleNodeTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/BaseStyleNodeTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/BaseStyleNodeTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/BaseStyleNodeTest.java
@@ -36,6 +36,7 @@
 import javafx.css.Styleable;
 import javafx.scene.Node;
 import javafx.scene.layout.BackgroundPosition;
+import javafx.scene.layout.BorderWidths;
 import org.junit.BeforeClass;
 import test.css.controls.EmptyApp;
 import test.javaclient.shared.Utils;
@@ -46,6 +47,8 @@
  */
 public abstract class BaseStyleNodeTest {
 
+    protected static final BorderWidths[] DEFAULT_WIDTHS = new BorderWidths[] {BorderWidths.DEFAULT};
+
     protected Node control;
 
     abstract Node getControl();
@@ -141,7 +144,7 @@
         return true;
     }
 
-      public boolean checkBorderImageSlices(BorderImageSlices[] first, BorderImageSlices[] second) {
+    public boolean checkBorderImageSlices(BorderImageSlices[] first, BorderImageSlices[] second) {
         if (first == second) {
             return true;
         }
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesAnchorPaneTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesAnchorPaneTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesAnchorPaneTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesAnchorPaneTest.java
@@ -28,21 +28,11 @@
 import java.util.Map;
 import java.util.Set;
 import javafx.scene.Node;
-import javafx.scene.control.*;
 import javafx.scene.layout.*;
-import javafx.scene.chart.*;
-import javafx.scene.shape.*;
-import javafx.scene.web.*;
-import javafx.scene.image.*;
-import javafx.scene.text.*;
-import javafx.scene.*;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.jemmy.fx.Root;
 import org.jemmy.action.GetAction;
-import client.test.Keywords;
-import com.sun.javafx.scene.control.skin.*;
 import javafx.scene.paint.Paint;
 import javafx.geometry.Insets;
 import com.sun.javafx.scene.layout.region.RepeatStruct;
@@ -206,7 +196,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesBorderPaneTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesBorderPaneTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesBorderPaneTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesBorderPaneTest.java
@@ -206,7 +206,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesCategoryAxisTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesCategoryAxisTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesCategoryAxisTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesCategoryAxisTest.java
@@ -204,7 +204,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesCellTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesCellTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesCellTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesCellTest.java
@@ -29,24 +29,12 @@
 import java.util.Set;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.scene.chart.*;
-import javafx.scene.shape.*;
-import javafx.scene.web.*;
-import javafx.scene.image.*;
 import javafx.scene.text.*;
-import javafx.scene.*;
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.jemmy.fx.Root;
 import org.jemmy.action.GetAction;
-import client.test.Keywords;
-import com.sun.javafx.scene.control.skin.*;
-import javafx.scene.paint.Paint;
 import javafx.geometry.Insets;
-import com.sun.javafx.scene.layout.region.RepeatStruct;
-import com.sun.javafx.scene.layout.region.BorderImageSlices;
 
 
 /**
@@ -87,16 +75,6 @@
     }
 
     @Test
-    public void testfxcellsize () {
-        Set<String> styleNames = getStyleNames();
-        Assert.assertNotNull(styleNames);
-        Assert.assertTrue(styleNames.contains("-fx-cell-size"));
-        Map<String, CssMetaData> styles = getStyles();
-        CssMetaData data = styles.get("-fx-cell-size");
-        Assert.assertEquals(data.getInitialValue(getControl()), "15");
-    }
-
-    @Test
     public void testfxcontentdisplay () {
         Set<String> styleNames = getStyleNames();
         Assert.assertNotNull(styleNames);
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesFlowPaneTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesFlowPaneTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesFlowPaneTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesFlowPaneTest.java
@@ -215,7 +215,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesGridPaneTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesGridPaneTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesGridPaneTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesGridPaneTest.java
@@ -215,7 +215,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesHBoxTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesHBoxTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesHBoxTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesHBoxTest.java
@@ -215,7 +215,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesIndexedCellTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesIndexedCellTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesIndexedCellTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesIndexedCellTest.java
@@ -88,16 +88,6 @@
     }
 
     @Test
-    public void testfxcellsize () {
-        Set<String> styleNames = getStyleNames();
-        Assert.assertNotNull(styleNames);
-        Assert.assertTrue(styleNames.contains("-fx-cell-size"));
-        Map<String, CssMetaData> styles = getStyles();
-        CssMetaData data = styles.get("-fx-cell-size");
-        Assert.assertEquals(data.getInitialValue(getControl()), "15");
-    }
-
-    @Test
     public void testfxcontentdisplay () {
         Set<String> styleNames = getStyleNames();
         Assert.assertNotNull(styleNames);
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesListCellTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesListCellTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesListCellTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesListCellTest.java
@@ -96,7 +96,7 @@
         Assert.assertTrue(styleNames.contains("-fx-cell-size"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-cell-size");
-        Assert.assertEquals(data.getInitialValue(getControl()), "15");
+        Assert.assertEquals(24.0, data.getInitialValue(getControl()));
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesNumberAxisTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesNumberAxisTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesNumberAxisTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesNumberAxisTest.java
@@ -206,7 +206,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesPaneTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesPaneTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesPaneTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesPaneTest.java
@@ -205,7 +205,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesPieChartTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesPieChartTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesPieChartTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesPieChartTest.java
@@ -205,7 +205,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesRegionTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesRegionTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesRegionTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesRegionTest.java
@@ -205,7 +205,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesStackPaneTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesStackPaneTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesStackPaneTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesStackPaneTest.java
@@ -216,7 +216,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesTilePaneTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesTilePaneTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesTilePaneTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesTilePaneTest.java
@@ -215,7 +215,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesTreeCellTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesTreeCellTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesTreeCellTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesTreeCellTest.java
@@ -98,7 +98,7 @@
         Assert.assertTrue(styleNames.contains("-fx-cell-size"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-cell-size");
-        Assert.assertEquals(data.getInitialValue(getControl()), "15");
+        Assert.assertEquals(24.0, data.getInitialValue(getControl()));
     }
 
     @Test
diff --git a/functional/FXCssTests/test/test/css/controls/api/styles/StylesVBoxTest.java b/functional/FXCssTests/test/test/css/controls/api/styles/StylesVBoxTest.java
--- a/functional/FXCssTests/test/test/css/controls/api/styles/StylesVBoxTest.java
+++ b/functional/FXCssTests/test/test/css/controls/api/styles/StylesVBoxTest.java
@@ -215,7 +215,7 @@
         Assert.assertTrue(styleNames.contains("-fx-border-image-width"));
         Map<String, CssMetaData> styles = getStyles();
         CssMetaData data = styles.get("-fx-border-image-width");
-        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), new BorderWidths[]{new BorderWidths(0, 0, 0, 0)});
+        Assert.assertArrayEquals((BorderWidths[])data.getInitialValue(getControl()), DEFAULT_WIDTHS);
     }
 
     @Test