--- old/modules/graphics/src/test/java/com/sun/javafx/css/InsetsTypeTest.java	2015-09-03 15:36:07.399962800 -0700
+++ /dev/null	2015-09-03 15:36:08.000000000 -0700
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * 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 com.sun.javafx.css;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import javafx.css.ParsedValue;
-import javafx.geometry.Insets;
-import javafx.scene.text.Font;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import com.sun.javafx.css.parser.CSSParser;
-
-
-public class InsetsTypeTest {
-
-    String[] css;
-
-    Insets[][] expResults;
-
-    // values for top, right, bottom, left
-    final float[][][] fvals = new float[][][] {
-        { {1.0f} },
-        { {-1.0f, 0.0f, 1.0f, 2.0f} },
-        { {1.0f}, {2.0f}, {3.0f}, {4.0f} },
-        { {1.0f, 0.0f, 1.0f, 2.0f},
-          {2.0f, 0.0f, 1.0f, 2.0f},
-          {3.0f, 0.0f, 1.0f, 2.0f},
-          {4.0f, 0.0f, 1.0f, 2.0f} },
-        { {1.0f},
-          {2.0f, -1.0f},
-          {3.0f, 0.0f, 1.0f, 2.0f},
-          {4.0f, 0.0f, 1.0f} }
-    };
-
-    @Before
-    public void setup() {
-        css = new String[fvals.length];
-        expResults = new Insets[fvals.length][];
-        for (int i=0; i<fvals.length; i++) {
-            StringBuilder sbuf = new StringBuilder();
-            expResults[i] = new Insets[fvals[i].length];
-            for (int j=0; j<fvals[i].length; j++) {
-                expResults[i][j] = makeInsets(fvals[i][j]);
-
-                for (int k=0; k<fvals[i][j].length; k++) {
-                    sbuf.append(Float.toString(fvals[i][j][k]));
-                    sbuf.append("px");
-                    if (k+1 < fvals[i][j].length) sbuf.append(' ');
-                }
-
-                if (j+1 < fvals[i].length) sbuf.append(", ");
-            }
-            css[i] = sbuf.toString();
-        }
-    }
-
-    public InsetsTypeTest() {
-    }
-
-    final Insets makeInsets(float[] vals) {
-        
-        float top =  (vals.length > 0) ? vals[0] : 0.0f;
-        float right = (vals.length > 1) ? vals[1] : top;
-        float bottom = (vals.length > 2) ? vals[2] : top;
-        float left = (vals.length > 3) ? vals[3] : right;
-        return new Insets(top, right, bottom, left);
-    }
-
-    void checkInsets(String msg, Insets expResult, Insets result) {
-        assertEquals(msg + "top", expResult.getTop(), result.getTop(), 0.01);
-        assertEquals(msg + "right", expResult.getRight(), result.getRight(), 0.01);
-        assertEquals(msg + "bottom", expResult.getBottom(), result.getBottom(), 0.01);
-        assertEquals(msg + "left", expResult.getLeft(), result.getLeft(), 0.01);
-    }
-
-    @Test
-    public void testConvert() {
-
-        for (int i=0; i<css.length; i++) {
-
-            Stylesheet stylesheet =
-                CSSParser.getInstance().parse("* { -fx-border-insets: " + css[i] + "; }");
-
-            ParsedValue value =
-                    TypeTest.getValueFor(stylesheet, "-fx-border-insets");
-
-            Insets[] insets = (Insets[]) value.convert(Font.getDefault());
-
-            //assertEquals(expResults[i].length,insets.length);
-
-            for(int j=0; j<insets.length; j++) {
-                String msg = Integer.toString(i) + "." + Integer.toString(j);
-                checkInsets(msg, expResults[i][j], insets[j]);
-            }
-        }
-    }
-}
--- /dev/null	2015-09-03 15:36:08.000000000 -0700
+++ new/modules/graphics/src/test/java/javafx/css/InsetsTypeTest.java	2015-09-03 15:36:06.622918300 -0700
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * 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.css;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import javafx.geometry.Insets;
+import javafx.scene.text.Font;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import javafx.css.CssParser;
+
+
+public class InsetsTypeTest {
+
+    String[] css;
+
+    Insets[][] expResults;
+
+    // values for top, right, bottom, left
+    final float[][][] fvals = new float[][][] {
+        { {1.0f} },
+        { {-1.0f, 0.0f, 1.0f, 2.0f} },
+        { {1.0f}, {2.0f}, {3.0f}, {4.0f} },
+        { {1.0f, 0.0f, 1.0f, 2.0f},
+          {2.0f, 0.0f, 1.0f, 2.0f},
+          {3.0f, 0.0f, 1.0f, 2.0f},
+          {4.0f, 0.0f, 1.0f, 2.0f} },
+        { {1.0f},
+          {2.0f, -1.0f},
+          {3.0f, 0.0f, 1.0f, 2.0f},
+          {4.0f, 0.0f, 1.0f} }
+    };
+
+    @Before
+    public void setup() {
+        css = new String[fvals.length];
+        expResults = new Insets[fvals.length][];
+        for (int i=0; i<fvals.length; i++) {
+            StringBuilder sbuf = new StringBuilder();
+            expResults[i] = new Insets[fvals[i].length];
+            for (int j=0; j<fvals[i].length; j++) {
+                expResults[i][j] = makeInsets(fvals[i][j]);
+
+                for (int k=0; k<fvals[i][j].length; k++) {
+                    sbuf.append(Float.toString(fvals[i][j][k]));
+                    sbuf.append("px");
+                    if (k+1 < fvals[i][j].length) sbuf.append(' ');
+                }
+
+                if (j+1 < fvals[i].length) sbuf.append(", ");
+            }
+            css[i] = sbuf.toString();
+        }
+    }
+
+    public InsetsTypeTest() {
+    }
+
+    final Insets makeInsets(float[] vals) {
+        
+        float top =  (vals.length > 0) ? vals[0] : 0.0f;
+        float right = (vals.length > 1) ? vals[1] : top;
+        float bottom = (vals.length > 2) ? vals[2] : top;
+        float left = (vals.length > 3) ? vals[3] : right;
+        return new Insets(top, right, bottom, left);
+    }
+
+    void checkInsets(String msg, Insets expResult, Insets result) {
+        assertEquals(msg + "top", expResult.getTop(), result.getTop(), 0.01);
+        assertEquals(msg + "right", expResult.getRight(), result.getRight(), 0.01);
+        assertEquals(msg + "bottom", expResult.getBottom(), result.getBottom(), 0.01);
+        assertEquals(msg + "left", expResult.getLeft(), result.getLeft(), 0.01);
+    }
+
+    @Test
+    public void testConvert() {
+
+        for (int i=0; i<css.length; i++) {
+
+            Stylesheet stylesheet =
+                new CssParser().parse("* { -fx-border-insets: " + css[i] + "; }");
+
+            ParsedValue value =
+                    TypeTest.getValueFor(stylesheet, "-fx-border-insets");
+
+            Insets[] insets = (Insets[]) value.convert(Font.getDefault());
+
+            //assertEquals(expResults[i].length,insets.length);
+
+            for(int j=0; j<insets.length; j++) {
+                String msg = Integer.toString(i) + "." + Integer.toString(j);
+                checkInsets(msg, expResults[i][j], insets[j]);
+            }
+        }
+    }
+}