--- old/modules/base/src/test/java/javafx/beans/property/ObjectPropertyTest.java	2015-08-31 10:23:29.529217450 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,173 +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.beans.property;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import javafx.beans.InvalidationListener;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-
-import org.junit.Test;
-
-public class ObjectPropertyTest {
-    
-    private static final Object NO_BEAN = null;
-    private static final String NO_NAME_1 = null;
-    private static final String NO_NAME_2 = "";
-    private static final Object VALUE_1 = new Object();
-    private static final Object VALUE_2 = new Object();
-    private static final Object DEFAULT = null;
-
-    @Test
-    public void testBindBidirectional() {
-        final ObjectProperty<Object> p1 = new SimpleObjectProperty<Object>(VALUE_2);
-        final ObjectProperty<Object> p2 = new SimpleObjectProperty<Object>(VALUE_1);
-        
-        p1.bindBidirectional(p2);
-        assertEquals(VALUE_1, p1.get());
-        assertEquals(VALUE_1, p2.get());
-        
-        p1.set(VALUE_2);
-        assertEquals(VALUE_2, p1.get());
-        assertEquals(VALUE_2, p2.get());
-        
-        p2.set(VALUE_1);
-        assertEquals(VALUE_1, p1.get());
-        assertEquals(VALUE_1, p2.get());
-        
-        p1.unbindBidirectional(p2);
-        p1.set(VALUE_2);
-        assertEquals(VALUE_2, p1.get());
-        assertEquals(VALUE_1, p2.get());
-        
-        p1.set(VALUE_1);
-        p2.set(VALUE_2);
-        assertEquals(VALUE_1, p1.get());
-        assertEquals(VALUE_2, p2.get());
-    }
-    
-    @Test
-    public void testToString() {
-        final ObjectProperty<Object> v0 = new ObjectPropertyStub(NO_BEAN, NO_NAME_1);
-        assertEquals("ObjectProperty [value: " + DEFAULT + "]", v0.toString());
-        
-        final ObjectProperty<Object> v1 = new ObjectPropertyStub(NO_BEAN, NO_NAME_2);
-        assertEquals("ObjectProperty [value: " + DEFAULT + "]", v1.toString());
-        
-        final Object bean = new Object();
-        final String name = "My name";
-        final ObjectProperty<Object> v2 = new ObjectPropertyStub(bean, name);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + DEFAULT + "]", v2.toString());
-        v2.set(VALUE_1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + VALUE_1 + "]", v2.toString());
-        
-        final ObjectProperty<Object> v3 = new ObjectPropertyStub(bean, NO_NAME_1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + DEFAULT + "]", v3.toString());
-        v3.set(VALUE_1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + VALUE_1 + "]", v3.toString());
-
-        final ObjectProperty<Object> v4 = new ObjectPropertyStub(bean, NO_NAME_2);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + DEFAULT + "]", v4.toString());
-        v4.set(VALUE_1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + VALUE_1 + "]", v4.toString());
-
-        final ObjectProperty<Object> v5 = new ObjectPropertyStub(NO_BEAN, name);
-        assertEquals("ObjectProperty [name: My name, value: " + DEFAULT + "]", v5.toString());
-        v5.set(VALUE_1);
-        assertEquals("ObjectProperty [name: My name, value: " + VALUE_1 + "]", v5.toString());
-    }
-    
-    private class ObjectPropertyStub extends ObjectProperty<Object> {
-        
-        private final Object bean;
-        private final String name;
-        private Object value;
-        
-        private ObjectPropertyStub(Object bean, String name) {
-            this.bean = bean;
-            this.name = name;
-        }
-
-        @Override
-        public Object getBean() {
-            return bean;
-        }
-
-        @Override
-        public String getName() {
-            return name;
-        }
-
-        @Override
-        public Object get() {
-            return value;
-        }
-
-        @Override
-        public void set(Object value) {
-            this.value = value;
-        }
-        
-        @Override
-        public void bind(ObservableValue<? extends Object> observable) {
-            fail("Not in use");
-        }
-
-        @Override
-        public void unbind() {
-            fail("Not in use");
-        }
-
-        @Override
-        public boolean isBound() {
-            fail("Not in use");
-            return false;
-        }
-
-        @Override
-        public void addListener(ChangeListener<? super Object> listener) {
-            fail("Not in use");
-        }
-
-        @Override
-        public void removeListener(ChangeListener<? super Object> listener) {
-            fail("Not in use");
-        }
-
-        @Override
-        public void addListener(InvalidationListener listener) {
-            fail("Not in use");
-        }
-
-        @Override
-        public void removeListener(InvalidationListener listener) {
-            fail("Not in use");
-        }
-
-    }
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/beans/property/ObjectPropertyTest.java	2015-08-31 10:23:29.393217452 -0400
@@ -0,0 +1,175 @@
+/*
+ * 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.beans.property;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import javafx.beans.InvalidationListener;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+
+import org.junit.Test;
+
+public class ObjectPropertyTest {
+    
+    private static final Object NO_BEAN = null;
+    private static final String NO_NAME_1 = null;
+    private static final String NO_NAME_2 = "";
+    private static final Object VALUE_1 = new Object();
+    private static final Object VALUE_2 = new Object();
+    private static final Object DEFAULT = null;
+
+    @Test
+    public void testBindBidirectional() {
+        final ObjectProperty<Object> p1 = new SimpleObjectProperty<Object>(VALUE_2);
+        final ObjectProperty<Object> p2 = new SimpleObjectProperty<Object>(VALUE_1);
+        
+        p1.bindBidirectional(p2);
+        assertEquals(VALUE_1, p1.get());
+        assertEquals(VALUE_1, p2.get());
+        
+        p1.set(VALUE_2);
+        assertEquals(VALUE_2, p1.get());
+        assertEquals(VALUE_2, p2.get());
+        
+        p2.set(VALUE_1);
+        assertEquals(VALUE_1, p1.get());
+        assertEquals(VALUE_1, p2.get());
+        
+        p1.unbindBidirectional(p2);
+        p1.set(VALUE_2);
+        assertEquals(VALUE_2, p1.get());
+        assertEquals(VALUE_1, p2.get());
+        
+        p1.set(VALUE_1);
+        p2.set(VALUE_2);
+        assertEquals(VALUE_1, p1.get());
+        assertEquals(VALUE_2, p2.get());
+    }
+    
+    @Test
+    public void testToString() {
+        final ObjectProperty<Object> v0 = new ObjectPropertyStub(NO_BEAN, NO_NAME_1);
+        assertEquals("ObjectProperty [value: " + DEFAULT + "]", v0.toString());
+        
+        final ObjectProperty<Object> v1 = new ObjectPropertyStub(NO_BEAN, NO_NAME_2);
+        assertEquals("ObjectProperty [value: " + DEFAULT + "]", v1.toString());
+        
+        final Object bean = new Object();
+        final String name = "My name";
+        final ObjectProperty<Object> v2 = new ObjectPropertyStub(bean, name);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + DEFAULT + "]", v2.toString());
+        v2.set(VALUE_1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + VALUE_1 + "]", v2.toString());
+        
+        final ObjectProperty<Object> v3 = new ObjectPropertyStub(bean, NO_NAME_1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + DEFAULT + "]", v3.toString());
+        v3.set(VALUE_1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + VALUE_1 + "]", v3.toString());
+
+        final ObjectProperty<Object> v4 = new ObjectPropertyStub(bean, NO_NAME_2);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + DEFAULT + "]", v4.toString());
+        v4.set(VALUE_1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + VALUE_1 + "]", v4.toString());
+
+        final ObjectProperty<Object> v5 = new ObjectPropertyStub(NO_BEAN, name);
+        assertEquals("ObjectProperty [name: My name, value: " + DEFAULT + "]", v5.toString());
+        v5.set(VALUE_1);
+        assertEquals("ObjectProperty [name: My name, value: " + VALUE_1 + "]", v5.toString());
+    }
+    
+    private class ObjectPropertyStub extends ObjectProperty<Object> {
+        
+        private final Object bean;
+        private final String name;
+        private Object value;
+        
+        private ObjectPropertyStub(Object bean, String name) {
+            this.bean = bean;
+            this.name = name;
+        }
+
+        @Override
+        public Object getBean() {
+            return bean;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public Object get() {
+            return value;
+        }
+
+        @Override
+        public void set(Object value) {
+            this.value = value;
+        }
+        
+        @Override
+        public void bind(ObservableValue<? extends Object> observable) {
+            fail("Not in use");
+        }
+
+        @Override
+        public void unbind() {
+            fail("Not in use");
+        }
+
+        @Override
+        public boolean isBound() {
+            fail("Not in use");
+            return false;
+        }
+
+        @Override
+        public void addListener(ChangeListener<? super Object> listener) {
+            fail("Not in use");
+        }
+
+        @Override
+        public void removeListener(ChangeListener<? super Object> listener) {
+            fail("Not in use");
+        }
+
+        @Override
+        public void addListener(InvalidationListener listener) {
+            fail("Not in use");
+        }
+
+        @Override
+        public void removeListener(InvalidationListener listener) {
+            fail("Not in use");
+        }
+
+    }
+}