--- old/modules/graphics/src/test/java/javafx/scene/transform/ShearTest.java	2015-09-11 21:28:46.253284047 -0400
+++ /dev/null	2015-09-11 11:06:08.592686920 -0400
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2011, 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.scene.transform;
-
-import static javafx.scene.transform.TransformTest.assertTx;
-import javafx.scene.shape.Rectangle;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import com.sun.javafx.test.TransformHelper;
-import com.sun.javafx.geom.transform.Affine2D;
-
-public class ShearTest {
-
-    @Test
-    public void testShear() {
-        final Shear t = new Shear(112, 114);
-        final Rectangle rect = new Rectangle();
-        rect.getTransforms().add(t);
-        Affine2D expT = new Affine2D();
-        expT.setToShear(112, 114);
-        assertTx(rect, expT);
-
-        final Shear trans = new Shear() {{
-            setX(25);
-            setY(52);
-        }};
-        final Rectangle n = new Rectangle();
-        n.getTransforms().add(trans);
-
-        TransformHelper.assertMatrix(trans,
-                 1, 25, 0, 0,
-                52,  1, 0, 0,
-                 0,  0, 1, 0);
-
-        Affine2D expTx1 = new Affine2D();
-        expTx1.setToShear(25, 52);
-        assertTx(n, expTx1);
-
-        trans.setX(34);
-        Affine2D expTx2 = new Affine2D();
-        expTx2.setToShear(34, 52);
-        assertTx(n, expTx2);
-        TransformHelper.assertMatrix(trans,
-                 1, 34, 0, 0,
-                52,  1, 0, 0,
-                 0,  0, 1, 0);
-
-        trans.setY(67);
-        Affine2D expTx3 = new Affine2D();
-        expTx3.setToShear(34, 67);
-        assertTx(n, expTx3);
-        TransformHelper.assertMatrix(trans,
-                 1, 34, 0, 0,
-                67,  1, 0, 0,
-                 0,  0, 1, 0);
-
-        trans.setPivotX(66);
-
-        Affine2D expTx = new Affine2D();
-        expTx.setToTranslation(trans.getPivotX(), trans.getPivotY());
-        expTx.shear(trans.getX(), trans.getY());
-        expTx.translate(-trans.getPivotX(), -trans.getPivotY());
-        assertTx(n, expTx);
-        TransformHelper.assertMatrix(trans,
-                 1, 34, 0,      0,
-                67,  1, 0, -67*66,
-                 0,  0, 1,      0);
-
-
-        trans.setPivotY(77);
-
-        expTx.setToTranslation(trans.getPivotX(), trans.getPivotY());
-        expTx.shear(trans.getX(), trans.getY());
-        expTx.translate(-trans.getPivotX(), -trans.getPivotY());
-        assertTx(n, expTx);
-        TransformHelper.assertMatrix(trans,
-                 1, 34, 0, -34*77,
-                67,  1, 0, -67*66,
-                 0,  0, 1,      0);
-    }
-
-    @Test
-    public void testCopying() {
-        final Shear trans = new Shear(34, 67, 66, 77);
-
-        Transform copy = trans.clone();
-
-        TransformHelper.assertMatrix(copy,
-                 1, 34, 0, -34*77,
-                67,  1, 0, -67*66,
-                 0,  0, 1,      0);
-    }
-
-    @Test public void testToString() {
-        final Shear trans = new Shear(8, 15);
-
-        String s = trans.toString();
-
-        assertNotNull(s);
-        assertFalse(s.isEmpty());
-    }
-
-    @Test public void testBoundPropertySynced_X() throws Exception {
-        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "x", 123.0);
-    }
-
-    @Test public void testBoundPropertySynced_Y() throws Exception {
-        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "y", 112.0);
-    }
-
-    @Test public void testBoundPropertySynced_PivotX() throws Exception {
-        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "pivotX", 22.0);
-    }
-
-    @Test public void testBoundPropertySynced_PivotY() throws Exception {
-        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "pivotY", 33.0);
-    }
-}
--- /dev/null	2015-09-11 11:06:08.592686920 -0400
+++ new/modules/graphics/src/test/java/test/javafx/scene/transform/ShearTest.java	2015-09-11 21:28:46.117284048 -0400
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2011, 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 test.javafx.scene.transform;
+
+import static test.javafx.scene.transform.TransformTest.assertTx;
+import javafx.scene.shape.Rectangle;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import test.com.sun.javafx.test.TransformHelper;
+import com.sun.javafx.geom.transform.Affine2D;
+import javafx.scene.transform.Shear;
+import javafx.scene.transform.Transform;
+
+public class ShearTest {
+
+    @Test
+    public void testShear() {
+        final Shear t = new Shear(112, 114);
+        final Rectangle rect = new Rectangle();
+        rect.getTransforms().add(t);
+        Affine2D expT = new Affine2D();
+        expT.setToShear(112, 114);
+        assertTx(rect, expT);
+
+        final Shear trans = new Shear() {{
+            setX(25);
+            setY(52);
+        }};
+        final Rectangle n = new Rectangle();
+        n.getTransforms().add(trans);
+
+        TransformHelper.assertMatrix(trans,
+                 1, 25, 0, 0,
+                52,  1, 0, 0,
+                 0,  0, 1, 0);
+
+        Affine2D expTx1 = new Affine2D();
+        expTx1.setToShear(25, 52);
+        assertTx(n, expTx1);
+
+        trans.setX(34);
+        Affine2D expTx2 = new Affine2D();
+        expTx2.setToShear(34, 52);
+        assertTx(n, expTx2);
+        TransformHelper.assertMatrix(trans,
+                 1, 34, 0, 0,
+                52,  1, 0, 0,
+                 0,  0, 1, 0);
+
+        trans.setY(67);
+        Affine2D expTx3 = new Affine2D();
+        expTx3.setToShear(34, 67);
+        assertTx(n, expTx3);
+        TransformHelper.assertMatrix(trans,
+                 1, 34, 0, 0,
+                67,  1, 0, 0,
+                 0,  0, 1, 0);
+
+        trans.setPivotX(66);
+
+        Affine2D expTx = new Affine2D();
+        expTx.setToTranslation(trans.getPivotX(), trans.getPivotY());
+        expTx.shear(trans.getX(), trans.getY());
+        expTx.translate(-trans.getPivotX(), -trans.getPivotY());
+        assertTx(n, expTx);
+        TransformHelper.assertMatrix(trans,
+                 1, 34, 0,      0,
+                67,  1, 0, -67*66,
+                 0,  0, 1,      0);
+
+
+        trans.setPivotY(77);
+
+        expTx.setToTranslation(trans.getPivotX(), trans.getPivotY());
+        expTx.shear(trans.getX(), trans.getY());
+        expTx.translate(-trans.getPivotX(), -trans.getPivotY());
+        assertTx(n, expTx);
+        TransformHelper.assertMatrix(trans,
+                 1, 34, 0, -34*77,
+                67,  1, 0, -67*66,
+                 0,  0, 1,      0);
+    }
+
+    @Test
+    public void testCopying() {
+        final Shear trans = new Shear(34, 67, 66, 77);
+
+        Transform copy = trans.clone();
+
+        TransformHelper.assertMatrix(copy,
+                 1, 34, 0, -34*77,
+                67,  1, 0, -67*66,
+                 0,  0, 1,      0);
+    }
+
+    @Test public void testToString() {
+        final Shear trans = new Shear(8, 15);
+
+        String s = trans.toString();
+
+        assertNotNull(s);
+        assertFalse(s.isEmpty());
+    }
+
+    @Test public void testBoundPropertySynced_X() throws Exception {
+        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "x", 123.0);
+    }
+
+    @Test public void testBoundPropertySynced_Y() throws Exception {
+        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "y", 112.0);
+    }
+
+    @Test public void testBoundPropertySynced_PivotX() throws Exception {
+        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "pivotX", 22.0);
+    }
+
+    @Test public void testBoundPropertySynced_PivotY() throws Exception {
+        TransformTest.checkDoublePropertySynced(new Shear(3, 3, 0, 0), "pivotY", 33.0);
+    }
+}