--- old/modules/base/src/test/java/javafx/binding/WhenTestBase.java	2015-08-31 10:24:34.613216719 -0400
+++ /dev/null	2015-08-30 16:31:40.093001923 -0400
@@ -1,213 +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.binding;
-
-import static javafx.binding.DependencyUtils.checkDependencies;
-import javafx.beans.binding.Binding;
-import javafx.beans.binding.Bindings;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.beans.value.WritableValue;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public abstract class WhenTestBase<T, P extends WritableValue<T> & ObservableValue<T>> {
-
-    static final float EPSILON_FLOAT = 1e-6f;
-    static final double EPSILON_DOUBLE = 1e-10;
-
-    public abstract Binding<T>[] generatePropertyPropertyList(P p0, P[] properties);
-
-    public abstract Binding<T> generatePropertyProperty(P p0, P p1);
-
-    public abstract Binding<T>[] generatePropertyPrimitive(P op0, T op1);
-
-    public abstract Binding<T>[] generatePrimitiveProperty(T op0, P op1);
-
-    public abstract Binding<T>[] generatePrimitivePrimitive(T op0, T op1);
-
-    public abstract void check(T expected, Binding<T> binding);
-
-    final BooleanProperty cond = new SimpleBooleanProperty();
-    final P p0;
-    final P[] properties;
-    private final T v0;
-    private final T v1;
-    private final T v2;
-    private final T v3;
-
-    public WhenTestBase(T v0, T v1, T v2, T v3, P p0, P... properties) {
-    	this.v0 = v0;
-    	this.v1 = v1;
-    	this.v2 = v2;
-    	this.v3 = v3;
-    	this.p0 = p0;
-    	this.properties = properties;
-    }
-
-    @Before
-    public void setUp() {
-        cond.set(false);
-        p0.setValue(v0);
-        for (final P p : properties) {
-        	p.setValue(v1);
-        }
-    }
-
-    @Test
-    public void test_expression_expression() {
-        final Binding<T>[] bindings = generatePropertyPropertyList(p0, properties);
-        final int n = bindings.length;
-        for (int i=0; i<n; i++) {
-        	final Binding<T> binding = bindings[i];
-        	final P p1 = properties[i];
-            // check initial state
-	        checkDependencies(binding.getDependencies(), cond, p0, p1);
-	        check(p1.getValue(), binding);
-	
-	        // set first value
-	        p0.setValue(v2);
-	        check(p1.getValue(), binding);
-	
-	        // set second value
-	        p1.setValue(v3);
-	        check(p1.getValue(), binding);
-	
-	        // change condition
-	        cond.set(true);
-	        check(v2, binding);
-	
-	        // set first value
-	        p0.setValue(v0);
-	        check(v0, binding);
-	
-	        // set second value
-	        p1.setValue(v1);
-	        check(v0, binding);
-	
-	        // change condition
-	        cond.set(false);
-	        check(p1.getValue(), binding);
-        }
-    }
-
-    @Test
-    public void test_expression_primitive() {
-        final Binding<T>[] bindings = generatePropertyPrimitive(p0, v1);
-        for (final Binding<T> binding : bindings) {
-	        // check initial state
-	        checkDependencies(binding.getDependencies(), cond, p0);
-	        check(v1, binding);
-	
-	        // set first value
-	        p0.setValue(v2);
-	        check(v1, binding);
-	
-	        // change condition
-	        cond.set(true);
-	        check(v2, binding);
-	
-	        // set first value
-	        p0.setValue(v0);
-	        check(v0, binding);
-	
-	        // change condition
-	        cond.set(false);
-	        check(v1, binding);
-        }
-    }
-
-    @Test
-    public void test_primitive_expression() {
-        final Binding<T>[] bindings = generatePrimitiveProperty(v1, p0);
-        for (final Binding<T> binding : bindings) {
-	        // check initial state
-	        checkDependencies(binding.getDependencies(), cond, p0);
-	        check(v0, binding);
-	
-	        // set second value
-	        p0.setValue(v3);
-	        check(v3, binding);
-	
-	        // change condition
-	        cond.set(true);
-	        check(v1, binding);
-	
-	        // set second value
-	        p0.setValue(v0);
-	        check(v1, binding);
-	
-	        // change condition
-	        cond.set(false);
-	        check(v0, binding);
-        }
-    }
-
-    @Test
-    public void test_primitive_primitive() {
-        final Binding<T>[] bindings = generatePrimitivePrimitive(v0, v1);
-        for (final Binding<T> binding : bindings) {
-	        // check initial state
-	        checkDependencies(binding.getDependencies(), cond);
-	        check(v1, binding);
-	
-	        // change condition
-	        cond.set(true);
-	        check(v0, binding);
-	
-	        // change condition
-	        cond.set(false);
-	        check(v1, binding);
-        }
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void test_Null() {
-        Bindings.when(null);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void test_Null_expression() {
-        generatePropertyProperty(null, p0);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void test_expression_Null() {
-        generatePropertyProperty(p0, null);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void test_Null_primitive() {
-        generatePropertyPrimitive(null, v1);
-    }
-
-    @Test(expected=NullPointerException.class)
-    public void test_primitive_Null() {
-        generatePrimitiveProperty(v0, null);
-    }
-}
--- /dev/null	2015-08-30 16:31:40.093001923 -0400
+++ new/modules/base/src/test/java/test/javafx/binding/WhenTestBase.java	2015-08-31 10:24:34.417216721 -0400
@@ -0,0 +1,213 @@
+/*
+ * 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.binding;
+
+import static test.javafx.binding.DependencyUtils.checkDependencies;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WritableValue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public abstract class WhenTestBase<T, P extends WritableValue<T> & ObservableValue<T>> {
+
+    static final float EPSILON_FLOAT = 1e-6f;
+    static final double EPSILON_DOUBLE = 1e-10;
+
+    public abstract Binding<T>[] generatePropertyPropertyList(P p0, P[] properties);
+
+    public abstract Binding<T> generatePropertyProperty(P p0, P p1);
+
+    public abstract Binding<T>[] generatePropertyPrimitive(P op0, T op1);
+
+    public abstract Binding<T>[] generatePrimitiveProperty(T op0, P op1);
+
+    public abstract Binding<T>[] generatePrimitivePrimitive(T op0, T op1);
+
+    public abstract void check(T expected, Binding<T> binding);
+
+    final BooleanProperty cond = new SimpleBooleanProperty();
+    final P p0;
+    final P[] properties;
+    private final T v0;
+    private final T v1;
+    private final T v2;
+    private final T v3;
+
+    public WhenTestBase(T v0, T v1, T v2, T v3, P p0, P... properties) {
+    	this.v0 = v0;
+    	this.v1 = v1;
+    	this.v2 = v2;
+    	this.v3 = v3;
+    	this.p0 = p0;
+    	this.properties = properties;
+    }
+
+    @Before
+    public void setUp() {
+        cond.set(false);
+        p0.setValue(v0);
+        for (final P p : properties) {
+        	p.setValue(v1);
+        }
+    }
+
+    @Test
+    public void test_expression_expression() {
+        final Binding<T>[] bindings = generatePropertyPropertyList(p0, properties);
+        final int n = bindings.length;
+        for (int i=0; i<n; i++) {
+        	final Binding<T> binding = bindings[i];
+        	final P p1 = properties[i];
+            // check initial state
+	        checkDependencies(binding.getDependencies(), cond, p0, p1);
+	        check(p1.getValue(), binding);
+	
+	        // set first value
+	        p0.setValue(v2);
+	        check(p1.getValue(), binding);
+	
+	        // set second value
+	        p1.setValue(v3);
+	        check(p1.getValue(), binding);
+	
+	        // change condition
+	        cond.set(true);
+	        check(v2, binding);
+	
+	        // set first value
+	        p0.setValue(v0);
+	        check(v0, binding);
+	
+	        // set second value
+	        p1.setValue(v1);
+	        check(v0, binding);
+	
+	        // change condition
+	        cond.set(false);
+	        check(p1.getValue(), binding);
+        }
+    }
+
+    @Test
+    public void test_expression_primitive() {
+        final Binding<T>[] bindings = generatePropertyPrimitive(p0, v1);
+        for (final Binding<T> binding : bindings) {
+	        // check initial state
+	        checkDependencies(binding.getDependencies(), cond, p0);
+	        check(v1, binding);
+	
+	        // set first value
+	        p0.setValue(v2);
+	        check(v1, binding);
+	
+	        // change condition
+	        cond.set(true);
+	        check(v2, binding);
+	
+	        // set first value
+	        p0.setValue(v0);
+	        check(v0, binding);
+	
+	        // change condition
+	        cond.set(false);
+	        check(v1, binding);
+        }
+    }
+
+    @Test
+    public void test_primitive_expression() {
+        final Binding<T>[] bindings = generatePrimitiveProperty(v1, p0);
+        for (final Binding<T> binding : bindings) {
+	        // check initial state
+	        checkDependencies(binding.getDependencies(), cond, p0);
+	        check(v0, binding);
+	
+	        // set second value
+	        p0.setValue(v3);
+	        check(v3, binding);
+	
+	        // change condition
+	        cond.set(true);
+	        check(v1, binding);
+	
+	        // set second value
+	        p0.setValue(v0);
+	        check(v1, binding);
+	
+	        // change condition
+	        cond.set(false);
+	        check(v0, binding);
+        }
+    }
+
+    @Test
+    public void test_primitive_primitive() {
+        final Binding<T>[] bindings = generatePrimitivePrimitive(v0, v1);
+        for (final Binding<T> binding : bindings) {
+	        // check initial state
+	        checkDependencies(binding.getDependencies(), cond);
+	        check(v1, binding);
+	
+	        // change condition
+	        cond.set(true);
+	        check(v0, binding);
+	
+	        // change condition
+	        cond.set(false);
+	        check(v1, binding);
+        }
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void test_Null() {
+        Bindings.when(null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void test_Null_expression() {
+        generatePropertyProperty(null, p0);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void test_expression_Null() {
+        generatePropertyProperty(p0, null);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void test_Null_primitive() {
+        generatePropertyPrimitive(null, v1);
+    }
+
+    @Test(expected=NullPointerException.class)
+    public void test_primitive_Null() {
+        generatePrimitiveProperty(v0, null);
+    }
+}