--- old/modules/base/src/test/java/javafx/binding/BindingsCreateBindingTest.java 2015-08-31 10:24:24.669216831 -0400 +++ /dev/null 2015-08-30 16:31:40.093001923 -0400 @@ -1,256 +0,0 @@ -/* - * Copyright (c) 2012, 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.binding; - -import java.util.Arrays; -import java.util.Collection; -import java.util.concurrent.Callable; -import javafx.beans.Observable; -import javafx.beans.binding.Binding; -import javafx.beans.binding.Bindings; -import javafx.beans.property.Property; -import javafx.beans.property.SimpleBooleanProperty; -import javafx.beans.property.SimpleDoubleProperty; -import javafx.beans.property.SimpleFloatProperty; -import javafx.beans.property.SimpleIntegerProperty; -import javafx.beans.property.SimpleLongProperty; -import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.property.SimpleStringProperty; -import com.sun.javafx.binding.ErrorLoggingUtiltity; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - -import static org.junit.Assert.*; - -/** - */ -@RunWith(Parameterized.class) -public class BindingsCreateBindingTest { - - private static final float EPSILON_FLOAT = 1e-5f; - private static final double EPSILON_DOUBLE = 1e-10; - - private static final ErrorLoggingUtiltity log = new ErrorLoggingUtiltity(); - - private static interface Functions { - public Binding create(Callable func, Observable... dependencies); - public void check(S value0, S value1); - } - - private final Property p0; - private final Property p1; - private final Functions f; - private final T value0; - private final T value1; - private final T defaultValue; - - @BeforeClass - public static void setUpClass() { - log.start(); - } - - @AfterClass - public static void tearDownClass() { - log.stop(); - } - - public BindingsCreateBindingTest(Property p0, Property p1, Functions f, T value0, T value1, T defaultValue) { - this.p0 = p0; - this.p1 = p1; - this.f = f; - this.value0 = value0; - this.value1 = value1; - this.defaultValue = defaultValue; - } - - @Test - public void testNoDependencies() { - // func returns value0, no dependencies specified - final Callable func0 = () -> value0; - final Binding binding0 = f.create(func0); - - f.check(value0, binding0.getValue()); - assertTrue(binding0.getDependencies().isEmpty()); - binding0.dispose(); - - // func returns value1, dependencies set to null - final Callable func1 = () -> value1; - final Binding binding1 = f.create(func1, (Observable[])null); - - f.check(value1, binding1.getValue()); - assertTrue(binding1.getDependencies().isEmpty()); - binding1.dispose(); - - // func throws exception, dependencies set to empty array - final Callable func2 = () -> { - throw new Exception(); - }; - final Binding binding2 = f.create(func2, new Observable [0]); - - f.check(defaultValue, binding2.getValue()); - log.check(java.util.logging.Level.WARNING, Exception.class); - assertTrue(binding2.getDependencies().isEmpty()); - binding2.dispose(); - } - - @Test - public void testOneDependency() { - final Callable func = () -> p0.getValue(); - final Binding binding = f.create(func, p0); - - f.check(p0.getValue(), binding.getValue()); - assertEquals(binding.getDependencies(), Arrays.asList(p0)); - p0.setValue(value1); - f.check(p0.getValue(), binding.getValue()); - binding.dispose(); - } - - @Test - public void testCreateBoolean_TwoDependencies() { - final Callable func = () -> p0.getValue(); - final Binding binding = f.create(func, p0, p1); - - f.check(p0.getValue(), binding.getValue()); - assertTrue(binding.getDependencies().equals(Arrays.asList(p0, p1)) || binding.getDependencies().equals((Arrays.asList(p1, p0)))); - p0.setValue(value1); - f.check(p0.getValue(), binding.getValue()); - binding.dispose(); - } - - @Parameterized.Parameters - public static Collection parameters() { - return Arrays.asList(new Object[][] { - { - new SimpleBooleanProperty(), new SimpleBooleanProperty(), - new Functions() { - @Override - public Binding create(Callable func, Observable... dependencies) { - return Bindings.createBooleanBinding(func, dependencies); - } - - @Override - public void check(Boolean value0, Boolean value1) { - assertEquals(value0, value1); - } - }, - true, false, false - }, - { - new SimpleDoubleProperty(), new SimpleDoubleProperty(), - new Functions() { - @Override - public Binding create(Callable func, Observable... dependencies) { - return Bindings.createDoubleBinding(func, dependencies); - } - - @Override - public void check(Number value0, Number value1) { - assertEquals(value0.doubleValue(), value1.doubleValue(), EPSILON_DOUBLE); - } - }, - Math.PI, -Math.E, 0.0 - }, - { - new SimpleFloatProperty(), new SimpleFloatProperty(), - new Functions() { - @Override - public Binding create(Callable func, Observable... dependencies) { - return Bindings.createFloatBinding(func, dependencies); - } - - @Override - public void check(Number value0, Number value1) { - assertEquals(value0.floatValue(), value1.floatValue(), EPSILON_FLOAT); - } - }, - (float)Math.PI, (float)-Math.E, 0.0f - }, - { - new SimpleIntegerProperty(), new SimpleIntegerProperty(), - new Functions() { - @Override - public Binding create(Callable func, Observable... dependencies) { - return Bindings.createIntegerBinding(func, dependencies); - } - - @Override - public void check(Number value0, Number value1) { - assertEquals(value0.intValue(), value1.intValue()); - } - }, - Integer.MAX_VALUE, Integer.MIN_VALUE, 0 - }, - { - new SimpleLongProperty(), new SimpleLongProperty(), - new Functions() { - @Override - public Binding create(Callable func, Observable... dependencies) { - return Bindings.createLongBinding(func, dependencies); - } - - @Override - public void check(Number value0, Number value1) { - assertEquals(value0.longValue(), value1.longValue()); - } - }, - Long.MAX_VALUE, Long.MIN_VALUE, 0L - }, - { - new SimpleObjectProperty(), new SimpleObjectProperty(), - new Functions() { - @Override - public Binding create(Callable func, Observable... dependencies) { - return Bindings.createObjectBinding(func, dependencies); - } - - @Override - public void check(Object value0, Object value1) { - assertEquals(value0, value1); - } - }, - new Object(), new Object(), null - }, - { - new SimpleStringProperty(), new SimpleStringProperty(), - new Functions() { - @Override - public Binding create(Callable func, Observable... dependencies) { - return Bindings.createStringBinding(func, dependencies); - } - - @Override - public void check(String value0, String value1) { - assertEquals(value0, value1); - } - }, - "Hello World", "Goodbye World", "" - }, - }); - } -} --- /dev/null 2015-08-30 16:31:40.093001923 -0400 +++ new/modules/base/src/test/java/test/javafx/binding/BindingsCreateBindingTest.java 2015-08-31 10:24:24.461216833 -0400 @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2012, 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.binding; + +import java.util.Arrays; +import java.util.Collection; +import java.util.concurrent.Callable; +import javafx.beans.Observable; +import javafx.beans.binding.Binding; +import javafx.beans.binding.Bindings; +import javafx.beans.property.Property; +import javafx.beans.property.SimpleBooleanProperty; +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleFloatProperty; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleLongProperty; +import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.property.SimpleStringProperty; +import test.com.sun.javafx.binding.ErrorLoggingUtiltity; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import static org.junit.Assert.*; + +/** + */ +@RunWith(Parameterized.class) +public class BindingsCreateBindingTest { + + private static final float EPSILON_FLOAT = 1e-5f; + private static final double EPSILON_DOUBLE = 1e-10; + + private static final ErrorLoggingUtiltity log = new ErrorLoggingUtiltity(); + + private static interface Functions { + public Binding create(Callable func, Observable... dependencies); + public void check(S value0, S value1); + } + + private final Property p0; + private final Property p1; + private final Functions f; + private final T value0; + private final T value1; + private final T defaultValue; + + @BeforeClass + public static void setUpClass() { + log.start(); + } + + @AfterClass + public static void tearDownClass() { + log.stop(); + } + + public BindingsCreateBindingTest(Property p0, Property p1, Functions f, T value0, T value1, T defaultValue) { + this.p0 = p0; + this.p1 = p1; + this.f = f; + this.value0 = value0; + this.value1 = value1; + this.defaultValue = defaultValue; + } + + @Test + public void testNoDependencies() { + // func returns value0, no dependencies specified + final Callable func0 = () -> value0; + final Binding binding0 = f.create(func0); + + f.check(value0, binding0.getValue()); + assertTrue(binding0.getDependencies().isEmpty()); + binding0.dispose(); + + // func returns value1, dependencies set to null + final Callable func1 = () -> value1; + final Binding binding1 = f.create(func1, (Observable[])null); + + f.check(value1, binding1.getValue()); + assertTrue(binding1.getDependencies().isEmpty()); + binding1.dispose(); + + // func throws exception, dependencies set to empty array + final Callable func2 = () -> { + throw new Exception(); + }; + final Binding binding2 = f.create(func2, new Observable [0]); + + f.check(defaultValue, binding2.getValue()); + log.check(java.util.logging.Level.WARNING, Exception.class); + assertTrue(binding2.getDependencies().isEmpty()); + binding2.dispose(); + } + + @Test + public void testOneDependency() { + final Callable func = () -> p0.getValue(); + final Binding binding = f.create(func, p0); + + f.check(p0.getValue(), binding.getValue()); + assertEquals(binding.getDependencies(), Arrays.asList(p0)); + p0.setValue(value1); + f.check(p0.getValue(), binding.getValue()); + binding.dispose(); + } + + @Test + public void testCreateBoolean_TwoDependencies() { + final Callable func = () -> p0.getValue(); + final Binding binding = f.create(func, p0, p1); + + f.check(p0.getValue(), binding.getValue()); + assertTrue(binding.getDependencies().equals(Arrays.asList(p0, p1)) || binding.getDependencies().equals((Arrays.asList(p1, p0)))); + p0.setValue(value1); + f.check(p0.getValue(), binding.getValue()); + binding.dispose(); + } + + @Parameterized.Parameters + public static Collection parameters() { + return Arrays.asList(new Object[][] { + { + new SimpleBooleanProperty(), new SimpleBooleanProperty(), + new Functions() { + @Override + public Binding create(Callable func, Observable... dependencies) { + return Bindings.createBooleanBinding(func, dependencies); + } + + @Override + public void check(Boolean value0, Boolean value1) { + assertEquals(value0, value1); + } + }, + true, false, false + }, + { + new SimpleDoubleProperty(), new SimpleDoubleProperty(), + new Functions() { + @Override + public Binding create(Callable func, Observable... dependencies) { + return Bindings.createDoubleBinding(func, dependencies); + } + + @Override + public void check(Number value0, Number value1) { + assertEquals(value0.doubleValue(), value1.doubleValue(), EPSILON_DOUBLE); + } + }, + Math.PI, -Math.E, 0.0 + }, + { + new SimpleFloatProperty(), new SimpleFloatProperty(), + new Functions() { + @Override + public Binding create(Callable func, Observable... dependencies) { + return Bindings.createFloatBinding(func, dependencies); + } + + @Override + public void check(Number value0, Number value1) { + assertEquals(value0.floatValue(), value1.floatValue(), EPSILON_FLOAT); + } + }, + (float)Math.PI, (float)-Math.E, 0.0f + }, + { + new SimpleIntegerProperty(), new SimpleIntegerProperty(), + new Functions() { + @Override + public Binding create(Callable func, Observable... dependencies) { + return Bindings.createIntegerBinding(func, dependencies); + } + + @Override + public void check(Number value0, Number value1) { + assertEquals(value0.intValue(), value1.intValue()); + } + }, + Integer.MAX_VALUE, Integer.MIN_VALUE, 0 + }, + { + new SimpleLongProperty(), new SimpleLongProperty(), + new Functions() { + @Override + public Binding create(Callable func, Observable... dependencies) { + return Bindings.createLongBinding(func, dependencies); + } + + @Override + public void check(Number value0, Number value1) { + assertEquals(value0.longValue(), value1.longValue()); + } + }, + Long.MAX_VALUE, Long.MIN_VALUE, 0L + }, + { + new SimpleObjectProperty(), new SimpleObjectProperty(), + new Functions() { + @Override + public Binding create(Callable func, Observable... dependencies) { + return Bindings.createObjectBinding(func, dependencies); + } + + @Override + public void check(Object value0, Object value1) { + assertEquals(value0, value1); + } + }, + new Object(), new Object(), null + }, + { + new SimpleStringProperty(), new SimpleStringProperty(), + new Functions() { + @Override + public Binding create(Callable func, Observable... dependencies) { + return Bindings.createStringBinding(func, dependencies); + } + + @Override + public void check(String value0, String value1) { + assertEquals(value0, value1); + } + }, + "Hello World", "Goodbye World", "" + }, + }); + } +}