--- old/modules/graphics/src/test/java/javafx/animation/SequentialTransitionTest.java 2015-09-11 21:25:27.669286279 -0400 +++ /dev/null 2015-09-11 11:06:08.592686920 -0400 @@ -1,101 +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.animation; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; - -import javafx.scene.Node; -import javafx.scene.shape.Rectangle; -import javafx.util.Duration; - -import org.junit.Before; -import org.junit.Test; - -public class SequentialTransitionTest { - - private static Interpolator DEFAULT_INTERPOLATOR = Interpolator.LINEAR; - - private static Duration ONE_SEC = Duration.millis(1000); - private static Duration TWO_SECS = Duration.millis(2000); - private static Duration THREE_SECS = Duration.millis(3000); - private static Duration SIX_SECS = Duration.millis(6000); - - private Node node; - private Animation child1; - private Animation child2; - private Animation child3; - - @Before - public void setUp() { - node = new Rectangle(); - child1 = new AnimationDummy(ONE_SEC); - child2 = new AnimationDummy(TWO_SECS); - child3 = new AnimationDummy(THREE_SECS); - } - - @Test - public void testDefaultValues() { - // empty ctor - final SequentialTransition t0 = new SequentialTransition(); - assertEquals(Duration.ZERO, t0.getTotalDuration()); - assertNull(t0.getNode()); - assertNull(t0.nodeProperty().get()); - assertTrue(t0.getChildren().isEmpty()); - assertEquals(DEFAULT_INTERPOLATOR, t0.getInterpolator()); - assertNull(t0.getOnFinished()); - - // node only - final SequentialTransition t1 = new SequentialTransition(node); - assertEquals(Duration.ZERO, t1.getTotalDuration()); - assertEquals(node, t1.getNode()); - assertEquals(node, t1.nodeProperty().get()); - assertTrue(t1.getChildren().isEmpty()); - assertEquals(DEFAULT_INTERPOLATOR, t1.getInterpolator()); - assertNull(t1.getOnFinished()); - - // child animations only - final SequentialTransition t2 = new SequentialTransition(child1, child2, child3); - assertEquals(SIX_SECS, t2.getTotalDuration()); - assertNull(t2.getNode()); - assertNull(t2.nodeProperty().get()); - assertEquals(Arrays.asList(child1, child2, child3), t2.getChildren()); - assertEquals(DEFAULT_INTERPOLATOR, t2.getInterpolator()); - assertNull(t2.getOnFinished()); - - // node and child animations - final SequentialTransition t3 = new SequentialTransition(node, child1, child2, child3); - assertEquals(SIX_SECS, t3.getTotalDuration()); - assertEquals(node, t3.getNode()); - assertEquals(node, t3.nodeProperty().get()); - assertEquals(Arrays.asList(child1, child2, child3), t3.getChildren()); - assertEquals(DEFAULT_INTERPOLATOR, t3.getInterpolator()); - assertNull(t3.getOnFinished()); - } -} --- /dev/null 2015-09-11 11:06:08.592686920 -0400 +++ new/modules/graphics/src/test/java/test/javafx/animation/SequentialTransitionTest.java 2015-09-11 21:25:27.529286280 -0400 @@ -0,0 +1,104 @@ +/* + * 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.animation; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import javafx.animation.Animation; +import javafx.animation.Interpolator; +import javafx.animation.SequentialTransition; + +import javafx.scene.Node; +import javafx.scene.shape.Rectangle; +import javafx.util.Duration; + +import org.junit.Before; +import org.junit.Test; + +public class SequentialTransitionTest { + + private static Interpolator DEFAULT_INTERPOLATOR = Interpolator.LINEAR; + + private static Duration ONE_SEC = Duration.millis(1000); + private static Duration TWO_SECS = Duration.millis(2000); + private static Duration THREE_SECS = Duration.millis(3000); + private static Duration SIX_SECS = Duration.millis(6000); + + private Node node; + private Animation child1; + private Animation child2; + private Animation child3; + + @Before + public void setUp() { + node = new Rectangle(); + child1 = new AnimationDummy(ONE_SEC); + child2 = new AnimationDummy(TWO_SECS); + child3 = new AnimationDummy(THREE_SECS); + } + + @Test + public void testDefaultValues() { + // empty ctor + final SequentialTransition t0 = new SequentialTransition(); + assertEquals(Duration.ZERO, t0.getTotalDuration()); + assertNull(t0.getNode()); + assertNull(t0.nodeProperty().get()); + assertTrue(t0.getChildren().isEmpty()); + assertEquals(DEFAULT_INTERPOLATOR, t0.getInterpolator()); + assertNull(t0.getOnFinished()); + + // node only + final SequentialTransition t1 = new SequentialTransition(node); + assertEquals(Duration.ZERO, t1.getTotalDuration()); + assertEquals(node, t1.getNode()); + assertEquals(node, t1.nodeProperty().get()); + assertTrue(t1.getChildren().isEmpty()); + assertEquals(DEFAULT_INTERPOLATOR, t1.getInterpolator()); + assertNull(t1.getOnFinished()); + + // child animations only + final SequentialTransition t2 = new SequentialTransition(child1, child2, child3); + assertEquals(SIX_SECS, t2.getTotalDuration()); + assertNull(t2.getNode()); + assertNull(t2.nodeProperty().get()); + assertEquals(Arrays.asList(child1, child2, child3), t2.getChildren()); + assertEquals(DEFAULT_INTERPOLATOR, t2.getInterpolator()); + assertNull(t2.getOnFinished()); + + // node and child animations + final SequentialTransition t3 = new SequentialTransition(node, child1, child2, child3); + assertEquals(SIX_SECS, t3.getTotalDuration()); + assertEquals(node, t3.getNode()); + assertEquals(node, t3.nodeProperty().get()); + assertEquals(Arrays.asList(child1, child2, child3), t3.getChildren()); + assertEquals(DEFAULT_INTERPOLATOR, t3.getInterpolator()); + assertNull(t3.getOnFinished()); + } +}