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

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

@@ -21,17 +21,21 @@
  * 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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.sun.javafx.tk.Toolkit;
+import javafx.animation.Interpolator;
+import javafx.animation.ParallelTransition;
+import javafx.animation.Transition;
+import javafx.animation.TransitionShim;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 
 import org.junit.Before;
 import org.junit.Test;

@@ -90,15 +94,15 @@
     @Test
     public void testStart() {
         transition.impl_start(true);
         transition.setInterpolator(Interpolator.DISCRETE);
         assertEquals(DEFAULT_INTERPOLATOR, transition.getCachedInterpolator());
-        transition.impl_finished();
+        transition.shim_impl_finished();
 
         transition.impl_start(true);
         assertEquals(Interpolator.DISCRETE, transition.getCachedInterpolator());
-        transition.impl_finished();
+        transition.shim_impl_finished();
     }
 
     @Test
     public void testPlayTo() {
         assertTrue(transition.impl_startable(true));

@@ -110,11 +114,11 @@
         assertEquals(0.0, transition.frac, EPSILON);
         transition.impl_playTo(1, 2);
         assertEquals(0.5, transition.frac, EPSILON);
         transition.impl_playTo(2, 2);
         assertEquals(1.0, transition.frac, EPSILON);
-        transition.impl_finished();
+        transition.shim_impl_finished();
 
         // normal play with discrete interpolator
         transition.setInterpolator(Interpolator.DISCRETE);
         transition.impl_start(true);
         transition.impl_playTo(0, 2);

@@ -122,11 +126,11 @@
         transition.impl_playTo(1, 2);
         assertEquals(0.0, transition.frac, EPSILON);
         transition.impl_playTo(2, 2);
         assertEquals(1.0, transition.frac, EPSILON);
 
-        transition.impl_finished();
+        transition.shim_impl_finished();
     }
 
     @Test
     public void testJumpTo() {
         // not running

@@ -154,11 +158,11 @@
         assertEquals(0.0, transition.frac, EPSILON);
         transition.impl_jumpTo(1, 2, false);
         assertEquals(0.5, transition.frac, EPSILON);
         transition.impl_jumpTo(2, 2, false);
         assertEquals(1.0, transition.frac, EPSILON);
-        transition.impl_finished();
+        transition.shim_impl_finished();
 
         // running with discrete interpolator
         transition.setInterpolator(Interpolator.DISCRETE);
         assertTrue(transition.impl_startable(true));
         transition.impl_start(true);

@@ -175,11 +179,11 @@
         assertEquals(0.0, transition.frac, EPSILON);
         transition.impl_jumpTo(1, 2, false);
         assertEquals(0.0, transition.frac, EPSILON);
         transition.impl_jumpTo(2, 2, false);
         assertEquals(1.0, transition.frac, EPSILON);
-        transition.impl_finished();
+        transition.shim_impl_finished();
     }
 
 
 
     @Test

@@ -209,15 +213,15 @@
         assertEquals(0.0, transition.frac, EPSILON);
         transition.impl_jumpTo(1, 2, true);
         assertEquals(0.5, transition.frac, EPSILON);
         transition.impl_jumpTo(2, 2, true);
         assertEquals(1.0, transition.frac, EPSILON);
-        transition.impl_finished();
+        transition.shim_impl_finished();
 
     }
 
-    private static class TransitionImpl extends Transition {
+    private static class TransitionImpl extends TransitionShim {
         private double frac;
 
         private TransitionImpl(Duration duration) {
             setCycleDuration(duration);
         }

@@ -225,11 +229,10 @@
         private TransitionImpl(Duration duration, double targetFramerate) {
                 super(targetFramerate);
                 setCycleDuration(duration);
         }
 
-        @Override
         public void impl_setCurrentTicks(long ticks) {
             // no-op
         }
 
         @Override