modules/graphics/src/test/java/test/javafx/animation/ScaleTransitionTest.java

Print this page
rev 9250 : 8134762: Refactor Javafx graphics module tests for clear separation of tests
Reviewed-by:

@@ -21,12 +21,17 @@
  * 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;
+package test.javafx.animation;
 
+import javafx.animation.AnimationShim;
+import javafx.animation.Interpolator;
+import javafx.animation.ParallelTransition;
+import javafx.animation.ScaleTransition;
+import javafx.animation.TransitionShim;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import javafx.scene.Node;

@@ -163,25 +168,25 @@
                 t0.setFromY(1.5);
                 t0.setToY(2.0);
                 t0.setFromZ(1.5);
                 t0.setToZ(0.5);
                 
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(0.5, node.getScaleX(), EPSILON);
                 assertEquals(1.5, node.getScaleY(), EPSILON);
                 assertEquals(1.5, node.getScaleZ(), EPSILON);
-                t0.interpolate(0.4);
+                TransitionShim.interpolate(t0,0.4);
                 assertEquals(0.7, node.getScaleX(), EPSILON);
                 assertEquals(1.7, node.getScaleY(), EPSILON);
                 assertEquals(1.1, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(1.0, node.getScaleX(), EPSILON);
                 assertEquals(2.0, node.getScaleY(), EPSILON);
                 assertEquals(0.5, node.getScaleZ(), EPSILON);
-        t0.impl_finished();
+                AnimationShim.impl_finished(t0);
         }
         
         @Test
         public void testXValueCombinations() {
                 final ScaleTransition t0 = new ScaleTransition(ONE_SEC, node);

@@ -193,108 +198,108 @@
                 // no value set
                 node.setScaleX(originalValue);
                 t0.setFromX(Double.NaN);
                 t0.setToX(Double.NaN);
                 t0.setByX(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(originalValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only from-value set
                 node.setScaleX(originalValue);
                 t0.setFromX(fromValue);
                 t0.setToX(Double.NaN);
                 t0.setByX(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(fromValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only to-value set
                 node.setScaleX(originalValue);
                 t0.setFromX(Double.NaN);
                 t0.setToX(toValue);
                 t0.setByX(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only by-value set
                 node.setScaleX(originalValue);
                 t0.setFromX(Double.NaN);
                 t0.setToX(Double.NaN);
                 t0.setByX(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(originalValue + byValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // from- and to-values set
                 node.setScaleX(originalValue);
                 t0.setFromX(fromValue);
                 t0.setToX(toValue);
                 t0.setByX(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // from- and by-values set
                 node.setScaleX(originalValue);
                 t0.setFromX(fromValue);
                 t0.setToX(Double.NaN);
                 t0.setByX(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(fromValue + byValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // to- and by-values set
                 node.setScaleX(originalValue);
                 t0.setFromX(Double.NaN);
                 t0.setToX(toValue);
                 t0.setByX(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // all values set
                 node.setScaleX(originalValue);
                 t0.setFromX(fromValue);
                 t0.setToX(toValue);
                 t0.setByX(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleX(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleX(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
         }
 
         @Test
         public void testYValueCombinations() {
                 final ScaleTransition t0 = new ScaleTransition(ONE_SEC, node);

@@ -306,108 +311,108 @@
                 // no value set
                 node.setScaleY(originalValue);
                 t0.setFromY(Double.NaN);
                 t0.setToY(Double.NaN);
                 t0.setByY(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(originalValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only from-value set
                 node.setScaleY(originalValue);
                 t0.setFromY(fromValue);
                 t0.setToY(Double.NaN);
                 t0.setByY(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(fromValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only to-value set
                 node.setScaleY(originalValue);
                 t0.setFromY(Double.NaN);
                 t0.setToY(toValue);
                 t0.setByY(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only by-value set
                 node.setScaleY(originalValue);
                 t0.setFromY(Double.NaN);
                 t0.setToY(Double.NaN);
                 t0.setByY(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(originalValue + byValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // from- and to-values set
                 node.setScaleY(originalValue);
                 t0.setFromY(fromValue);
                 t0.setToY(toValue);
                 t0.setByY(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // from- and by-values set
                 node.setScaleY(originalValue);
                 t0.setFromY(fromValue);
                 t0.setToY(Double.NaN);
                 t0.setByY(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(fromValue + byValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // to- and by-values set
                 node.setScaleY(originalValue);
                 t0.setFromY(Double.NaN);
                 t0.setToY(toValue);
                 t0.setByY(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // all values set
                 node.setScaleY(originalValue);
                 t0.setFromY(fromValue);
                 t0.setToY(toValue);
                 t0.setByY(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleY(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleY(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
         }
 
         @Test
         public void testZValueCombinations() {
                 final ScaleTransition t0 = new ScaleTransition(ONE_SEC, node);

@@ -419,108 +424,108 @@
                 // no value set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(Double.NaN);
                 t0.setToZ(Double.NaN);
                 t0.setByZ(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(originalValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only from-value set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(fromValue);
                 t0.setToZ(Double.NaN);
                 t0.setByZ(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(fromValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only to-value set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(Double.NaN);
                 t0.setToZ(toValue);
                 t0.setByZ(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // only by-value set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(Double.NaN);
                 t0.setToZ(Double.NaN);
                 t0.setByZ(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(originalValue + byValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // from- and to-values set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(fromValue);
                 t0.setToZ(toValue);
                 t0.setByZ(0.0);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // from- and by-values set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(fromValue);
                 t0.setToZ(Double.NaN);
                 t0.setByZ(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(fromValue + byValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // to- and by-values set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(Double.NaN);
                 t0.setToZ(toValue);
                 t0.setByZ(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(originalValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
 
                 // all values set
                 node.setScaleZ(originalValue);
                 t0.setFromZ(fromValue);
                 t0.setToZ(toValue);
                 t0.setByZ(byValue);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
-                t0.interpolate(0.0);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals(fromValue, node.getScaleZ(), EPSILON);
-                t0.interpolate(1.0);
+                TransitionShim.interpolate(t0,1.0);
                 assertEquals(toValue, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
         }
 
     @Test
     public void testGetTargetNode() {
         final ScaleTransition t0 = new ScaleTransition(ONE_SEC, node);

@@ -531,29 +536,29 @@
         final ParallelTransition pt = new ParallelTransition();
         pt.getChildren().add(t0);
         pt.setNode(node2);
 
         // node set, parent set
-        assertTrue(t0.impl_startable(true));
-        t0.impl_start(true);
-        t0.interpolate(0.5);
+        assertTrue(AnimationShim.impl_startable(t0,true));
+        AnimationShim.impl_start(t0,true);
+        TransitionShim.interpolate(t0,0.5);
         assertEquals(0.75, node.getScaleX(), EPSILON);
         assertEquals(1.0, node2.getScaleX(), EPSILON);
-        t0.impl_finished();
+        AnimationShim.impl_finished(t0);
 
         // node null, parent set
         t0.setNode(null);
-        assertTrue(t0.impl_startable(true));
-        t0.impl_start(true);
-        t0.interpolate(0.4);
+        assertTrue(AnimationShim.impl_startable(t0,true));
+        AnimationShim.impl_start(t0,true);
+        TransitionShim.interpolate(t0,0.4);
         assertEquals(0.75, node.getScaleX(), EPSILON);
         assertEquals(0.7, node2.getScaleX(), EPSILON);
-        t0.impl_finished();
+        AnimationShim.impl_finished(t0);
 
         // node null, parent null
         pt.setNode(null);
-        assertFalse(t0.impl_startable(true));
+        assertFalse(AnimationShim.impl_startable(t0,true));
     }
 
     @Test
     public void testCachedValues() {
         final ScaleTransition t0 = new ScaleTransition(ONE_SEC, node);

@@ -564,80 +569,80 @@
                 t0.setToY(2.0);
                 t0.setFromZ(1.5);
                 t0.setToZ(0.5);
 
         // start
-        assertTrue(t0.impl_startable(true));
-        t0.impl_start(true);
+        assertTrue(AnimationShim.impl_startable(t0,true));
+        AnimationShim.impl_start(t0,true);
         t0.setFromX(0.0);
         t0.setFromY(-1.0);
         t0.setFromZ(0.5);
-        t0.interpolate(0.5);
+        TransitionShim.interpolate(t0,0.5);
         assertEquals(0.75, node.getScaleX(), EPSILON);
         assertEquals(1.75, node.getScaleY(), EPSILON);
         assertEquals(1.0,  node.getScaleZ(), EPSILON);
-        t0.impl_finished();
+        AnimationShim.impl_finished(t0);
         t0.setFromX(0.5);
                 t0.setFromY(1.5);
                 t0.setFromZ(1.5);
 
         // end
-        assertTrue(t0.impl_startable(true));
-        t0.impl_start(true);
+        assertTrue(AnimationShim.impl_startable(t0,true));
+        AnimationShim.impl_start(t0,true);
         t0.setToX(0.0);
         t0.setFromY(-1.0);
         t0.setFromZ(1.5);
-        t0.interpolate(0.2);
+        TransitionShim.interpolate(t0,0.2);
         assertEquals(0.6, node.getScaleX(), EPSILON);
         assertEquals(1.6, node.getScaleY(), EPSILON);
         assertEquals(1.3, node.getScaleZ(), EPSILON);
-        t0.impl_finished();
+        AnimationShim.impl_finished(t0);
         t0.setToX(1.0);
                 t0.setToY(2.0);
                 t0.setToZ(0.5);
 
         // node
-        assertTrue(t0.impl_startable(true));
-        t0.impl_start(true);
+        assertTrue(AnimationShim.impl_startable(t0,true));
+        AnimationShim.impl_start(t0,true);
         t0.setNode(null);
-        t0.interpolate(0.7);
+        TransitionShim.interpolate(t0,0.7);
         assertEquals(0.85, node.getScaleX(), EPSILON);
-        t0.impl_finished();
+        AnimationShim.impl_finished(t0);
         t0.setNode(node);
 
         // interpolator
-        assertTrue(t0.impl_startable(true));
-        t0.impl_start(true);
+        assertTrue(AnimationShim.impl_startable(t0,true));
+        AnimationShim.impl_start(t0,true);
         t0.setInterpolator(null);
-        t0.interpolate(0.1);
+        TransitionShim.interpolate(t0,0.1);
         assertEquals(0.55, node.getScaleX(), EPSILON);
-        t0.impl_finished();
+        AnimationShim.impl_finished(t0);
         t0.setInterpolator(Interpolator.LINEAR);
     }
 
         @Test
         public void testStartable() {
                 final ScaleTransition t0 = new ScaleTransition(Duration.ONE, node);
-                assertTrue(t0.impl_startable(true));
+                assertTrue(AnimationShim.impl_startable(t0,true));
                 
                 // duration is 0
                 t0.setDuration(Duration.ZERO);
-                assertFalse(t0.impl_startable(true));
+                assertFalse(AnimationShim.impl_startable(t0,true));
                 t0.setDuration(Duration.ONE);
-                assertTrue(t0.impl_startable(true));
+                assertTrue(AnimationShim.impl_startable(t0,true));
                 
                 // node is null
                 t0.setNode(null);
-                assertFalse(t0.impl_startable(true));
+                assertFalse(AnimationShim.impl_startable(t0,true));
                 t0.setNode(node);
-                assertTrue(t0.impl_startable(true));
+                assertTrue(AnimationShim.impl_startable(t0,true));
                 
                 // interpolator is null
                 t0.setInterpolator(null);
-                assertFalse(t0.impl_startable(true));
+                assertFalse(AnimationShim.impl_startable(t0,true));
                 t0.setInterpolator(Interpolator.LINEAR);
-                assertTrue(t0.impl_startable(true));
+                assertTrue(AnimationShim.impl_startable(t0,true));
         }
 
         @Test
         public void testEvaluateStartValue() {
                 final ScaleTransition t0 = new ScaleTransition(Duration.INDEFINITE, node);

@@ -647,33 +652,33 @@
                 
                 // first run
                 node.setScaleX( 0.6);
                 node.setScaleY( 1.6);
                 node.setScaleZ(-0.6);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
                 node.setScaleX(0.8);
                 node.setScaleY(0.8);
                 node.setScaleZ(0.8);
-                t0.interpolate(0.0);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals( 0.6, node.getScaleX(), EPSILON);
                 assertEquals( 1.6, node.getScaleY(), EPSILON);
                 assertEquals(-0.6, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
                 
                 // second run
                 node.setScaleX( 0.2);
                 node.setScaleY(-2.2);
                 node.setScaleZ(11.2);
-                assertTrue(t0.impl_startable(true));
-                t0.impl_start(true);
+                assertTrue(AnimationShim.impl_startable(t0,true));
+                AnimationShim.impl_start(t0,true);
                 node.setScaleX(0.8);
                 node.setScaleY(0.8);
                 node.setScaleZ(0.8);
-                t0.interpolate(0.0);
+                TransitionShim.interpolate(t0,0.0);
                 assertEquals( 0.2, node.getScaleX(), EPSILON);
                 assertEquals(-2.2, node.getScaleY(), EPSILON);
                 assertEquals(11.2, node.getScaleZ(), EPSILON);
-                t0.impl_finished();
+                AnimationShim.impl_finished(t0);
         }
 
 }