--- old/modules/base/src/test/java/com/sun/javafx/binding/BidirectionalContentBindingMapTest.java	2015-08-31 10:22:49.145217904 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,293 +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 com.sun.javafx.binding;
-
-import javafx.beans.binding.Bindings;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableMap;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-public class BidirectionalContentBindingMapTest {
-    
-    private static final String key1 = "Key1";
-    private static final String key2_1 = "Key2_1";
-    private static final String key2_2 = "Key2_2";
-
-    private ObservableMap<String, Integer> op1;
-    private ObservableMap<String, Integer> op2;
-    private ObservableMap<String, Integer> op3;
-    private Map<String, Integer> map0;
-    private Map<String, Integer> map1;
-    private Map<String, Integer> map2;
-
-    @Before
-    public void setUp() {
-        map0 = new HashMap<String, Integer>();
-        map1 = new HashMap<String, Integer>();
-        map1.put(key1, -1);
-        map2 = new HashMap<String, Integer>();
-        map2.put(key2_1, 2);
-        map2.put(key2_2, 1);
-
-        op1 = FXCollections.observableMap(map1);
-        op2 = FXCollections.observableMap(map2);
-        op3 = FXCollections.observableMap(map0);
-    }
-
-    @Test
-    public void testBind() {
-        Bindings.bindContentBidirectional(op1, op2);
-        System.gc(); // making sure we did not not overdo weak references
-        assertEquals(map2, op1);
-        assertEquals(map2, op2);
-
-        op1.clear();
-        op1.putAll(map1);
-        assertEquals(map1, op1);
-        assertEquals(map1, op2);
-
-        op1.clear();
-        op1.putAll(map0);
-        assertEquals(map0, op1);
-        assertEquals(map0, op2);
-
-        op1.clear();
-        op1.putAll(map2);
-        assertEquals(map2, op1);
-        assertEquals(map2, op2);
-
-        op2.clear();
-        op2.putAll(map1);
-        assertEquals(map1, op1);
-        assertEquals(map1, op2);
-
-        op2.clear();
-        op2.putAll(map0);
-        assertEquals(map0, op1);
-        assertEquals(map0, op2);
-
-        op2.clear();
-        op2.putAll(map2);
-        assertEquals(map2, op1);
-        assertEquals(map2, op2);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testBind_Null_X() {
-        Bindings.bindContentBidirectional(null, op2);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testBind_X_Null() {
-        Bindings.bindContentBidirectional(op1, null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testBind_X_Self() {
-        Bindings.bindContentBidirectional(op1, op1);
-    }
-
-    @Test
-    public void testUnbind() {
-        // unbind non-existing binding => no-op
-        Bindings.unbindContentBidirectional(op1, op2);
-
-        Bindings.bindContentBidirectional(op1, op2);
-        System.gc(); // making sure we did not not overdo weak references
-        assertEquals(map2, op1);
-        assertEquals(map2, op2);
-
-        Bindings.unbindContentBidirectional(op1, op2);
-        System.gc();
-        assertEquals(map2, op1);
-        assertEquals(map2, op2);
-
-        op1.clear();
-        op1.putAll(map1);
-        assertEquals(map1, op1);
-        assertEquals(map2, op2);
-
-        op2.clear();
-        op2.putAll(map0);
-        assertEquals(map1, op1);
-        assertEquals(map0, op2);
-
-        // unbind in flipped order
-        Bindings.bindContentBidirectional(op1, op2);
-        System.gc(); // making sure we did not not overdo weak references
-        assertEquals(map0, op1);
-        assertEquals(map0, op2);
-
-        Bindings.unbindContentBidirectional(op2, op1);
-        System.gc();
-        assertEquals(map0, op1);
-        assertEquals(map0, op2);
-
-        op1.clear();
-        op1.putAll(map1);
-        assertEquals(map1, op1);
-        assertEquals(map0, op2);
-
-        op2.clear();
-        op2.putAll(map2);
-        assertEquals(map1, op1);
-        assertEquals(map2, op2);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testUnbind_Null_X() {
-        Bindings.unbindContentBidirectional(null, op2);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void testUnbind_X_Null() {
-        Bindings.unbindContentBidirectional(op1, null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testUnbind_X_Self() {
-        Bindings.unbindContentBidirectional(op1, op1);
-    }
-
-    @Test
-    public void testChaining() {
-        Bindings.bindContentBidirectional(op1, op2);
-        Bindings.bindContentBidirectional(op2, op3);
-        System.gc(); // making sure we did not not overdo weak references
-        assertEquals(map0, op1);
-        assertEquals(map0, op2);
-        assertEquals(map0, op3);
-
-        op1.clear();
-        op1.putAll(map1);
-        assertEquals(map1, op1);
-        assertEquals(map1, op2);
-        assertEquals(map1, op3);
-
-        op2.clear();
-        op2.putAll(map2);
-        assertEquals(map2, op1);
-        assertEquals(map2, op2);
-        assertEquals(map2, op3);
-
-        op3.clear();
-        op3.putAll(map0);
-        assertEquals(map0, op1);
-        assertEquals(map0, op2);
-        assertEquals(map0, op3);
-
-        // now unbind 
-        Bindings.unbindContentBidirectional(op1, op2);
-        System.gc(); // making sure we did not not overdo weak references
-        assertEquals(map0, op1);
-        assertEquals(map0, op2);
-        assertEquals(map0, op3);
-
-        op1.clear();
-        op1.putAll(map1);
-        assertEquals(map1, op1);
-        assertEquals(map0, op2);
-        assertEquals(map0, op3);
-
-        op2.clear();
-        op2.putAll(map2);
-        assertEquals(map1, op1);
-        assertEquals(map2, op2);
-        assertEquals(map2, op3);
-
-        op3.clear();
-        op3.putAll(map0);
-        assertEquals(map1, op1);
-        assertEquals(map0, op2);
-        assertEquals(map0, op3);
-    }
-
-    @Test
-    public void testHashCode() {
-        final int hc1 = BidirectionalContentBinding.bind(op1, op2).hashCode();
-        BidirectionalContentBinding.unbind(op1, op2);
-        final int hc2 = BidirectionalContentBinding.bind(op2, op1).hashCode();
-        assertEquals(hc1, hc2);
-    }
-
-    @Test
-    public void testEquals() {
-        final Object golden = BidirectionalContentBinding.bind(op1, op2);
-        BidirectionalContentBinding.unbind(op1, op2);
-
-        assertTrue(golden.equals(golden));
-        assertFalse(golden.equals(null));
-        assertFalse(golden.equals(op1));
-        assertTrue(golden.equals(BidirectionalContentBinding.bind(op1, op2)));
-        BidirectionalContentBinding.unbind(op1, op2);
-        assertTrue(golden.equals(BidirectionalContentBinding.bind(op2, op1)));
-        BidirectionalContentBinding.unbind(op1, op2);
-        assertFalse(golden.equals(BidirectionalContentBinding.bind(op1, op3)));
-        BidirectionalContentBinding.unbind(op1, op3);
-        assertFalse(golden.equals(BidirectionalContentBinding.bind(op3, op1)));
-        BidirectionalContentBinding.unbind(op1, op3);
-        assertFalse(golden.equals(BidirectionalContentBinding.bind(op3, op2)));
-        BidirectionalContentBinding.unbind(op2, op3);
-        assertFalse(golden.equals(BidirectionalContentBinding.bind(op2, op3)));
-        BidirectionalContentBinding.unbind(op2, op3);
-    }
-
-    @Test
-    public void testEqualsWithGCedProperty() {
-        final Object binding1 = BidirectionalContentBinding.bind(op1, op2);
-        BidirectionalContentBinding.unbind(op1, op2);
-        final Object binding2 = BidirectionalContentBinding.bind(op1, op2);
-        BidirectionalContentBinding.unbind(op1, op2);
-        final Object binding3 = BidirectionalContentBinding.bind(op2, op1);
-        BidirectionalContentBinding.unbind(op1, op2);
-        final Object binding4 = BidirectionalContentBinding.bind(op2, op1);
-        BidirectionalContentBinding.unbind(op1, op2);
-        op1 = null;
-        System.gc();
-
-        assertTrue(binding1.equals(binding1));
-        assertFalse(binding1.equals(binding2));
-        assertFalse(binding1.equals(binding3));
-
-        assertTrue(binding3.equals(binding3));
-        assertFalse(binding3.equals(binding1));
-        assertFalse(binding3.equals(binding4));
-    }
-
-    @Test
-    public void testChangeValue() {
-        Bindings.bindContentBidirectional(op1, op2);
-        assertEquals(2, op2.get(key2_1).intValue());
-        op1.put(key2_1, 1);
-        assertEquals(1, op2.get(key2_1).intValue());
-    }
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingMapTest.java	2015-08-31 10:22:48.937217907 -0400
@@ -0,0 +1,294 @@
+/*
+ * 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.com.sun.javafx.binding;
+
+import com.sun.javafx.binding.BidirectionalContentBinding;
+import javafx.beans.binding.Bindings;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableMap;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+public class BidirectionalContentBindingMapTest {
+    
+    private static final String key1 = "Key1";
+    private static final String key2_1 = "Key2_1";
+    private static final String key2_2 = "Key2_2";
+
+    private ObservableMap<String, Integer> op1;
+    private ObservableMap<String, Integer> op2;
+    private ObservableMap<String, Integer> op3;
+    private Map<String, Integer> map0;
+    private Map<String, Integer> map1;
+    private Map<String, Integer> map2;
+
+    @Before
+    public void setUp() {
+        map0 = new HashMap<String, Integer>();
+        map1 = new HashMap<String, Integer>();
+        map1.put(key1, -1);
+        map2 = new HashMap<String, Integer>();
+        map2.put(key2_1, 2);
+        map2.put(key2_2, 1);
+
+        op1 = FXCollections.observableMap(map1);
+        op2 = FXCollections.observableMap(map2);
+        op3 = FXCollections.observableMap(map0);
+    }
+
+    @Test
+    public void testBind() {
+        Bindings.bindContentBidirectional(op1, op2);
+        System.gc(); // making sure we did not not overdo weak references
+        assertEquals(map2, op1);
+        assertEquals(map2, op2);
+
+        op1.clear();
+        op1.putAll(map1);
+        assertEquals(map1, op1);
+        assertEquals(map1, op2);
+
+        op1.clear();
+        op1.putAll(map0);
+        assertEquals(map0, op1);
+        assertEquals(map0, op2);
+
+        op1.clear();
+        op1.putAll(map2);
+        assertEquals(map2, op1);
+        assertEquals(map2, op2);
+
+        op2.clear();
+        op2.putAll(map1);
+        assertEquals(map1, op1);
+        assertEquals(map1, op2);
+
+        op2.clear();
+        op2.putAll(map0);
+        assertEquals(map0, op1);
+        assertEquals(map0, op2);
+
+        op2.clear();
+        op2.putAll(map2);
+        assertEquals(map2, op1);
+        assertEquals(map2, op2);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testBind_Null_X() {
+        Bindings.bindContentBidirectional(null, op2);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testBind_X_Null() {
+        Bindings.bindContentBidirectional(op1, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testBind_X_Self() {
+        Bindings.bindContentBidirectional(op1, op1);
+    }
+
+    @Test
+    public void testUnbind() {
+        // unbind non-existing binding => no-op
+        Bindings.unbindContentBidirectional(op1, op2);
+
+        Bindings.bindContentBidirectional(op1, op2);
+        System.gc(); // making sure we did not not overdo weak references
+        assertEquals(map2, op1);
+        assertEquals(map2, op2);
+
+        Bindings.unbindContentBidirectional(op1, op2);
+        System.gc();
+        assertEquals(map2, op1);
+        assertEquals(map2, op2);
+
+        op1.clear();
+        op1.putAll(map1);
+        assertEquals(map1, op1);
+        assertEquals(map2, op2);
+
+        op2.clear();
+        op2.putAll(map0);
+        assertEquals(map1, op1);
+        assertEquals(map0, op2);
+
+        // unbind in flipped order
+        Bindings.bindContentBidirectional(op1, op2);
+        System.gc(); // making sure we did not not overdo weak references
+        assertEquals(map0, op1);
+        assertEquals(map0, op2);
+
+        Bindings.unbindContentBidirectional(op2, op1);
+        System.gc();
+        assertEquals(map0, op1);
+        assertEquals(map0, op2);
+
+        op1.clear();
+        op1.putAll(map1);
+        assertEquals(map1, op1);
+        assertEquals(map0, op2);
+
+        op2.clear();
+        op2.putAll(map2);
+        assertEquals(map1, op1);
+        assertEquals(map2, op2);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testUnbind_Null_X() {
+        Bindings.unbindContentBidirectional(null, op2);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testUnbind_X_Null() {
+        Bindings.unbindContentBidirectional(op1, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testUnbind_X_Self() {
+        Bindings.unbindContentBidirectional(op1, op1);
+    }
+
+    @Test
+    public void testChaining() {
+        Bindings.bindContentBidirectional(op1, op2);
+        Bindings.bindContentBidirectional(op2, op3);
+        System.gc(); // making sure we did not not overdo weak references
+        assertEquals(map0, op1);
+        assertEquals(map0, op2);
+        assertEquals(map0, op3);
+
+        op1.clear();
+        op1.putAll(map1);
+        assertEquals(map1, op1);
+        assertEquals(map1, op2);
+        assertEquals(map1, op3);
+
+        op2.clear();
+        op2.putAll(map2);
+        assertEquals(map2, op1);
+        assertEquals(map2, op2);
+        assertEquals(map2, op3);
+
+        op3.clear();
+        op3.putAll(map0);
+        assertEquals(map0, op1);
+        assertEquals(map0, op2);
+        assertEquals(map0, op3);
+
+        // now unbind 
+        Bindings.unbindContentBidirectional(op1, op2);
+        System.gc(); // making sure we did not not overdo weak references
+        assertEquals(map0, op1);
+        assertEquals(map0, op2);
+        assertEquals(map0, op3);
+
+        op1.clear();
+        op1.putAll(map1);
+        assertEquals(map1, op1);
+        assertEquals(map0, op2);
+        assertEquals(map0, op3);
+
+        op2.clear();
+        op2.putAll(map2);
+        assertEquals(map1, op1);
+        assertEquals(map2, op2);
+        assertEquals(map2, op3);
+
+        op3.clear();
+        op3.putAll(map0);
+        assertEquals(map1, op1);
+        assertEquals(map0, op2);
+        assertEquals(map0, op3);
+    }
+
+    @Test
+    public void testHashCode() {
+        final int hc1 = BidirectionalContentBinding.bind(op1, op2).hashCode();
+        BidirectionalContentBinding.unbind(op1, op2);
+        final int hc2 = BidirectionalContentBinding.bind(op2, op1).hashCode();
+        assertEquals(hc1, hc2);
+    }
+
+    @Test
+    public void testEquals() {
+        final Object golden = BidirectionalContentBinding.bind(op1, op2);
+        BidirectionalContentBinding.unbind(op1, op2);
+
+        assertTrue(golden.equals(golden));
+        assertFalse(golden.equals(null));
+        assertFalse(golden.equals(op1));
+        assertTrue(golden.equals(BidirectionalContentBinding.bind(op1, op2)));
+        BidirectionalContentBinding.unbind(op1, op2);
+        assertTrue(golden.equals(BidirectionalContentBinding.bind(op2, op1)));
+        BidirectionalContentBinding.unbind(op1, op2);
+        assertFalse(golden.equals(BidirectionalContentBinding.bind(op1, op3)));
+        BidirectionalContentBinding.unbind(op1, op3);
+        assertFalse(golden.equals(BidirectionalContentBinding.bind(op3, op1)));
+        BidirectionalContentBinding.unbind(op1, op3);
+        assertFalse(golden.equals(BidirectionalContentBinding.bind(op3, op2)));
+        BidirectionalContentBinding.unbind(op2, op3);
+        assertFalse(golden.equals(BidirectionalContentBinding.bind(op2, op3)));
+        BidirectionalContentBinding.unbind(op2, op3);
+    }
+
+    @Test
+    public void testEqualsWithGCedProperty() {
+        final Object binding1 = BidirectionalContentBinding.bind(op1, op2);
+        BidirectionalContentBinding.unbind(op1, op2);
+        final Object binding2 = BidirectionalContentBinding.bind(op1, op2);
+        BidirectionalContentBinding.unbind(op1, op2);
+        final Object binding3 = BidirectionalContentBinding.bind(op2, op1);
+        BidirectionalContentBinding.unbind(op1, op2);
+        final Object binding4 = BidirectionalContentBinding.bind(op2, op1);
+        BidirectionalContentBinding.unbind(op1, op2);
+        op1 = null;
+        System.gc();
+
+        assertTrue(binding1.equals(binding1));
+        assertFalse(binding1.equals(binding2));
+        assertFalse(binding1.equals(binding3));
+
+        assertTrue(binding3.equals(binding3));
+        assertFalse(binding3.equals(binding1));
+        assertFalse(binding3.equals(binding4));
+    }
+
+    @Test
+    public void testChangeValue() {
+        Bindings.bindContentBidirectional(op1, op2);
+        assertEquals(2, op2.get(key2_1).intValue());
+        op1.put(key2_1, 1);
+        assertEquals(1, op2.get(key2_1).intValue());
+    }
+}