--- old/modules/base/src/test/java/javafx/beans/property/ObjectPropertyBaseTest.java	2015-08-31 10:23:28.937217457 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,444 +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.property;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import javafx.beans.InvalidationListenerMock;
-import javafx.beans.value.ChangeListenerMock;
-import javafx.beans.value.ObservableObjectValueStub;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class ObjectPropertyBaseTest {
-
-    private static final Object NO_BEAN = null;
-    private static final String NO_NAME_1 = null;
-    private static final String NO_NAME_2 = "";
-    private static final Object UNDEFINED = new Object();
-	private static final Object VALUE_1a = new Object();
-	private static final Object VALUE_1b = new Object();
-	private static final Object VALUE_2a = new Object();
-	private static final Object VALUE_2b = new Object();
-	
-	private ObjectPropertyMock property;
-	private InvalidationListenerMock invalidationListener;
-	private ChangeListenerMock<Object> changeListener;
-
-	@Before
-	public void setUp() throws Exception {
-		property = new ObjectPropertyMock();
-		invalidationListener = new InvalidationListenerMock();
-        changeListener = new ChangeListenerMock<Object>(UNDEFINED);
-	}
-
-	private void attachInvalidationListener() {
-		property.addListener(invalidationListener);
-		property.get();
-		invalidationListener.reset();
-	}
-
-	private void attachChangeListener() {
-		property.addListener(changeListener);
-		property.get();
-		changeListener.reset();
-	}
-
-	@Test
-	public void testConstructor() {
-		final ObjectProperty<Object> p1 = new SimpleObjectProperty<Object>();
-		assertEquals(null, p1.get());
-		assertEquals(null, p1.getValue());
-		assertFalse(property.isBound());
-		
-		final ObjectProperty<Object> p2 = new SimpleObjectProperty<Object>(VALUE_1b);
-		assertEquals(VALUE_1b, p2.get());
-		assertEquals(VALUE_1b, p2.getValue());
-		assertFalse(property.isBound());
-	}
-
-    @Test
-    public void testInvalidationListener() {
-        attachInvalidationListener();
-        property.set(VALUE_2a);
-        invalidationListener.check(property, 1);
-        property.removeListener(invalidationListener);
-        invalidationListener.reset();
-        property.set(VALUE_1a);
-        invalidationListener.check(null, 0);
-    }
-
-    @Test
-    public void testChangeListener() {
-        attachChangeListener();
-        property.set(VALUE_2a);
-        changeListener.check(property, null, VALUE_2a, 1);
-        property.removeListener(changeListener);
-        changeListener.reset();
-        property.set(VALUE_1a);
-        changeListener.check(null, UNDEFINED, UNDEFINED, 0);
-    }
-
-	@Test
-	public void testLazySet() {
-		attachInvalidationListener();
-
-		// set value once
-		property.set(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(1);
-		invalidationListener.check(property, 1);
-
-		// set same value again
-		property.set(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(0);
-		invalidationListener.check(null, 0);
-
-		// set value twice without reading
-		property.set(VALUE_1a);
-		property.set(VALUE_1b);
-		assertEquals(VALUE_1b, property.get());
-		property.check(1);
-		invalidationListener.check(property, 1);
-	}
-
-	@Test
-	public void testEagerSet() {
-		attachChangeListener();
-
-		// set value once
-		property.set(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(1);
-		changeListener.check(property, null, VALUE_2a, 1);
-
-		// set same value again
-		property.set(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(0);
-		changeListener.check(null, UNDEFINED, UNDEFINED, 0);
-
-		// set value twice without reading
-		property.set(VALUE_1a);
-		property.set(VALUE_1b);
-		assertEquals(VALUE_1b, property.get());
-		property.check(2);
-		changeListener.check(property, VALUE_1a, VALUE_1b, 2);
-	}
-
-	@Test
-	public void testLazySetValue() {
-		attachInvalidationListener();
-
-		// set value once
-		property.setValue(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(1);
-		invalidationListener.check(property, 1);
-
-		// set same value again
-		property.setValue(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(0);
-		invalidationListener.check(null, 0);
-
-		// set value twice without reading
-		property.setValue(VALUE_1a);
-		property.setValue(VALUE_1b);
-		assertEquals(VALUE_1b, property.get());
-		property.check(1);
-		invalidationListener.check(property, 1);
-	}
-
-	@Test
-	public void testEagerSetValue() {
-		attachChangeListener();
-
-		// set value once
-		property.setValue(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(1);
-		changeListener.check(property, null, VALUE_2a, 1);
-
-		// set same value again
-		property.setValue(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(0);
-		changeListener.check(null, UNDEFINED, UNDEFINED, 0);
-
-		// set value twice without reading
-		property.setValue(VALUE_1a);
-		property.setValue(VALUE_1b);
-		assertEquals(VALUE_1b, property.get());
-		property.check(2);
-		changeListener.check(property, VALUE_1a, VALUE_1b, 2);
-	}
-
-	@Test(expected=RuntimeException.class)
-	public void testSetBoundValue() {
-		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(VALUE_1a);
-		property.bind(v);
-		property.set(VALUE_1a);
-	}
-
-	@Test
-	public void testLazyBind() {
-		attachInvalidationListener();
-		final ObservableObjectValueStub<Object> v = new ObservableObjectValueStub<Object>(VALUE_1a);
-
-		property.bind(v);
-		assertEquals(VALUE_1a, property.get());
-		assertTrue(property.isBound());
-		property.check(1);
-		invalidationListener.check(property, 1);
-
-		// change binding once
-		v.set(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(1);
-		invalidationListener.check(property, 1);
-
-		// change binding twice without reading
-		v.set(VALUE_1a);
-		v.set(VALUE_1b);
-		assertEquals(VALUE_1b, property.get());
-		property.check(1);
-		invalidationListener.check(property, 1);
-
-		// change binding twice to same value
-		v.set(VALUE_1a);
-		v.set(VALUE_1a);
-		assertEquals(VALUE_1a, property.get());
-		property.check(1);
-		invalidationListener.check(property, 1);
-	}
-
-	@Test
-	public void testEagerBind() {
-		attachChangeListener();
-		final ObservableObjectValueStub<Object> v = new ObservableObjectValueStub<Object>(VALUE_1a);
-
-		property.bind(v);
-		assertEquals(VALUE_1a, property.get());
-		assertTrue(property.isBound());
-		property.check(1);
-		changeListener.check(property, null, VALUE_1a, 1);
-
-		// change binding once
-		v.set(VALUE_2a);
-		assertEquals(VALUE_2a, property.get());
-		property.check(1);
-		changeListener.check(property, VALUE_1a, VALUE_2a, 1);
-
-		// change binding twice without reading
-		v.set(VALUE_1a);
-		v.set(VALUE_1b);
-		assertEquals(VALUE_1b, property.get());
-		property.check(2);
-		changeListener.check(property, VALUE_1a, VALUE_1b, 2);
-
-		// change binding twice to same value
-		v.set(VALUE_1a);
-		v.set(VALUE_1a);
-		assertEquals(VALUE_1a, property.get());
-		property.check(2);
-		changeListener.check(property, VALUE_1b, VALUE_1a, 1);
-	}
-
-	@Test(expected=NullPointerException.class)
-	public void testBindToNull() {
-		property.bind(null);
-	}
-
-	@Test
-	public void testRebind() {
-		attachInvalidationListener();
-		final ObjectProperty<Object> v1 = new SimpleObjectProperty<Object>(VALUE_1a);
-		final ObjectProperty<Object> v2 = new SimpleObjectProperty<Object>(VALUE_2a);
-		property.bind(v1);
-		property.get();
-		property.reset();
-		invalidationListener.reset();
-		
-		// rebind causes invalidation event
-		property.bind(v2);
-		assertEquals(VALUE_2a, property.get());
-		assertTrue(property.isBound());
-		assertEquals(1, property.counter);
-		invalidationListener.check(property, 1);
-		property.reset();
-		
-		// change old binding
-		v1.set(VALUE_1b);
-		assertEquals(VALUE_2a, property.get());
-		assertEquals(0, property.counter);
-		invalidationListener.check(null, 0);
-		property.reset();
-		
-		// change new binding
-		v2.set(VALUE_2b);
-		assertEquals(VALUE_2b, property.get());
-		assertEquals(1, property.counter);
-		invalidationListener.check(property, 1);
-		property.reset();
-		
-		// rebind to same observable should have no effect
-		property.bind(v2);
-		assertEquals(VALUE_2b, property.get());
-		assertTrue(property.isBound());
-		assertEquals(0, property.counter);
-		invalidationListener.check(null, 0);
-	}
-
-	@Test
-	public void testUnbind() {
-		attachInvalidationListener();
-		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(VALUE_1a);
-		property.bind(v);
-		property.unbind();
-		assertEquals(VALUE_1a, property.get());
-		assertFalse(property.isBound());
-        property.reset();
-        invalidationListener.reset();
-		
-		// change binding
-		v.set(VALUE_2a);
-		assertEquals(VALUE_1a, property.get());
-		assertEquals(0, property.counter);
-		invalidationListener.check(null, 0);
-		property.reset();
-		
-		// set value
-		property.set(VALUE_1b);
-		assertEquals(VALUE_1b, property.get());
-		assertEquals(1, property.counter);
-		invalidationListener.check(property, 1);
-	}
-	
-	@Test
-	public void testAddingListenerWillAlwaysReceiveInvalidationEvent() {
-		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(VALUE_1a);
-		final InvalidationListenerMock listener2 = new InvalidationListenerMock();
-		final InvalidationListenerMock listener3 = new InvalidationListenerMock();
-
-		// setting the property
-		property.set(VALUE_1a);
-		property.addListener(listener2);
-		listener2.reset();
-		property.set(VALUE_1b);
-		listener2.check(property, 1);
-		
-		// binding the property
-		property.bind(v);
-		v.set(VALUE_2a);
-		property.addListener(listener3);
-		v.get();
-		listener3.reset();
-		v.set(VALUE_2b);
-		listener3.check(property, 1);
-	}
-	
-	@Test
-	public void testToString() {
-		final Object value1 = new Object();
-		final Object value2 = new Object();
-		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(value2);
-		
-		property.set(value1);
-		assertEquals("ObjectProperty [value: " + value1 + "]", property.toString());
-		
-		property.bind(v);
-		assertEquals("ObjectProperty [bound, invalid]", property.toString());
-		property.get();
-		assertEquals("ObjectProperty [bound, value: " + value2 + "]", property.toString());
-		v.set(value1);
-		assertEquals("ObjectProperty [bound, invalid]", property.toString());
-		property.get();
-		assertEquals("ObjectProperty [bound, value: " + value1 + "]", property.toString());
-        
-        final Object bean = new Object();
-        final String name = "My name";
-        final ObjectProperty<Object> v1 = new ObjectPropertyMock(bean, name);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + null + "]", v1.toString());
-        v1.set(value1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + value1 + "]", v1.toString());
-        
-        final ObjectProperty<Object> v2 = new ObjectPropertyMock(bean, NO_NAME_1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + null + "]", v2.toString());
-        v2.set(value1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + value1 + "]", v2.toString());
-
-        final ObjectProperty<Object> v3 = new ObjectPropertyMock(bean, NO_NAME_2);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + null + "]", v3.toString());
-        v3.set(value1);
-        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + value1 + "]", v3.toString());
-
-        final ObjectProperty<Object> v4 = new ObjectPropertyMock(NO_BEAN, name);
-        assertEquals("ObjectProperty [name: My name, value: " + null + "]", v4.toString());
-        v4.set(value1);
-        assertEquals("ObjectProperty [name: My name, value: " + value1 + "]", v4.toString());
-	}
-	
-	private static class ObjectPropertyMock extends ObjectPropertyBase<Object> {
-        
-        private final Object bean;
-        private final String name;
-		private int counter;
-		
-        private ObjectPropertyMock() {
-            this.bean = NO_BEAN;
-            this.name = NO_NAME_1;
-        }
-        
-        private ObjectPropertyMock(Object bean, String name) {
-            this.bean = bean;
-            this.name = name;
-        }
-        
-		@Override
-		protected void invalidated() {
-			counter++;
-		}
-		
-		private void check(int expected) {
-			assertEquals(expected, counter);
-			reset();
-		}
-
-		private void reset() {
-			counter = 0;
-		}
-
-        @Override public Object getBean() { return bean; }
-
-        @Override public String getName() { return name; }
-	}
-
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/beans/property/ObjectPropertyBaseTest.java	2015-08-31 10:23:28.797217459 -0400
@@ -0,0 +1,447 @@
+/*
+ * 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.property;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ObjectPropertyBase;
+import javafx.beans.property.SimpleObjectProperty;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import test.javafx.beans.InvalidationListenerMock;
+import test.javafx.beans.value.ChangeListenerMock;
+import javafx.beans.value.ObservableObjectValueStub;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ObjectPropertyBaseTest {
+
+    private static final Object NO_BEAN = null;
+    private static final String NO_NAME_1 = null;
+    private static final String NO_NAME_2 = "";
+    private static final Object UNDEFINED = new Object();
+	private static final Object VALUE_1a = new Object();
+	private static final Object VALUE_1b = new Object();
+	private static final Object VALUE_2a = new Object();
+	private static final Object VALUE_2b = new Object();
+	
+	private ObjectPropertyMock property;
+	private InvalidationListenerMock invalidationListener;
+	private ChangeListenerMock<Object> changeListener;
+
+	@Before
+	public void setUp() throws Exception {
+		property = new ObjectPropertyMock();
+		invalidationListener = new InvalidationListenerMock();
+        changeListener = new ChangeListenerMock<Object>(UNDEFINED);
+	}
+
+	private void attachInvalidationListener() {
+		property.addListener(invalidationListener);
+		property.get();
+		invalidationListener.reset();
+	}
+
+	private void attachChangeListener() {
+		property.addListener(changeListener);
+		property.get();
+		changeListener.reset();
+	}
+
+	@Test
+	public void testConstructor() {
+		final ObjectProperty<Object> p1 = new SimpleObjectProperty<Object>();
+		assertEquals(null, p1.get());
+		assertEquals(null, p1.getValue());
+		assertFalse(property.isBound());
+		
+		final ObjectProperty<Object> p2 = new SimpleObjectProperty<Object>(VALUE_1b);
+		assertEquals(VALUE_1b, p2.get());
+		assertEquals(VALUE_1b, p2.getValue());
+		assertFalse(property.isBound());
+	}
+
+    @Test
+    public void testInvalidationListener() {
+        attachInvalidationListener();
+        property.set(VALUE_2a);
+        invalidationListener.check(property, 1);
+        property.removeListener(invalidationListener);
+        invalidationListener.reset();
+        property.set(VALUE_1a);
+        invalidationListener.check(null, 0);
+    }
+
+    @Test
+    public void testChangeListener() {
+        attachChangeListener();
+        property.set(VALUE_2a);
+        changeListener.check(property, null, VALUE_2a, 1);
+        property.removeListener(changeListener);
+        changeListener.reset();
+        property.set(VALUE_1a);
+        changeListener.check(null, UNDEFINED, UNDEFINED, 0);
+    }
+
+	@Test
+	public void testLazySet() {
+		attachInvalidationListener();
+
+		// set value once
+		property.set(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(1);
+		invalidationListener.check(property, 1);
+
+		// set same value again
+		property.set(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(0);
+		invalidationListener.check(null, 0);
+
+		// set value twice without reading
+		property.set(VALUE_1a);
+		property.set(VALUE_1b);
+		assertEquals(VALUE_1b, property.get());
+		property.check(1);
+		invalidationListener.check(property, 1);
+	}
+
+	@Test
+	public void testEagerSet() {
+		attachChangeListener();
+
+		// set value once
+		property.set(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(1);
+		changeListener.check(property, null, VALUE_2a, 1);
+
+		// set same value again
+		property.set(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(0);
+		changeListener.check(null, UNDEFINED, UNDEFINED, 0);
+
+		// set value twice without reading
+		property.set(VALUE_1a);
+		property.set(VALUE_1b);
+		assertEquals(VALUE_1b, property.get());
+		property.check(2);
+		changeListener.check(property, VALUE_1a, VALUE_1b, 2);
+	}
+
+	@Test
+	public void testLazySetValue() {
+		attachInvalidationListener();
+
+		// set value once
+		property.setValue(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(1);
+		invalidationListener.check(property, 1);
+
+		// set same value again
+		property.setValue(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(0);
+		invalidationListener.check(null, 0);
+
+		// set value twice without reading
+		property.setValue(VALUE_1a);
+		property.setValue(VALUE_1b);
+		assertEquals(VALUE_1b, property.get());
+		property.check(1);
+		invalidationListener.check(property, 1);
+	}
+
+	@Test
+	public void testEagerSetValue() {
+		attachChangeListener();
+
+		// set value once
+		property.setValue(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(1);
+		changeListener.check(property, null, VALUE_2a, 1);
+
+		// set same value again
+		property.setValue(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(0);
+		changeListener.check(null, UNDEFINED, UNDEFINED, 0);
+
+		// set value twice without reading
+		property.setValue(VALUE_1a);
+		property.setValue(VALUE_1b);
+		assertEquals(VALUE_1b, property.get());
+		property.check(2);
+		changeListener.check(property, VALUE_1a, VALUE_1b, 2);
+	}
+
+	@Test(expected=RuntimeException.class)
+	public void testSetBoundValue() {
+		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(VALUE_1a);
+		property.bind(v);
+		property.set(VALUE_1a);
+	}
+
+	@Test
+	public void testLazyBind() {
+		attachInvalidationListener();
+		final ObservableObjectValueStub<Object> v = new ObservableObjectValueStub<Object>(VALUE_1a);
+
+		property.bind(v);
+		assertEquals(VALUE_1a, property.get());
+		assertTrue(property.isBound());
+		property.check(1);
+		invalidationListener.check(property, 1);
+
+		// change binding once
+		v.set(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(1);
+		invalidationListener.check(property, 1);
+
+		// change binding twice without reading
+		v.set(VALUE_1a);
+		v.set(VALUE_1b);
+		assertEquals(VALUE_1b, property.get());
+		property.check(1);
+		invalidationListener.check(property, 1);
+
+		// change binding twice to same value
+		v.set(VALUE_1a);
+		v.set(VALUE_1a);
+		assertEquals(VALUE_1a, property.get());
+		property.check(1);
+		invalidationListener.check(property, 1);
+	}
+
+	@Test
+	public void testEagerBind() {
+		attachChangeListener();
+		final ObservableObjectValueStub<Object> v = new ObservableObjectValueStub<Object>(VALUE_1a);
+
+		property.bind(v);
+		assertEquals(VALUE_1a, property.get());
+		assertTrue(property.isBound());
+		property.check(1);
+		changeListener.check(property, null, VALUE_1a, 1);
+
+		// change binding once
+		v.set(VALUE_2a);
+		assertEquals(VALUE_2a, property.get());
+		property.check(1);
+		changeListener.check(property, VALUE_1a, VALUE_2a, 1);
+
+		// change binding twice without reading
+		v.set(VALUE_1a);
+		v.set(VALUE_1b);
+		assertEquals(VALUE_1b, property.get());
+		property.check(2);
+		changeListener.check(property, VALUE_1a, VALUE_1b, 2);
+
+		// change binding twice to same value
+		v.set(VALUE_1a);
+		v.set(VALUE_1a);
+		assertEquals(VALUE_1a, property.get());
+		property.check(2);
+		changeListener.check(property, VALUE_1b, VALUE_1a, 1);
+	}
+
+	@Test(expected=NullPointerException.class)
+	public void testBindToNull() {
+		property.bind(null);
+	}
+
+	@Test
+	public void testRebind() {
+		attachInvalidationListener();
+		final ObjectProperty<Object> v1 = new SimpleObjectProperty<Object>(VALUE_1a);
+		final ObjectProperty<Object> v2 = new SimpleObjectProperty<Object>(VALUE_2a);
+		property.bind(v1);
+		property.get();
+		property.reset();
+		invalidationListener.reset();
+		
+		// rebind causes invalidation event
+		property.bind(v2);
+		assertEquals(VALUE_2a, property.get());
+		assertTrue(property.isBound());
+		assertEquals(1, property.counter);
+		invalidationListener.check(property, 1);
+		property.reset();
+		
+		// change old binding
+		v1.set(VALUE_1b);
+		assertEquals(VALUE_2a, property.get());
+		assertEquals(0, property.counter);
+		invalidationListener.check(null, 0);
+		property.reset();
+		
+		// change new binding
+		v2.set(VALUE_2b);
+		assertEquals(VALUE_2b, property.get());
+		assertEquals(1, property.counter);
+		invalidationListener.check(property, 1);
+		property.reset();
+		
+		// rebind to same observable should have no effect
+		property.bind(v2);
+		assertEquals(VALUE_2b, property.get());
+		assertTrue(property.isBound());
+		assertEquals(0, property.counter);
+		invalidationListener.check(null, 0);
+	}
+
+	@Test
+	public void testUnbind() {
+		attachInvalidationListener();
+		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(VALUE_1a);
+		property.bind(v);
+		property.unbind();
+		assertEquals(VALUE_1a, property.get());
+		assertFalse(property.isBound());
+        property.reset();
+        invalidationListener.reset();
+		
+		// change binding
+		v.set(VALUE_2a);
+		assertEquals(VALUE_1a, property.get());
+		assertEquals(0, property.counter);
+		invalidationListener.check(null, 0);
+		property.reset();
+		
+		// set value
+		property.set(VALUE_1b);
+		assertEquals(VALUE_1b, property.get());
+		assertEquals(1, property.counter);
+		invalidationListener.check(property, 1);
+	}
+	
+	@Test
+	public void testAddingListenerWillAlwaysReceiveInvalidationEvent() {
+		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(VALUE_1a);
+		final InvalidationListenerMock listener2 = new InvalidationListenerMock();
+		final InvalidationListenerMock listener3 = new InvalidationListenerMock();
+
+		// setting the property
+		property.set(VALUE_1a);
+		property.addListener(listener2);
+		listener2.reset();
+		property.set(VALUE_1b);
+		listener2.check(property, 1);
+		
+		// binding the property
+		property.bind(v);
+		v.set(VALUE_2a);
+		property.addListener(listener3);
+		v.get();
+		listener3.reset();
+		v.set(VALUE_2b);
+		listener3.check(property, 1);
+	}
+	
+	@Test
+	public void testToString() {
+		final Object value1 = new Object();
+		final Object value2 = new Object();
+		final ObjectProperty<Object> v = new SimpleObjectProperty<Object>(value2);
+		
+		property.set(value1);
+		assertEquals("ObjectProperty [value: " + value1 + "]", property.toString());
+		
+		property.bind(v);
+		assertEquals("ObjectProperty [bound, invalid]", property.toString());
+		property.get();
+		assertEquals("ObjectProperty [bound, value: " + value2 + "]", property.toString());
+		v.set(value1);
+		assertEquals("ObjectProperty [bound, invalid]", property.toString());
+		property.get();
+		assertEquals("ObjectProperty [bound, value: " + value1 + "]", property.toString());
+        
+        final Object bean = new Object();
+        final String name = "My name";
+        final ObjectProperty<Object> v1 = new ObjectPropertyMock(bean, name);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + null + "]", v1.toString());
+        v1.set(value1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", name: My name, value: " + value1 + "]", v1.toString());
+        
+        final ObjectProperty<Object> v2 = new ObjectPropertyMock(bean, NO_NAME_1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + null + "]", v2.toString());
+        v2.set(value1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + value1 + "]", v2.toString());
+
+        final ObjectProperty<Object> v3 = new ObjectPropertyMock(bean, NO_NAME_2);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + null + "]", v3.toString());
+        v3.set(value1);
+        assertEquals("ObjectProperty [bean: " + bean.toString() + ", value: " + value1 + "]", v3.toString());
+
+        final ObjectProperty<Object> v4 = new ObjectPropertyMock(NO_BEAN, name);
+        assertEquals("ObjectProperty [name: My name, value: " + null + "]", v4.toString());
+        v4.set(value1);
+        assertEquals("ObjectProperty [name: My name, value: " + value1 + "]", v4.toString());
+	}
+	
+	private static class ObjectPropertyMock extends ObjectPropertyBase<Object> {
+        
+        private final Object bean;
+        private final String name;
+		private int counter;
+		
+        private ObjectPropertyMock() {
+            this.bean = NO_BEAN;
+            this.name = NO_NAME_1;
+        }
+        
+        private ObjectPropertyMock(Object bean, String name) {
+            this.bean = bean;
+            this.name = name;
+        }
+        
+		@Override
+		protected void invalidated() {
+			counter++;
+		}
+		
+		private void check(int expected) {
+			assertEquals(expected, counter);
+			reset();
+		}
+
+		private void reset() {
+			counter = 0;
+		}
+
+        @Override public Object getBean() { return bean; }
+
+        @Override public String getName() { return name; }
+	}
+
+}