--- old/modules/base/src/test/java/javafx/beans/property/ReadOnlySetPropertyBaseTest.java	2015-08-31 10:23:49.109217230 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2012, 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 javafx.beans.InvalidationListenerMock;
-import javafx.beans.value.ChangeListenerMock;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableSet;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.fail;
-
-public class ReadOnlySetPropertyBaseTest {
-    
-    private static final Object UNDEFINED = null;
-    private static final Object DEFAULT = null;
-    private static final ObservableSet<Object> VALUE_1 = FXCollections.observableSet();
-    private static final ObservableSet<Object> VALUE_2 = FXCollections.observableSet(new Object());
-    
-    private ReadOnlyPropertyMock property;
-    private InvalidationListenerMock invalidationListener;
-    private ChangeListenerMock<Object> changeListener;
-
-    @Before
-    public void setUp() throws Exception {
-        property = new ReadOnlyPropertyMock();
-        invalidationListener = new InvalidationListenerMock();
-        changeListener = new ChangeListenerMock<Object>(UNDEFINED);
-    }
-    
-    @Test
-    public void testInvalidationListener() {
-        property.addListener(invalidationListener);
-        property.get();
-        invalidationListener.reset();
-        property.set(VALUE_1);
-        invalidationListener.check(property, 1);
-        property.removeListener(invalidationListener);
-        invalidationListener.reset();
-        property.set(VALUE_2);
-        invalidationListener.check(null, 0);
-    }
-
-    @Test
-    public void testChangeListener() {
-        property.addListener(changeListener);
-        property.get();
-        changeListener.reset();
-        property.set(VALUE_1);
-        changeListener.check(property, DEFAULT, VALUE_1, 1);
-        property.removeListener(changeListener);
-        changeListener.reset();
-        property.set(VALUE_2);
-        changeListener.check(null, UNDEFINED, UNDEFINED, 0);
-    }
-    
-    private static class ReadOnlyPropertyMock extends ReadOnlySetPropertyBase<Object> {
-
-        private ObservableSet<Object> value;
-        
-        @Override
-        public Object getBean() {
-            // not used
-            return null;
-        }
-
-        @Override
-        public String getName() {
-            // not used
-            return null;
-        }
-        
-        private void set(ObservableSet<Object> value) {
-            this.value = value;
-            fireValueChangedEvent();
-        }
-
-        @Override
-        public ObservableSet<Object> get() {
-            return value;
-        }
-
-        @Override
-        public ReadOnlyIntegerProperty sizeProperty() {
-            fail("Not in use");
-            return null;
-        }
-
-        @Override
-        public ReadOnlyBooleanProperty emptyProperty() {
-            fail("Not in use");
-            return null;
-        }
-    }
-
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/beans/property/ReadOnlySetPropertyBaseTest.java	2015-08-31 10:23:48.973217232 -0400
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2012, 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 javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.ReadOnlyIntegerProperty;
+import javafx.beans.property.ReadOnlySetPropertyBase;
+import javafx.beans.property.ReadOnlySetPropertyBaseShim;
+import test.javafx.beans.InvalidationListenerMock;
+import test.javafx.beans.value.ChangeListenerMock;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.fail;
+
+public class ReadOnlySetPropertyBaseTest {
+    
+    private static final Object UNDEFINED = null;
+    private static final Object DEFAULT = null;
+    private static final ObservableSet<Object> VALUE_1 = FXCollections.observableSet();
+    private static final ObservableSet<Object> VALUE_2 = FXCollections.observableSet(new Object());
+    
+    private ReadOnlyPropertyMock property;
+    private InvalidationListenerMock invalidationListener;
+    private ChangeListenerMock<Object> changeListener;
+
+    @Before
+    public void setUp() throws Exception {
+        property = new ReadOnlyPropertyMock();
+        invalidationListener = new InvalidationListenerMock();
+        changeListener = new ChangeListenerMock<Object>(UNDEFINED);
+    }
+    
+    @Test
+    public void testInvalidationListener() {
+        property.addListener(invalidationListener);
+        property.get();
+        invalidationListener.reset();
+        property.set(VALUE_1);
+        invalidationListener.check(property, 1);
+        property.removeListener(invalidationListener);
+        invalidationListener.reset();
+        property.set(VALUE_2);
+        invalidationListener.check(null, 0);
+    }
+
+    @Test
+    public void testChangeListener() {
+        property.addListener(changeListener);
+        property.get();
+        changeListener.reset();
+        property.set(VALUE_1);
+        changeListener.check(property, DEFAULT, VALUE_1, 1);
+        property.removeListener(changeListener);
+        changeListener.reset();
+        property.set(VALUE_2);
+        changeListener.check(null, UNDEFINED, UNDEFINED, 0);
+    }
+    
+    private static class ReadOnlyPropertyMock extends ReadOnlySetPropertyBase<Object> {
+
+        private ObservableSet<Object> value;
+        
+        @Override
+        public Object getBean() {
+            // not used
+            return null;
+        }
+
+        @Override
+        public String getName() {
+            // not used
+            return null;
+        }
+        
+        private void set(ObservableSet<Object> value) {
+            this.value = value;
+            ReadOnlySetPropertyBaseShim.fireValueChangedEvent(this);
+        }
+
+        @Override
+        public ObservableSet<Object> get() {
+            return value;
+        }
+
+        @Override
+        public ReadOnlyIntegerProperty sizeProperty() {
+            fail("Not in use");
+            return null;
+        }
+
+        @Override
+        public ReadOnlyBooleanProperty emptyProperty() {
+            fail("Not in use");
+            return null;
+        }
+    }
+
+}