--- old/modules/graphics/src/test/java/javafx/scene/Node_LocalToParentTransform_Test.java	2015-09-11 21:26:15.509285741 -0400
+++ /dev/null	2015-09-11 11:06:08.592686920 -0400
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2010, 2014, 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.scene;
-
-import com.sun.javafx.test.TransformHelper;
-import javafx.scene.transform.Transform;
-import javafx.scene.transform.Translate;
-import javafx.scene.shape.Rectangle;
-import javafx.beans.Observable;
-import javafx.beans.InvalidationListener;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class Node_LocalToParentTransform_Test {
-    private boolean notified;
-
-    @Test
-    public void notTransformedNodeShouldReturnIdentity() {
-        Node n = new Rectangle(20, 20);
-        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
-                1, 0, 0, 0,
-                0, 1, 0, 0,
-                0, 0, 1, 0);
-    }
-
-    @Test
-    public void shouldConsiderBothTransformListAndConvenientTransforms() {
-        Node n = new Rectangle(20, 20);
-
-        n.setTranslateX(10);
-        n.setScaleY(10);
-        n.getTransforms().add(new Translate(5, 6));
-
-        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
-                1,  0, 0,  15,
-                0, 10, 0, -30,
-                0,  0, 1,   0);
-    }
-
-    @Test
-    public void shouldBeUpToDate() {
-        Node n = new Rectangle(20, 20);
-
-        n.setTranslateX(10);
-
-        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
-                1, 0, 0, 10,
-                0, 1, 0, 0,
-                0, 0, 1, 0);
-
-        n.setTranslateX(20);
-
-        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
-                1, 0, 0, 20,
-                0, 1, 0,  0,
-                0, 0, 1,  0);
-    }
-
-    @Test
-    public void shouldBeNotifiedWhenNodeTransforms() {
-        final Node n = new Rectangle(20, 20);
-        n.localToParentTransformProperty().addListener(o -> {
-            if (!notified) {
-                notified = true;
-                TransformHelper.assertMatrix(n.getLocalToParentTransform(),
-                    1, 0, 0, 10,
-                    0, 1, 0, 20,
-                    0, 0, 1,  0);
-            }
-        });
-
-        notified = false;
-        n.getTransforms().add(new Translate(10, 20));
-        assertTrue(notified);
-
-        n.getTransforms().clear();
-        n.getTransforms().add(new Translate(10, 0));
-        n.getLocalToParentTransform();
-
-        notified = false;
-        n.setTranslateY(20);
-        assertTrue(notified);
-    }
-
-    @Test
-    public void shouldNotBeReusedWhenReferenceGivenToUser() {
-        final Node n = new Rectangle(20, 20);
-
-        n.setTranslateX(200);
-        Transform t1 = n.getLocalToParentTransform();
-        TransformHelper.assertMatrix(t1,
-                1, 0, 0, 200,
-                0, 1, 0, 0,
-                0, 0, 1, 0);
-
-        n.setTranslateX(300);
-        Transform t2 = n.getLocalToParentTransform();
-        TransformHelper.assertMatrix(t2,
-                1, 0, 0, 300,
-                0, 1, 0, 0,
-                0, 0, 1, 0);
-
-        assertFalse(t1 == t2);
-        TransformHelper.assertMatrix(t1,
-                1, 0, 0, 200,
-                0, 1, 0, 0,
-                0, 0, 1, 0);
-    }
-}
--- /dev/null	2015-09-11 11:06:08.592686920 -0400
+++ new/modules/graphics/src/test/java/test/javafx/scene/Node_LocalToParentTransform_Test.java	2015-09-11 21:26:15.373285743 -0400
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2010, 2014, 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 test.javafx.scene;
+
+import test.com.sun.javafx.test.TransformHelper;
+import javafx.scene.transform.Transform;
+import javafx.scene.transform.Translate;
+import javafx.scene.shape.Rectangle;
+import javafx.beans.Observable;
+import javafx.beans.InvalidationListener;
+import javafx.scene.Node;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class Node_LocalToParentTransform_Test {
+    private boolean notified;
+
+    @Test
+    public void notTransformedNodeShouldReturnIdentity() {
+        Node n = new Rectangle(20, 20);
+        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
+                1, 0, 0, 0,
+                0, 1, 0, 0,
+                0, 0, 1, 0);
+    }
+
+    @Test
+    public void shouldConsiderBothTransformListAndConvenientTransforms() {
+        Node n = new Rectangle(20, 20);
+
+        n.setTranslateX(10);
+        n.setScaleY(10);
+        n.getTransforms().add(new Translate(5, 6));
+
+        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
+                1,  0, 0,  15,
+                0, 10, 0, -30,
+                0,  0, 1,   0);
+    }
+
+    @Test
+    public void shouldBeUpToDate() {
+        Node n = new Rectangle(20, 20);
+
+        n.setTranslateX(10);
+
+        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
+                1, 0, 0, 10,
+                0, 1, 0, 0,
+                0, 0, 1, 0);
+
+        n.setTranslateX(20);
+
+        TransformHelper.assertMatrix(n.getLocalToParentTransform(),
+                1, 0, 0, 20,
+                0, 1, 0,  0,
+                0, 0, 1,  0);
+    }
+
+    @Test
+    public void shouldBeNotifiedWhenNodeTransforms() {
+        final Node n = new Rectangle(20, 20);
+        n.localToParentTransformProperty().addListener(o -> {
+            if (!notified) {
+                notified = true;
+                TransformHelper.assertMatrix(n.getLocalToParentTransform(),
+                    1, 0, 0, 10,
+                    0, 1, 0, 20,
+                    0, 0, 1,  0);
+            }
+        });
+
+        notified = false;
+        n.getTransforms().add(new Translate(10, 20));
+        assertTrue(notified);
+
+        n.getTransforms().clear();
+        n.getTransforms().add(new Translate(10, 0));
+        n.getLocalToParentTransform();
+
+        notified = false;
+        n.setTranslateY(20);
+        assertTrue(notified);
+    }
+
+    @Test
+    public void shouldNotBeReusedWhenReferenceGivenToUser() {
+        final Node n = new Rectangle(20, 20);
+
+        n.setTranslateX(200);
+        Transform t1 = n.getLocalToParentTransform();
+        TransformHelper.assertMatrix(t1,
+                1, 0, 0, 200,
+                0, 1, 0, 0,
+                0, 0, 1, 0);
+
+        n.setTranslateX(300);
+        Transform t2 = n.getLocalToParentTransform();
+        TransformHelper.assertMatrix(t2,
+                1, 0, 0, 300,
+                0, 1, 0, 0,
+                0, 0, 1, 0);
+
+        assertFalse(t1 == t2);
+        TransformHelper.assertMatrix(t1,
+                1, 0, 0, 200,
+                0, 1, 0, 0,
+                0, 0, 1, 0);
+    }
+}