modules/graphics/src/test/java/test/com/sun/scenario/animation/shared/SimpleClipInterpolatorTest.java

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

@@ -21,13 +21,14 @@
  * 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 com.sun.scenario.animation.shared;
+package test.com.sun.scenario.animation.shared;
 
 import com.sun.javafx.animation.TickCalculation;
+import com.sun.scenario.animation.shared.SimpleClipInterpolatorShim;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import javafx.animation.KeyFrame;

@@ -43,11 +44,11 @@
         @Test
         public void testSetKeyFrame() {
         final KeyFrame kf1 = new KeyFrame(Duration.ZERO);
         final KeyFrame kf2 = new KeyFrame(Duration.millis(1000));
         final KeyFrame kf3 = new KeyFrame(Duration.millis(2000));
-        final SimpleClipInterpolator sci = new SimpleClipInterpolator(kf1, kf2,  6000);
+        final SimpleClipInterpolatorShim sci = new SimpleClipInterpolatorShim(kf1, kf2,  6000);
         
         assertNotSame(sci, sci.setKeyFrames(new KeyFrame[]{kf1, kf2, kf3}, new long[] {0, 6000, 12000}));
         assertSame   (sci, sci.setKeyFrames(new KeyFrame[]{kf1, kf2     }, new long[] {0, 6000,      }));
         assertSame   (sci, sci.setKeyFrames(new KeyFrame[]{kf1,      kf3}, new long[] {0,       12000}));
         assertNotSame(sci, sci.setKeyFrames(new KeyFrame[]{kf1          }, new long[] {0,            }));

@@ -62,11 +63,11 @@
         final KeyFrame start = new KeyFrame(Duration.ZERO);
         final KeyFrame end1 = new KeyFrame(Duration.millis(1000));
         final KeyFrame end2 = new KeyFrame(Duration.millis(2000));
         
         // two key frames
-        final SimpleClipInterpolator sci1 = new SimpleClipInterpolator (start, end1, 6000);
+        final SimpleClipInterpolatorShim sci1 = new SimpleClipInterpolatorShim(start, end1, 6000);
         sci1.validate(true);
         sci1.interpolate(TickCalculation.fromMillis(300));
         
         sci1.validate(true);
         sci1.interpolate(TickCalculation.fromMillis(800));

@@ -76,11 +77,11 @@
         
         sci1.validate(true);
         sci1.interpolate(TickCalculation.fromMillis(600));
         
         // one key frame
-        final SimpleClipInterpolator sci2 = new SimpleClipInterpolator (end1, 6000);
+        final SimpleClipInterpolatorShim sci2 = new SimpleClipInterpolatorShim(end1, 6000);
         sci2.validate(true);
         sci2.interpolate(TickCalculation.fromMillis(300));
         
         sci2.validate(true);
         sci2.interpolate(TickCalculation.fromMillis(800));

@@ -97,11 +98,11 @@
         final IntegerProperty v = new SimpleIntegerProperty();
         final KeyFrame start1 = new KeyFrame(Duration.ZERO, new KeyValue(v, 30));
         final KeyFrame end1 = new KeyFrame(Duration.millis(1000), new KeyValue(v, 40));
         final KeyFrame end2 = new KeyFrame(Duration.millis(2000), new KeyValue(v, 60));
         
-        final SimpleClipInterpolator sci1 = new SimpleClipInterpolator (start1, end1, 6000);
+        final SimpleClipInterpolatorShim sci1 = new SimpleClipInterpolatorShim(start1, end1, 6000);
         v.set(0);
         sci1.validate(true);
         sci1.interpolate(TickCalculation.fromMillis(0));
         assertEquals(30, v.get());
         sci1.interpolate(TickCalculation.fromMillis(300));

@@ -144,11 +145,11 @@
     public void test_OneKeyFrame_OneKeyValue() {
         final IntegerProperty v = new SimpleIntegerProperty();
         final KeyFrame end1 = new KeyFrame(Duration.millis(1000), new KeyValue(v, 40));
         final KeyFrame end2 = new KeyFrame(Duration.millis(2000), new KeyValue(v, 60));
 
-        final SimpleClipInterpolator sci3 = new SimpleClipInterpolator (end1, 6000);
+        final SimpleClipInterpolatorShim sci3 = new SimpleClipInterpolatorShim(end1, 6000);
         v.set(0);
         sci3.validate(true);
         sci3.interpolate(TickCalculation.fromMillis(0));
         assertEquals(0, v.get());
         sci3.interpolate(TickCalculation.fromMillis(300));

@@ -194,11 +195,11 @@
         final IntegerProperty v3 = new SimpleIntegerProperty();
         final KeyFrame start1 = new KeyFrame(Duration.ZERO, new KeyValue(v2, 130), new KeyValue(v3, 230));
         final KeyFrame end1 = new KeyFrame(Duration.millis(1000), new KeyValue(v1, 40), new KeyValue(v2, 140));
         final KeyFrame end2 = new KeyFrame(Duration.millis(2000), new KeyValue(v1, 60), new KeyValue(v2, 160));
         
-        final SimpleClipInterpolator sci1 = new SimpleClipInterpolator (start1, end1, 6000);
+        final SimpleClipInterpolatorShim sci1 = new SimpleClipInterpolatorShim(start1, end1, 6000);
         v1.set(  0);
         v2.set(100);
         v3.set(200);
         sci1.validate(true);
         sci1.interpolate(TickCalculation.fromMillis(0));

@@ -276,11 +277,11 @@
         final IntegerProperty v2 = new SimpleIntegerProperty();
         final IntegerProperty v3 = new SimpleIntegerProperty();
         final KeyFrame end1 = new KeyFrame(Duration.millis(1000), new KeyValue(v1, 40), new KeyValue(v2, 140), new KeyValue(v3, 240));
         final KeyFrame end2 = new KeyFrame(Duration.millis(2000), new KeyValue(v1, 60), new KeyValue(v2, 160), new KeyValue(v3, 260));
 
-        final SimpleClipInterpolator sci1 = new SimpleClipInterpolator (end1, 6000);
+        final SimpleClipInterpolatorShim sci1 = new SimpleClipInterpolatorShim(end1, 6000);
         v1.set(  0);
         v2.set(100);
         v3.set(200);
         sci1.validate(true);
         sci1.interpolate(TickCalculation.fromMillis(0));

@@ -359,11 +360,11 @@
         final KeyFrame start2 = new KeyFrame(Duration.ZERO, new KeyValue(v1, 30), new KeyValue(v1, -30), new KeyValue(v2, 0));
         final KeyFrame end1 = new KeyFrame(Duration.millis(1000), new KeyValue(v1, 40), new KeyValue(v2, 100));
         final KeyFrame end2 = new KeyFrame(Duration.millis(1000), new KeyValue(v1, 40), new KeyValue(v1, -40), new KeyValue(v2, 100));
 
         // single value in start, duplicate value in end
-        final SimpleClipInterpolator sci1 = new SimpleClipInterpolator (start1, end2, 6000);
+        final SimpleClipInterpolatorShim sci1 = new SimpleClipInterpolatorShim(start1, end2, 6000);
         v1.set(0);
         v2.set(0);
         sci1.validate(true);
         sci1.interpolate(TickCalculation.fromMillis(0));
         assertEquals(30, v1.get());

@@ -374,11 +375,11 @@
         sci1.interpolate(TickCalculation.fromMillis(1000));
         assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
         assertEquals(100, v2.get());
 
         // duplicate value in start, single value in end
-        final SimpleClipInterpolator sci2 = new SimpleClipInterpolator (start2, end1, 6000);
+        final SimpleClipInterpolatorShim sci2 = new SimpleClipInterpolatorShim(start2, end1, 6000);
         v1.set(0);
         v2.set(0);
         sci2.validate(true);
         sci2.interpolate(TickCalculation.fromMillis(0));
         assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));

