--- old/modules/base/src/test/java/javafx/collections/MockListObserver.java	2015-08-31 10:24:50.845216536 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2010, 2015, 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.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import static org.junit.Assert.* ;
-
-/**
- * A mock observer that tracks calls to its onChanged() method,
- * combined with utility methods to make assertions on the calls made.
- *
- */
-public class MockListObserver<E> implements ListChangeListener<E> {
-    private boolean tooManyCalls;
-
-    static class Call<E> {
-        ObservableList<? extends E> list;
-        List<? extends E> removed;
-        int from;
-        int to;
-        private int[] permutation;
-        private boolean update;
-        @Override
-        public String toString() {
-            return  "removed: " + removed + ", from: " + from + ", to: " + to + ", permutation: " + Arrays.toString(permutation);
-        }
-    }
-
-    List<Call<E>> calls = new LinkedList<Call<E>>();
-
-    @Override
-    public void onChanged(Change<? extends E> change) {
-        if (calls.isEmpty()) {
-            while (change.next()) {
-                Call<E> call = new Call<E>();
-                call.list = change.getList();
-                call.removed = change.getRemoved();
-                call.from = change.getFrom();
-                call.to = change.getTo();
-                if (change.wasPermutated()) {
-                    call.permutation = new int[call.to - call.from];
-                    for (int i = 0; i < call.permutation.length; ++i) {
-                        call.permutation[i] = change.getPermutation(i + call.from);
-                    }
-                } else {
-                    call.permutation = new int[0];
-                }
-                call.update = change.wasUpdated();
-                calls.add(call);
-
-                // Check generic change assertions
-                assertFalse(change.wasPermutated() && change.wasUpdated());
-                assertFalse((change.wasAdded() || change.wasRemoved()) && change.wasUpdated());
-                assertFalse((change.wasAdded() || change.wasRemoved()) && change.wasPermutated());
-            }
-        } else {
-            tooManyCalls = true;
-        }
-    }
-
-    public void check0() {
-        assertEquals(0, calls.size());
-    }
-    
-    public void check1AddRemove(ObservableList<E> list,
-                       List<E> removed,
-                       int from,
-                       int to) {
-        assertFalse(tooManyCalls);
-        assertEquals(1, calls.size());
-        checkAddRemove(0, list, removed, from, to);
-    }
-
-    public void checkAddRemove(int idx, ObservableList<E> list,
-                       List<E> removed,
-                       int from,
-                       int to) {
-        if (removed == null) {
-            removed = Collections.<E>emptyList();
-        }
-        assertFalse(tooManyCalls);
-        Call<E> call = calls.get(idx);
-        assertSame(call.list, list);
-        assertEquals(call.removed, removed);
-        assertEquals(call.from, from);
-        assertEquals(call.to, to);
-        assertEquals(call.permutation.length, 0);
-    }
-
-    public void check1Permutation(ObservableList<E> list, int[] perm) {
-        assertFalse(tooManyCalls);
-        assertEquals(1, calls.size());
-        checkPermutation(0, list, 0, list.size(), perm);
-    }
-
-    public void check1Permutation(ObservableList<E> list, int from, int to, int[] perm) {
-        assertFalse(tooManyCalls);
-        assertEquals(1, calls.size());
-        checkPermutation(0, list, from, to, perm);
-    }
-
-    public void checkPermutation(int idx, ObservableList<E> list, int from, int to, int[] perm) {
-        assertFalse(tooManyCalls);
-        Call<E> call = calls.get(idx);
-        assertEquals(list, call.list);
-        assertEquals(Collections.EMPTY_LIST, call.removed);
-        assertEquals(from, call.from);
-        assertEquals(to, call.to);
-        assertArrayEquals(perm, call.permutation);
-    }
-    
-    public void check1Update(ObservableList<E> list, int from, int to) {
-        assertFalse(tooManyCalls);
-        assertEquals(1, calls.size());
-        checkUpdate(0, list, from, to);
-    }
-    
-    public void checkUpdate(int idx, ObservableList<E> list, int from, int to) {
-        assertFalse(tooManyCalls);
-        Call<E> call = calls.get(idx);
-        assertEquals(list, call.list);
-        assertEquals(Collections.EMPTY_LIST, call.removed);
-        assertArrayEquals(new int[0], call.permutation);
-        assertEquals(true, call.update);
-        assertEquals(from, call.from);
-        assertEquals(to, call.to);
-    }
-
-    public void check1() {
-        assertFalse(tooManyCalls);
-        assertEquals(1, calls.size());
-    }
-
-    public void clear() {
-        calls.clear();
-        tooManyCalls = false;
-    }
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/collections/MockListObserver.java	2015-08-31 10:24:50.709216538 -0400
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2010, 2015, 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.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import static org.junit.Assert.* ;
+
+/**
+ * A mock observer that tracks calls to its onChanged() method,
+ * combined with utility methods to make assertions on the calls made.
+ *
+ */
+public class MockListObserver<E> implements ListChangeListener<E> {
+    private boolean tooManyCalls;
+
+    static class Call<E> {
+        ObservableList<? extends E> list;
+        List<? extends E> removed;
+        int from;
+        int to;
+        private int[] permutation;
+        private boolean update;
+        @Override
+        public String toString() {
+            return  "removed: " + removed + ", from: " + from + ", to: " + to + ", permutation: " + Arrays.toString(permutation);
+        }
+    }
+
+    List<Call<E>> calls = new LinkedList<Call<E>>();
+
+    @Override
+    public void onChanged(Change<? extends E> change) {
+        if (calls.isEmpty()) {
+            while (change.next()) {
+                Call<E> call = new Call<E>();
+                call.list = change.getList();
+                call.removed = change.getRemoved();
+                call.from = change.getFrom();
+                call.to = change.getTo();
+                if (change.wasPermutated()) {
+                    call.permutation = new int[call.to - call.from];
+                    for (int i = 0; i < call.permutation.length; ++i) {
+                        call.permutation[i] = change.getPermutation(i + call.from);
+                    }
+                } else {
+                    call.permutation = new int[0];
+                }
+                call.update = change.wasUpdated();
+                calls.add(call);
+
+                // Check generic change assertions
+                assertFalse(change.wasPermutated() && change.wasUpdated());
+                assertFalse((change.wasAdded() || change.wasRemoved()) && change.wasUpdated());
+                assertFalse((change.wasAdded() || change.wasRemoved()) && change.wasPermutated());
+            }
+        } else {
+            tooManyCalls = true;
+        }
+    }
+
+    public void check0() {
+        assertEquals(0, calls.size());
+    }
+    
+    public void check1AddRemove(ObservableList<E> list,
+                       List<E> removed,
+                       int from,
+                       int to) {
+        assertFalse(tooManyCalls);
+        assertEquals(1, calls.size());
+        checkAddRemove(0, list, removed, from, to);
+    }
+
+    public void checkAddRemove(int idx, ObservableList<E> list,
+                       List<E> removed,
+                       int from,
+                       int to) {
+        if (removed == null) {
+            removed = Collections.<E>emptyList();
+        }
+        assertFalse(tooManyCalls);
+        Call<E> call = calls.get(idx);
+        assertSame(call.list, list);
+        assertEquals(call.removed, removed);
+        assertEquals(call.from, from);
+        assertEquals(call.to, to);
+        assertEquals(call.permutation.length, 0);
+    }
+
+    public void check1Permutation(ObservableList<E> list, int[] perm) {
+        assertFalse(tooManyCalls);
+        assertEquals(1, calls.size());
+        checkPermutation(0, list, 0, list.size(), perm);
+    }
+
+    public void check1Permutation(ObservableList<E> list, int from, int to, int[] perm) {
+        assertFalse(tooManyCalls);
+        assertEquals(1, calls.size());
+        checkPermutation(0, list, from, to, perm);
+    }
+
+    public void checkPermutation(int idx, ObservableList<E> list, int from, int to, int[] perm) {
+        assertFalse(tooManyCalls);
+        Call<E> call = calls.get(idx);
+        assertEquals(list, call.list);
+        assertEquals(Collections.EMPTY_LIST, call.removed);
+        assertEquals(from, call.from);
+        assertEquals(to, call.to);
+        assertArrayEquals(perm, call.permutation);
+    }
+    
+    public void check1Update(ObservableList<E> list, int from, int to) {
+        assertFalse(tooManyCalls);
+        assertEquals(1, calls.size());
+        checkUpdate(0, list, from, to);
+    }
+    
+    public void checkUpdate(int idx, ObservableList<E> list, int from, int to) {
+        assertFalse(tooManyCalls);
+        Call<E> call = calls.get(idx);
+        assertEquals(list, call.list);
+        assertEquals(Collections.EMPTY_LIST, call.removed);
+        assertArrayEquals(new int[0], call.permutation);
+        assertEquals(true, call.update);
+        assertEquals(from, call.from);
+        assertEquals(to, call.to);
+    }
+
+    public void check1() {
+        assertFalse(tooManyCalls);
+        assertEquals(1, calls.size());
+    }
+
+    public void clear() {
+        calls.clear();
+        tooManyCalls = false;
+    }
+}