--- old/modules/base/src/test/java/javafx/binding/When_Float_Test.java 2015-08-31 10:24:36.657216696 -0400 +++ /dev/null 2015-08-30 16:31:40.093001923 -0400 @@ -1,102 +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 org.junit.Assert.assertEquals; -import javafx.beans.binding.Binding; -import javafx.beans.binding.Bindings; -import javafx.beans.property.Property; -import javafx.beans.property.SimpleDoubleProperty; -import javafx.beans.property.SimpleFloatProperty; -import javafx.beans.property.SimpleIntegerProperty; -import javafx.beans.property.SimpleLongProperty; -import javafx.beans.value.ObservableNumberValue; - -public class When_Float_Test extends WhenTestBase> { - @SuppressWarnings("unchecked") - public When_Float_Test() { - super( - -(float) Math.PI, 0.0f, EPSILON_FLOAT, Float.MAX_VALUE, - new SimpleFloatProperty(), new SimpleDoubleProperty(), new SimpleFloatProperty(), new SimpleLongProperty(), new SimpleIntegerProperty() - ); - } - - @SuppressWarnings("unchecked") - @Override - public Binding[] generatePropertyPropertyList(Property p0, Property[] props) { - final int n = props.length; - final Binding[] result = new Binding[n]; - for (int i=0; i generatePropertyProperty(Property op0, Property op1) { - return Bindings.when(cond).then((ObservableNumberValue)op0).otherwise((ObservableNumberValue)op1); - } - - @SuppressWarnings("unchecked") - @Override - public Binding[] generatePropertyPrimitive(Property op0, Number op1) { - final ObservableNumberValue p0 = (ObservableNumberValue)op0; - return new Binding[] { - Bindings.when(cond).then(p0).otherwise(op1.doubleValue()), - Bindings.when(cond).then(p0).otherwise(op1.floatValue()), - Bindings.when(cond).then(p0).otherwise(op1.longValue()), - Bindings.when(cond).then(p0).otherwise(op1.intValue()) - }; - } - - @SuppressWarnings("unchecked") - @Override - public Binding[] generatePrimitiveProperty(Number op0, Property op1) { - final ObservableNumberValue p1 = (ObservableNumberValue)op1; - return new Binding[] { - Bindings.when(cond).then(op0.doubleValue()).otherwise(p1), - Bindings.when(cond).then(op0.floatValue()).otherwise(p1), - Bindings.when(cond).then(op0.longValue()).otherwise(p1), - Bindings.when(cond).then(op0.intValue()).otherwise(p1) - }; - } - - @SuppressWarnings("unchecked") - @Override - public Binding[] generatePrimitivePrimitive(Number op0, Number op1) { - return new Binding[] { - Bindings.when(cond).then(op0.floatValue()).otherwise(op1.doubleValue()), - Bindings.when(cond).then(op0.floatValue()).otherwise(op1.floatValue()), - Bindings.when(cond).then(op0.floatValue()).otherwise(op1.longValue()), - Bindings.when(cond).then(op0.floatValue()).otherwise(op1.intValue()) - }; - } - - @Override - public void check(Number expected, Binding binding) { - assertEquals(expected.floatValue(), binding.getValue().floatValue(), EPSILON_FLOAT); - } -} --- /dev/null 2015-08-30 16:31:40.093001923 -0400 +++ new/modules/base/src/test/java/test/javafx/binding/When_Float_Test.java 2015-08-31 10:24:36.473216698 -0400 @@ -0,0 +1,102 @@ +/* + * 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 org.junit.Assert.assertEquals; +import javafx.beans.binding.Binding; +import javafx.beans.binding.Bindings; +import javafx.beans.property.Property; +import javafx.beans.property.SimpleDoubleProperty; +import javafx.beans.property.SimpleFloatProperty; +import javafx.beans.property.SimpleIntegerProperty; +import javafx.beans.property.SimpleLongProperty; +import javafx.beans.value.ObservableNumberValue; + +public class When_Float_Test extends WhenTestBase> { + @SuppressWarnings("unchecked") + public When_Float_Test() { + super( + -(float) Math.PI, 0.0f, EPSILON_FLOAT, Float.MAX_VALUE, + new SimpleFloatProperty(), new SimpleDoubleProperty(), new SimpleFloatProperty(), new SimpleLongProperty(), new SimpleIntegerProperty() + ); + } + + @SuppressWarnings("unchecked") + @Override + public Binding[] generatePropertyPropertyList(Property p0, Property[] props) { + final int n = props.length; + final Binding[] result = new Binding[n]; + for (int i=0; i generatePropertyProperty(Property op0, Property op1) { + return Bindings.when(cond).then((ObservableNumberValue)op0).otherwise((ObservableNumberValue)op1); + } + + @SuppressWarnings("unchecked") + @Override + public Binding[] generatePropertyPrimitive(Property op0, Number op1) { + final ObservableNumberValue p0 = (ObservableNumberValue)op0; + return new Binding[] { + Bindings.when(cond).then(p0).otherwise(op1.doubleValue()), + Bindings.when(cond).then(p0).otherwise(op1.floatValue()), + Bindings.when(cond).then(p0).otherwise(op1.longValue()), + Bindings.when(cond).then(p0).otherwise(op1.intValue()) + }; + } + + @SuppressWarnings("unchecked") + @Override + public Binding[] generatePrimitiveProperty(Number op0, Property op1) { + final ObservableNumberValue p1 = (ObservableNumberValue)op1; + return new Binding[] { + Bindings.when(cond).then(op0.doubleValue()).otherwise(p1), + Bindings.when(cond).then(op0.floatValue()).otherwise(p1), + Bindings.when(cond).then(op0.longValue()).otherwise(p1), + Bindings.when(cond).then(op0.intValue()).otherwise(p1) + }; + } + + @SuppressWarnings("unchecked") + @Override + public Binding[] generatePrimitivePrimitive(Number op0, Number op1) { + return new Binding[] { + Bindings.when(cond).then(op0.floatValue()).otherwise(op1.doubleValue()), + Bindings.when(cond).then(op0.floatValue()).otherwise(op1.floatValue()), + Bindings.when(cond).then(op0.floatValue()).otherwise(op1.longValue()), + Bindings.when(cond).then(op0.floatValue()).otherwise(op1.intValue()) + }; + } + + @Override + public void check(Number expected, Binding binding) { + assertEquals(expected.floatValue(), binding.getValue().floatValue(), EPSILON_FLOAT); + } +}