@@ -389,11 +390,11 @@
         sci2.interpolate(TickCalculation.fromMillis(1000));
         assertEquals(40, v1.get());
         assertEquals(100, v2.get());
 
         // duplicate value in start, duplicate value in end
-        final SimpleClipInterpolator sci3 = new SimpleClipInterpolator (start2, end2, 6000);
+        final SimpleClipInterpolatorShim sci3 = new SimpleClipInterpolatorShim(start2, end2, 6000);
         v1.set(0);
         v2.set(0);
         sci3.validate(true);
         sci3.interpolate(TickCalculation.fromMillis(0));
         assertTrue("v1.get(): " + v1.get(), (30 == v1.get()) || (-30 == v1.get()));

@@ -404,11 +405,11 @@
         sci3.interpolate(TickCalculation.fromMillis(1000));
         assertTrue("v1.get(): " + v1.get(), (40 == v1.get()) || (-40 == v1.get()));
         assertEquals(100, v2.get());
 
         // no value in start, duplicate value in end
-        final SimpleClipInterpolator sci4 = new SimpleClipInterpolator (end2, 6000);
+        final SimpleClipInterpolatorShim sci4 = new SimpleClipInterpolatorShim(end2, 6000);
         v1.set(0);
         v2.set(0);
         sci4.validate(true);
         sci4.interpolate(TickCalculation.fromMillis(0));
         assertEquals(0, v1.get());