--- old/modules/graphics/src/test/java/javafx/scene/shape/ClosePathTest.java	2015-09-11 21:28:01.253284553 -0400
+++ /dev/null	2015-09-11 11:06:08.592686920 -0400
@@ -1,61 +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 javafx.scene.shape;
-
-import com.sun.javafx.sg.prism.NGPath;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-public class ClosePathTest {
-
-    @Test public void testAddTo() throws Exception {
-        final StubPathImpl pgPath = new StubPathImpl();
-        ClosePath closePath = new ClosePath();
-        closePath.addTo(pgPath);
-        assertTrue(pgPath.isClosed());
-                
-    }
-
-    @Test public void toStringShouldReturnNonEmptyString() {
-        String s = new ClosePath().toString();
-        assertNotNull(s);
-        assertFalse(s.isEmpty());
-    }
-
-    private class StubPathImpl extends NGPath {
-
-        boolean closed = false;
-
-        @Override public void addClosePath() {
-            closed = true;
-        }
-        
-        public boolean isClosed() {
-            return closed;
-        }
-    }
-}
--- /dev/null	2015-09-11 11:06:08.592686920 -0400
+++ new/modules/graphics/src/test/java/test/javafx/scene/shape/ClosePathTest.java	2015-09-11 21:28:01.061284555 -0400
@@ -0,0 +1,63 @@
+/*
+ * 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 test.javafx.scene.shape;
+
+import com.sun.javafx.sg.prism.NGPath;
+import javafx.scene.shape.ClosePath;
+import javafx.scene.shape.ClosePathShim;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class ClosePathTest {
+
+    @Test public void testAddTo() throws Exception {
+        final StubPathImpl pgPath = new StubPathImpl();
+        ClosePath closePath = new ClosePath();
+        ClosePathShim.addTo(closePath, pgPath);
+        assertTrue(pgPath.isClosed());
+                
+    }
+
+    @Test public void toStringShouldReturnNonEmptyString() {
+        String s = new ClosePath().toString();
+        assertNotNull(s);
+        assertFalse(s.isEmpty());
+    }
+
+    private class StubPathImpl extends NGPath {
+
+        boolean closed = false;
+
+        @Override public void addClosePath() {
+            closed = true;
+        }
+        
+        public boolean isClosed() {
+            return closed;
+        }
+    }
+}