--- old/modules/base/src/test/java/javafx/util/converter/IntegerStringConverterTest.java	2015-08-31 10:25:19.129216219 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,53 +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.util.converter;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- */
-public class IntegerStringConverterTest {
-    private IntegerStringConverter converter;
-    
-    @Before public void setup() {
-        converter = new IntegerStringConverter();
-    }
-    
-    @Test public void fromString_testValidStringInput() {
-        assertEquals((Integer) 10, converter.fromString("10"));
-    }
-    
-    @Test public void fromString_testValidStringInputWithWhiteSpace() {
-        assertEquals((Integer) 10, converter.fromString("      10      "));
-    }
-    
-    @Test public void toString_validInput() {
-        assertEquals("10", converter.toString(10));
-    }
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/util/converter/IntegerStringConverterTest.java	2015-08-31 10:25:18.997216220 -0400
@@ -0,0 +1,54 @@
+/*
+ * 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.util.converter;
+
+import javafx.util.converter.IntegerStringConverter;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ */
+public class IntegerStringConverterTest {
+    private IntegerStringConverter converter;
+    
+    @Before public void setup() {
+        converter = new IntegerStringConverter();
+    }
+    
+    @Test public void fromString_testValidStringInput() {
+        assertEquals((Integer) 10, converter.fromString("10"));
+    }
+    
+    @Test public void fromString_testValidStringInputWithWhiteSpace() {
+        assertEquals((Integer) 10, converter.fromString("      10      "));
+    }
+    
+    @Test public void toString_validInput() {
+        assertEquals("10", converter.toString(10));
+    }
+}