--- old/modules/graphics/src/test/java/javafx/scene/shape/QuadCurveToTest.java 2015-09-11 21:28:21.429284326 -0400 +++ /dev/null 2015-09-11 11:06:08.592686920 -0400 @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2010, 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.scene.shape; - -import com.sun.javafx.geom.Path2D; -import com.sun.javafx.geom.PathIterator; -import com.sun.javafx.sg.prism.NGPath; -import javafx.beans.property.DoubleProperty; -import javafx.beans.property.SimpleDoubleProperty; -import javafx.scene.Group; -import javafx.scene.NodeTest; -import javafx.scene.Scene; -import org.junit.Test; - -import java.lang.reflect.Method; - -import static org.junit.Assert.*; - -public class QuadCurveToTest { - - @Test public void testSetGetX() throws Exception { - TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "x", 123.2, 0.0); - } - - @Test public void testSetGetControlX() throws Exception { - TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "controlX", 123.2, 0.0); - } - - @Test public void testSetGetControlY() throws Exception { - TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "controlY", 123.2, 0.0); - } - - @Test public void testDoublePropertySynced_X() throws Exception { - checkSyncedProperty("x", Coords.X, 123.4); - } - - @Test public void testDoublePropertySynced_Y() throws Exception { - checkSyncedProperty("y", Coords.Y, 432.1); - } - - @Test public void testDoublePropertySynced_ControlX() throws Exception { - checkSyncedProperty("controlX", Coords.CONTROL_X, 11.1); - } - - @Test public void testDoublePropertySynced_ControlY() throws Exception { - checkSyncedProperty("controlY", Coords.CONTROL_Y, 22.2); - } - - @Test public void toStringShouldReturnNonEmptyString() { - String s = new QuadCurveTo().toString(); - assertNotNull(s); - assertFalse(s.isEmpty()); - } - - private void checkSyncedProperty(String propertyName, Coords coord, double expected) throws Exception { - QuadCurveTo qcurveTo = new QuadCurveTo(100.0, 200.0, 10.0, 20.0); - DoubleProperty v = new SimpleDoubleProperty(100.0); - Method m = QuadCurveTo.class.getMethod(propertyName + "Property", new Class[] {}); - ((DoubleProperty)m.invoke(qcurveTo)).bind(v); - - Path path = new Path(); - path.getElements().addAll(new MoveTo(1.0, 1.0), qcurveTo); - ((Group)new Scene(new Group()).getRoot()).getChildren().add(path); - - v.set(expected); - NodeTest.syncNode(path); - - //check - NGPath pgPath = path.impl_getPeer(); - Path2D geometry = pgPath.getGeometry(); - float[] coords = new float[6]; - PathIterator it = geometry.getPathIterator(null); - it.next(); //next is QuadCurveTo segment - int segType = it.currentSegment(coords); - assertEquals(segType, PathIterator.SEG_QUADTO); - assertEquals(expected, coords[coord.ordinal()], 0.001); - } - - static enum Coords { - CONTROL_X, - CONTROL_Y, - X, - Y - } -} --- /dev/null 2015-09-11 11:06:08.592686920 -0400 +++ new/modules/graphics/src/test/java/test/javafx/scene/shape/QuadCurveToTest.java 2015-09-11 21:28:21.293284327 -0400 @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2010, 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.scene.shape; + +import com.sun.javafx.geom.Path2D; +import com.sun.javafx.geom.PathIterator; +import com.sun.javafx.sg.prism.NGPath; +import javafx.beans.property.DoubleProperty; +import javafx.beans.property.SimpleDoubleProperty; +import javafx.scene.Group; +import test.javafx.scene.NodeTest; +import javafx.scene.Scene; +import org.junit.Test; + +import java.lang.reflect.Method; +import javafx.scene.shape.MoveTo; +import javafx.scene.shape.Path; +import javafx.scene.shape.QuadCurveTo; + +import static org.junit.Assert.*; + +public class QuadCurveToTest { + + @Test public void testSetGetX() throws Exception { + TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "x", 123.2, 0.0); + } + + @Test public void testSetGetControlX() throws Exception { + TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "controlX", 123.2, 0.0); + } + + @Test public void testSetGetControlY() throws Exception { + TestUtils.testDoublePropertyGetterSetter(new QuadCurveTo(), "controlY", 123.2, 0.0); + } + + @Test public void testDoublePropertySynced_X() throws Exception { + checkSyncedProperty("x", Coords.X, 123.4); + } + + @Test public void testDoublePropertySynced_Y() throws Exception { + checkSyncedProperty("y", Coords.Y, 432.1); + } + + @Test public void testDoublePropertySynced_ControlX() throws Exception { + checkSyncedProperty("controlX", Coords.CONTROL_X, 11.1); + } + + @Test public void testDoublePropertySynced_ControlY() throws Exception { + checkSyncedProperty("controlY", Coords.CONTROL_Y, 22.2); + } + + @Test public void toStringShouldReturnNonEmptyString() { + String s = new QuadCurveTo().toString(); + assertNotNull(s); + assertFalse(s.isEmpty()); + } + + private void checkSyncedProperty(String propertyName, Coords coord, double expected) throws Exception { + QuadCurveTo qcurveTo = new QuadCurveTo(100.0, 200.0, 10.0, 20.0); + DoubleProperty v = new SimpleDoubleProperty(100.0); + Method m = QuadCurveTo.class.getMethod(propertyName + "Property", new Class[] {}); + ((DoubleProperty)m.invoke(qcurveTo)).bind(v); + + Path path = new Path(); + path.getElements().addAll(new MoveTo(1.0, 1.0), qcurveTo); + ((Group)new Scene(new Group()).getRoot()).getChildren().add(path); + + v.set(expected); + NodeTest.syncNode(path); + + //check + NGPath pgPath = path.impl_getPeer(); + Path2D geometry = pgPath.getGeometry(); + float[] coords = new float[6]; + PathIterator it = geometry.getPathIterator(null); + it.next(); //next is QuadCurveTo segment + int segType = it.currentSegment(coords); + assertEquals(segType, PathIterator.SEG_QUADTO); + assertEquals(expected, coords[coord.ordinal()], 0.001); + } + + static enum Coords { + CONTROL_X, + CONTROL_Y, + X, + Y + } +}