--- old/modules/base/src/test/java/javafx/collections/MockMapObserver.java	2015-08-31 10:24:51.505216529 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2011, 2014, 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.collections;
-
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.List;
-import static org.junit.Assert.*;
-
-public class MockMapObserver<K, V> implements MapChangeListener<K, V> {
-
-    private List<Call> calls = new ArrayList<Call>();
-
-    @Override
-    public void onChanged(Change<? extends K,? extends V> c) {
-        calls.add(new Call<K, V>(c.getKey(), c.getValueRemoved(), c.getValueAdded()));
-    }
-
-    public int getCallsNumber() {
-        return calls.size();
-    }
-
-    public void clear() {
-        calls.clear();
-    }
-
-    public void check0() {
-        assertEquals(0, calls.size());
-    }
-
-    public void assertAdded(Tuple<K, V> tuple) {
-        assertAdded(0, tuple);
-    }
-
-    public void assertAdded(int call, Tuple<K, V> tuple) {
-        assertTrue("Missing call to the observer # " + call, call < calls.size());
-        assertEquals(calls.get(call).key, tuple.key);
-        assertEquals(calls.get(call).added, tuple.val);
-    }
-
-    public void assertMultipleCalls(Call<K, V>... calls) {
-        assertEquals(this.calls.size(), calls.length);
-        for (Call<K,V> c : calls) {
-            assertTrue(Arrays.toString(calls) + " doesn't contain "  + c, this.calls.contains(c));
-        }
-    }
-
-    public void assertMultipleRemove(Tuple<K, V>... tuples) {
-        assertEquals(this.calls.size(), tuples.length);
-        for (Tuple<K,V> t : tuples) {
-            assertTrue(calls + " doesn't contain "  + t, this.calls.contains(new Call<K,V>(t.key, t.val, null)));
-        }
-    }
-
-    public void assertRemoved(Tuple<K, V> tuple) {
-        assertRemoved(0, tuple);
-    }
-
-    public void assertRemoved(int call, Tuple<K, V> tuple) {
-        assertTrue("Missing call to the observer # " + call, call < calls.size());
-        assertEquals(calls.get(call).key, tuple.key);
-        assertEquals(calls.get(call).removed, tuple.val);
-    }
-
-    public void assertMultipleRemoved(Tuple<K, V>... tuples) {
-        for (Tuple<K,V> t : tuples) {
-            boolean found = false;
-            for (Call c : calls ) {
-                if (c.key.equals(t.key)) {
-                    assertEquals(c.removed, t.val);
-                    found = true;
-                    break;
-                }
-            }
-            assertTrue(found);
-        }
-    }
-
-    public static class Call<K, V> {
-        private K key;
-        private V removed;
-        private V added;
-
-        public Call(K key, V removed, V added) {
-            this.key = key;
-            this.removed = removed;
-            this.added = added;
-        }
-
-        public static<K, V> Call<K, V> call(K k, V o, V n) {
-            return new Call<K, V>(k, o, n);
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public boolean equals(Object obj) {
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            final Call<K, V> other = (Call<K, V>) obj;
-            if (this.key != other.key && (this.key == null || !this.key.equals(other.key))) {
-                return false;
-            }
-            if (this.removed != other.removed && (this.removed == null || !this.removed.equals(other.removed))) {
-                return false;
-            }
-            if (this.added != other.added && (this.added == null || !this.added.equals(other.added))) {
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        public int hashCode() {
-            int hash = 7;
-            hash = 47 * hash + (this.key != null ? this.key.hashCode() : 0);
-            hash = 47 * hash + (this.removed != null ? this.removed.hashCode() : 0);
-            hash = 47 * hash + (this.added != null ? this.added.hashCode() : 0);
-            return hash;
-        }
-
-        @Override
-        public String toString() {
-            return "[ " + key + " -> " + added + " (" + removed + ") ]";
-        }
-
-    }
-
-    public static class Tuple<K, V> {
-        public K key;
-        public V val;
-
-        private Tuple(K key, V val) {
-            this.key = key;
-            this.val = val;
-        }
-
-        public static<K, V> Tuple<K, V> tup(K k, V v) {
-            return new Tuple<K, V>(k, v);
-        }
-    }
-
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/collections/MockMapObserver.java	2015-08-31 10:24:51.369216531 -0400
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2011, 2014, 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.collections;
+
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;
+import javafx.collections.MapChangeListener;
+import static org.junit.Assert.*;
+
+public class MockMapObserver<K, V> implements MapChangeListener<K, V> {
+
+    private List<Call> calls = new ArrayList<Call>();
+
+    @Override
+    public void onChanged(Change<? extends K,? extends V> c) {
+        calls.add(new Call<K, V>(c.getKey(), c.getValueRemoved(), c.getValueAdded()));
+    }
+
+    public int getCallsNumber() {
+        return calls.size();
+    }
+
+    public void clear() {
+        calls.clear();
+    }
+
+    public void check0() {
+        assertEquals(0, calls.size());
+    }
+
+    public void assertAdded(Tuple<K, V> tuple) {
+        assertAdded(0, tuple);
+    }
+
+    public void assertAdded(int call, Tuple<K, V> tuple) {
+        assertTrue("Missing call to the observer # " + call, call < calls.size());
+        assertEquals(calls.get(call).key, tuple.key);
+        assertEquals(calls.get(call).added, tuple.val);
+    }
+
+    public void assertMultipleCalls(Call<K, V>... calls) {
+        assertEquals(this.calls.size(), calls.length);
+        for (Call<K,V> c : calls) {
+            assertTrue(Arrays.toString(calls) + " doesn't contain "  + c, this.calls.contains(c));
+        }
+    }
+
+    public void assertMultipleRemove(Tuple<K, V>... tuples) {
+        assertEquals(this.calls.size(), tuples.length);
+        for (Tuple<K,V> t : tuples) {
+            assertTrue(calls + " doesn't contain "  + t, this.calls.contains(new Call<K,V>(t.key, t.val, null)));
+        }
+    }
+
+    public void assertRemoved(Tuple<K, V> tuple) {
+        assertRemoved(0, tuple);
+    }
+
+    public void assertRemoved(int call, Tuple<K, V> tuple) {
+        assertTrue("Missing call to the observer # " + call, call < calls.size());
+        assertEquals(calls.get(call).key, tuple.key);
+        assertEquals(calls.get(call).removed, tuple.val);
+    }
+
+    public void assertMultipleRemoved(Tuple<K, V>... tuples) {
+        for (Tuple<K,V> t : tuples) {
+            boolean found = false;
+            for (Call c : calls ) {
+                if (c.key.equals(t.key)) {
+                    assertEquals(c.removed, t.val);
+                    found = true;
+                    break;
+                }
+            }
+            assertTrue(found);
+        }
+    }
+
+    public static class Call<K, V> {
+        private K key;
+        private V removed;
+        private V added;
+
+        public Call(K key, V removed, V added) {
+            this.key = key;
+            this.removed = removed;
+            this.added = added;
+        }
+
+        public static<K, V> Call<K, V> call(K k, V o, V n) {
+            return new Call<K, V>(k, o, n);
+        }
+
+        @Override
+        @SuppressWarnings("unchecked")
+        public boolean equals(Object obj) {
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            final Call<K, V> other = (Call<K, V>) obj;
+            if (this.key != other.key && (this.key == null || !this.key.equals(other.key))) {
+                return false;
+            }
+            if (this.removed != other.removed && (this.removed == null || !this.removed.equals(other.removed))) {
+                return false;
+            }
+            if (this.added != other.added && (this.added == null || !this.added.equals(other.added))) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            int hash = 7;
+            hash = 47 * hash + (this.key != null ? this.key.hashCode() : 0);
+            hash = 47 * hash + (this.removed != null ? this.removed.hashCode() : 0);
+            hash = 47 * hash + (this.added != null ? this.added.hashCode() : 0);
+            return hash;
+        }
+
+        @Override
+        public String toString() {
+            return "[ " + key + " -> " + added + " (" + removed + ") ]";
+        }
+
+    }
+
+    public static class Tuple<K, V> {
+        public K key;
+        public V val;
+
+        private Tuple(K key, V val) {
+            this.key = key;
+            this.val = val;
+        }
+
+        public static<K, V> Tuple<K, V> tup(K k, V v) {
+            return new Tuple<K, V>(k, v);
+        }
+    }
+
+}