--- old/modules/base/src/test/java/javafx/beans/value/ObservableValueBaseTest.java	2015-08-31 10:24:20.513216877 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,212 +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.value;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.InvalidationListenerMock;
-import javafx.beans.Observable;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class ObservableValueBaseTest {
-
-	private static final Object UNDEFINED_VALUE = new Object();
-    private static final Object V1 = new Object();
-    private static final Object V2 = new Object();
-	
-    private ObservableObjectValueStub<Object> valueModel;
-    private InvalidationListenerMock invalidationListener;
-    private ChangeListenerMock<Object> changeListener;
-
-    @Before
-    public void setUp() {
-        valueModel = new ObservableObjectValueStub<Object>();
-        invalidationListener = new InvalidationListenerMock();
-        changeListener = new ChangeListenerMock<Object>(UNDEFINED_VALUE);
-    }
-
-    @Test
-    public void testInitialState() {
-    	// no exceptions etc.
-        valueModel.fireValueChangedEvent();
-    }
-
-    @Test
-    public void testOneInvalidationListener() {
-        // adding one observer
-        valueModel.addListener(invalidationListener);
-        System.gc(); // making sure we did not not overdo weak references
-        valueModel.set(V1);
-        invalidationListener.check(valueModel, 1);
-
-        // remove observer
-        valueModel.removeListener(invalidationListener);
-        valueModel.set(V2);
-        invalidationListener.check(null, 0);
-
-        // remove observer again
-        valueModel.removeListener(invalidationListener);
-        valueModel.set(V1);
-        invalidationListener.check(null, 0);
-    }
-
-    @Test
-    public void testOneChangeListener() {
-        // adding one observer
-        valueModel.addListener(changeListener);
-        System.gc(); // making sure we did not not overdo weak references
-        valueModel.set(V1);
-        changeListener.check(valueModel, null, V1, 1);
-        
-        // set same value again
-        valueModel.set(V1);
-        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
-        
-        // set null
-        valueModel.set(null);
-        changeListener.check(valueModel, V1, null, 1);
-        valueModel.set(null);
-        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
-
-        // remove observer
-        valueModel.removeListener(changeListener);
-        valueModel.set(V2);
-        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
-
-        // remove observer again
-        valueModel.removeListener(changeListener);
-        valueModel.set(V1);
-        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
-    }
-
-    @Test
-    public void testTwoObservers() {
-        final InvalidationListenerMock observer2 = new InvalidationListenerMock();
-
-        // adding two observers
-        valueModel.addListener(invalidationListener);
-        valueModel.addListener(observer2);
-        System.gc(); // making sure we did not not overdo weak references
-        valueModel.fireValueChangedEvent();
-        invalidationListener.check(valueModel, 1);
-        observer2.check(valueModel, 1);
-
-        // remove first observer
-        invalidationListener.reset();
-        observer2.reset();
-        valueModel.removeListener(invalidationListener);
-        valueModel.fireValueChangedEvent();
-        invalidationListener.check(null, 0);
-        observer2.check(valueModel, 1);
-
-        // remove second observer
-        observer2.reset();
-        valueModel.removeListener(observer2);
-        valueModel.fireValueChangedEvent();
-        invalidationListener.check(null, 0);
-        observer2.check(null, 0);
-
-        // remove observers in reverse order
-        observer2.reset();
-        valueModel.removeListener(observer2);
-        valueModel.removeListener(invalidationListener);
-        valueModel.fireValueChangedEvent();
-        invalidationListener.check(null, 0);
-        observer2.check(null, 0);
-    }
-
-    @Test
-    public void testConcurrentAdd() {
-        final InvalidationListenerMock observer2 = new AddingListenerMock();
-        valueModel.addListener(observer2);
-
-        // fire event that adds a second observer
-        // Note: there is no assumption if observer that is being added is notified
-        valueModel.fireValueChangedEvent();
-        observer2.check(valueModel, 1);
-
-        // fire event again, this time both observers need to be notified
-        invalidationListener.reset();
-        observer2.reset();
-        valueModel.fireValueChangedEvent();
-        invalidationListener.check(valueModel, 1);
-        observer2.check(valueModel, 1);
-    }
-
-    @Test
-    public void testConcurrentRemove() {
-        final InvalidationListenerMock observer2 = new RemovingListenerMock();
-        valueModel.addListener(observer2);
-        valueModel.addListener(invalidationListener);
-
-        // fire event that removes one observer
-        // Note: there is no assumption if observer that is being removed is notified
-        valueModel.fireValueChangedEvent();
-        observer2.check(valueModel, 1);
-
-        // fire event again, this time only non-removed observer is notified
-        invalidationListener.reset();
-        observer2.reset();
-        valueModel.fireValueChangedEvent();
-        invalidationListener.check(null, 0);
-        observer2.check(valueModel, 1);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testAddingNull_InvalidationListener() {
-        valueModel.addListener((InvalidationListener)null);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testAddingNull_ChangeListener() {
-        valueModel.addListener((ChangeListener<Object>)null);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testRemovingNull_InvalidationListener() {
-        valueModel.removeListener((InvalidationListener)null);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void testRemovingNull_ChangeListener() {
-        valueModel.removeListener((ChangeListener<Object>)null);
-    }
-
-    private class AddingListenerMock extends InvalidationListenerMock {
-        @Override public void invalidated(Observable valueModel) {
-            super.invalidated(valueModel);
-            valueModel.addListener(invalidationListener);
-        }
-    }
-
-    private class RemovingListenerMock extends InvalidationListenerMock {
-        @Override public void invalidated(Observable valueModel) {
-            super.invalidated(valueModel);
-            valueModel.removeListener(invalidationListener);
-        }
-    }
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/beans/value/ObservableValueBaseTest.java	2015-08-31 10:24:20.305216880 -0400
@@ -0,0 +1,215 @@
+/*
+ * 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.value;
+
+import test.javafx.beans.value.ChangeListenerMock;
+import javafx.beans.InvalidationListener;
+import test.javafx.beans.InvalidationListenerMock;
+import javafx.beans.Observable;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableObjectValueStub;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ObservableValueBaseTest {
+
+	private static final Object UNDEFINED_VALUE = new Object();
+    private static final Object V1 = new Object();
+    private static final Object V2 = new Object();
+	
+    private ObservableObjectValueStub<Object> valueModel;
+    private InvalidationListenerMock invalidationListener;
+    private ChangeListenerMock<Object> changeListener;
+
+    @Before
+    public void setUp() {
+        valueModel = new ObservableObjectValueStub<Object>();
+        invalidationListener = new InvalidationListenerMock();
+        changeListener = new ChangeListenerMock<Object>(UNDEFINED_VALUE);
+    }
+
+    @Test
+    public void testInitialState() {
+    	// no exceptions etc.
+        valueModel.fireValueChangedEvent();
+    }
+
+    @Test
+    public void testOneInvalidationListener() {
+        // adding one observer
+        valueModel.addListener(invalidationListener);
+        System.gc(); // making sure we did not not overdo weak references
+        valueModel.set(V1);
+        invalidationListener.check(valueModel, 1);
+
+        // remove observer
+        valueModel.removeListener(invalidationListener);
+        valueModel.set(V2);
+        invalidationListener.check(null, 0);
+
+        // remove observer again
+        valueModel.removeListener(invalidationListener);
+        valueModel.set(V1);
+        invalidationListener.check(null, 0);
+    }
+
+    @Test
+    public void testOneChangeListener() {
+        // adding one observer
+        valueModel.addListener(changeListener);
+        System.gc(); // making sure we did not not overdo weak references
+        valueModel.set(V1);
+        changeListener.check(valueModel, null, V1, 1);
+        
+        // set same value again
+        valueModel.set(V1);
+        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
+        
+        // set null
+        valueModel.set(null);
+        changeListener.check(valueModel, V1, null, 1);
+        valueModel.set(null);
+        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
+
+        // remove observer
+        valueModel.removeListener(changeListener);
+        valueModel.set(V2);
+        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
+
+        // remove observer again
+        valueModel.removeListener(changeListener);
+        valueModel.set(V1);
+        changeListener.check(null, UNDEFINED_VALUE, UNDEFINED_VALUE, 0);
+    }
+
+    @Test
+    public void testTwoObservers() {
+        final InvalidationListenerMock observer2 = new InvalidationListenerMock();
+
+        // adding two observers
+        valueModel.addListener(invalidationListener);
+        valueModel.addListener(observer2);
+        System.gc(); // making sure we did not not overdo weak references
+        valueModel.fireValueChangedEvent();
+        invalidationListener.check(valueModel, 1);
+        observer2.check(valueModel, 1);
+
+        // remove first observer
+        invalidationListener.reset();
+        observer2.reset();
+        valueModel.removeListener(invalidationListener);
+        valueModel.fireValueChangedEvent();
+        invalidationListener.check(null, 0);
+        observer2.check(valueModel, 1);
+
+        // remove second observer
+        observer2.reset();
+        valueModel.removeListener(observer2);
+        valueModel.fireValueChangedEvent();
+        invalidationListener.check(null, 0);
+        observer2.check(null, 0);
+
+        // remove observers in reverse order
+        observer2.reset();
+        valueModel.removeListener(observer2);
+        valueModel.removeListener(invalidationListener);
+        valueModel.fireValueChangedEvent();
+        invalidationListener.check(null, 0);
+        observer2.check(null, 0);
+    }
+
+    @Test
+    public void testConcurrentAdd() {
+        final InvalidationListenerMock observer2 = new AddingListenerMock();
+        valueModel.addListener(observer2);
+
+        // fire event that adds a second observer
+        // Note: there is no assumption if observer that is being added is notified
+        valueModel.fireValueChangedEvent();
+        observer2.check(valueModel, 1);
+
+        // fire event again, this time both observers need to be notified
+        invalidationListener.reset();
+        observer2.reset();
+        valueModel.fireValueChangedEvent();
+        invalidationListener.check(valueModel, 1);
+        observer2.check(valueModel, 1);
+    }
+
+    @Test
+    public void testConcurrentRemove() {
+        final InvalidationListenerMock observer2 = new RemovingListenerMock();
+        valueModel.addListener(observer2);
+        valueModel.addListener(invalidationListener);
+
+        // fire event that removes one observer
+        // Note: there is no assumption if observer that is being removed is notified
+        valueModel.fireValueChangedEvent();
+        observer2.check(valueModel, 1);
+
+        // fire event again, this time only non-removed observer is notified
+        invalidationListener.reset();
+        observer2.reset();
+        valueModel.fireValueChangedEvent();
+        invalidationListener.check(null, 0);
+        observer2.check(valueModel, 1);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testAddingNull_InvalidationListener() {
+        valueModel.addListener((InvalidationListener)null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testAddingNull_ChangeListener() {
+        valueModel.addListener((ChangeListener<Object>)null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testRemovingNull_InvalidationListener() {
+        valueModel.removeListener((InvalidationListener)null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void testRemovingNull_ChangeListener() {
+        valueModel.removeListener((ChangeListener<Object>)null);
+    }
+
+    private class AddingListenerMock extends InvalidationListenerMock {
+        @Override public void invalidated(Observable valueModel) {
+            super.invalidated(valueModel);
+            valueModel.addListener(invalidationListener);
+        }
+    }
+
+    private class RemovingListenerMock extends InvalidationListenerMock {
+        @Override public void invalidated(Observable valueModel) {
+            super.invalidated(valueModel);
+            valueModel.removeListener(invalidationListener);
+        }
+    }
+}