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

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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

@@ -24,10 +24,12 @@
  */
 
 package test.javafx.animation;
 
 
+import com.sun.javafx.animation.KeyValueHelper;
+import com.sun.javafx.animation.KeyValueType;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyValue;
 import static org.junit.Assert.assertEquals;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;

@@ -51,30 +53,30 @@
 public class KeyValueTest {
 
     private static final double EPSILON_DOUBLE = 1e-12;
     private static final float EPSILON_FLOAT = 1e-6f;
 
-    private void assertKeyValue(KeyValue.Type type, WritableValue<?> target, Object endValue, Interpolator interpolator, KeyValue kv) {
-        assertEquals(type, kv.getType());
+    private void assertKeyValue(KeyValueType type, WritableValue<?> target, Object endValue, Interpolator interpolator, KeyValue kv) {
+        assertEquals(type, KeyValueHelper.getType(kv));
         assertEquals(target, kv.getTarget());
         assertEquals(endValue, kv.getEndValue());
         assertEquals(interpolator, kv.getInterpolator());
     }
 
-    private void assertKeyValue(KeyValue.Type type, WritableValue<?> target, Interpolator interpolator, KeyValue kv) {
-        assertEquals(type, kv.getType());
+    private void assertKeyValue(KeyValueType type, WritableValue<?> target, Interpolator interpolator, KeyValue kv) {
+        assertEquals(type, KeyValueHelper.getType(kv));
         assertEquals(target, kv.getTarget());
         assertEquals(interpolator, kv.getInterpolator());
     }
 
 
 
     @Test
     public void testBooleanFactory_Interpolator() {
         final BooleanProperty v = new SimpleBooleanProperty();
         final KeyValue kv = new KeyValue(v, true, Interpolator.EASE_BOTH);
-        assertKeyValue(KeyValue.Type.BOOLEAN, v, Boolean.TRUE, Interpolator.EASE_BOTH, kv);
+        assertKeyValue(KeyValueType.BOOLEAN, v, Boolean.TRUE, Interpolator.EASE_BOTH, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testBooleanFactory_Interpolator_NullTarget() {
         new KeyValue(null, true, Interpolator.EASE_BOTH);

@@ -90,11 +92,11 @@
 
     @Test
     public void testBooleanFactory() {
         final BooleanProperty v = new SimpleBooleanProperty();
         final KeyValue kv = new KeyValue(v, true);
-        assertKeyValue(KeyValue.Type.BOOLEAN, v, Boolean.TRUE, Interpolator.LINEAR, kv);
+        assertKeyValue(KeyValueType.BOOLEAN, v, Boolean.TRUE, Interpolator.LINEAR, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testBooleanFactory_NullTarget() {
         new KeyValue(null, true);

@@ -104,11 +106,11 @@
 
     @Test
     public void testDoubleFactory_Interpolator() {
         final DoubleProperty v = new SimpleDoubleProperty();
         final KeyValue kv = new KeyValue(v, Math.PI, Interpolator.EASE_BOTH);
-        assertKeyValue(KeyValue.Type.DOUBLE, v, Interpolator.EASE_BOTH, kv);
+        assertKeyValue(KeyValueType.DOUBLE, v, Interpolator.EASE_BOTH, kv);
         assertEquals(Math.PI, ((Number)kv.getEndValue()).doubleValue(), EPSILON_DOUBLE);
     }
 
     @Test(expected=NullPointerException.class)
     public void testDoubleFactory_Interpolator_NullTarget() {

@@ -125,11 +127,11 @@
 
     @Test
     public void testDoubleFactory() {
         final DoubleProperty v = new SimpleDoubleProperty();
         final KeyValue kv = new KeyValue(v, Math.E);
-        assertKeyValue(KeyValue.Type.DOUBLE, v, Interpolator.LINEAR, kv);
+        assertKeyValue(KeyValueType.DOUBLE, v, Interpolator.LINEAR, kv);
         assertEquals(Math.E, ((Number)kv.getEndValue()).doubleValue(), EPSILON_DOUBLE);
     }
 
     @Test(expected=NullPointerException.class)
     public void testDoubleFactory_NullTarget() {

@@ -140,11 +142,11 @@
 
     @Test
     public void testFloatFactory_Interpolator() {
         final FloatProperty v = new SimpleFloatProperty();
         final KeyValue kv = new KeyValue(v, (float)Math.E, Interpolator.EASE_BOTH);
-        assertKeyValue(KeyValue.Type.FLOAT, v, Interpolator.EASE_BOTH, kv);
+        assertKeyValue(KeyValueType.FLOAT, v, Interpolator.EASE_BOTH, kv);
         assertEquals((float)Math.E, ((Number)kv.getEndValue()).floatValue(), EPSILON_FLOAT);
     }
 
     @Test(expected=NullPointerException.class)
     public void testFloatFactory_Interpolator_NullTarget() {

@@ -161,11 +163,11 @@
 
     @Test
     public void testFloatFactory() {
         final FloatProperty v = new SimpleFloatProperty();
         final KeyValue kv = new KeyValue(v, (float)Math.PI);
-        assertKeyValue(KeyValue.Type.FLOAT, v, Interpolator.LINEAR, kv);
+        assertKeyValue(KeyValueType.FLOAT, v, Interpolator.LINEAR, kv);
         assertEquals((float)Math.PI, ((Number)kv.getEndValue()).floatValue(), EPSILON_FLOAT);
     }
 
     @Test(expected=NullPointerException.class)
     public void testFloatFactory_NullTarget() {

@@ -176,11 +178,11 @@
 
     @Test
     public void testIntegerFactory_Interpolator() {
         final IntegerProperty v = new SimpleIntegerProperty();
         final KeyValue kv = new KeyValue(v, Integer.MAX_VALUE, Interpolator.EASE_BOTH);
-        assertKeyValue(KeyValue.Type.INTEGER, v, Integer.MAX_VALUE, Interpolator.EASE_BOTH, kv);
+        assertKeyValue(KeyValueType.INTEGER, v, Integer.MAX_VALUE, Interpolator.EASE_BOTH, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testIntegerFactory_Interpolator_NullTarget() {
         new KeyValue((WritableIntegerValue)null, 1, Interpolator.EASE_BOTH);

@@ -196,11 +198,11 @@
 
     @Test
     public void testIntegerFactory() {
         final IntegerProperty v = new SimpleIntegerProperty();
         final KeyValue kv = new KeyValue(v, Integer.MIN_VALUE);
-        assertKeyValue(KeyValue.Type.INTEGER, v, Integer.MIN_VALUE, Interpolator.LINEAR, kv);
+        assertKeyValue(KeyValueType.INTEGER, v, Integer.MIN_VALUE, Interpolator.LINEAR, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testIntegerFactory_NullTarget() {
         new KeyValue((WritableIntegerValue)null, Integer.MIN_VALUE);

@@ -210,11 +212,11 @@
 
     @Test
     public void testLongFactory_Interpolator() {
         final LongProperty v = new SimpleLongProperty();
         final KeyValue kv = new KeyValue(v, Long.MAX_VALUE, Interpolator.EASE_BOTH);
-        assertKeyValue(KeyValue.Type.LONG, v, Long.MAX_VALUE, Interpolator.EASE_BOTH, kv);
+        assertKeyValue(KeyValueType.LONG, v, Long.MAX_VALUE, Interpolator.EASE_BOTH, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testLongFactory_Interpolator_NullTarget() {
         new KeyValue((WritableLongValue)null, 1L, Interpolator.EASE_BOTH);

@@ -230,11 +232,11 @@
 
     @Test
     public void testLongFactory() {
         final LongProperty v = new SimpleLongProperty();
         final KeyValue kv = new KeyValue(v, Long.MIN_VALUE);
-        assertKeyValue(KeyValue.Type.LONG, v, Long.MIN_VALUE, Interpolator.LINEAR, kv);
+        assertKeyValue(KeyValueType.LONG, v, Long.MIN_VALUE, Interpolator.LINEAR, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testLongFactory_NullTarget() {
         new KeyValue((WritableLongValue)null, Long.MIN_VALUE);

@@ -244,11 +246,11 @@
 
     @Test
     public void testObjectFactory_Interpolator() {
         final StringProperty v = new SimpleStringProperty();
         final KeyValue kv = new KeyValue(v, "Hello World", Interpolator.EASE_BOTH);
-        assertKeyValue(KeyValue.Type.OBJECT, v, "Hello World", Interpolator.EASE_BOTH, kv);
+        assertKeyValue(KeyValueType.OBJECT, v, "Hello World", Interpolator.EASE_BOTH, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testObjectFactory_Interpolator_NullTarget() {
         new KeyValue(null, "Hello World", Interpolator.EASE_BOTH);

@@ -264,11 +266,11 @@
 
     @Test
     public void testObjectFactory() {
         final StringProperty v = new SimpleStringProperty();
         final KeyValue kv = new KeyValue(v, "Goodbye World");
-        assertKeyValue(KeyValue.Type.OBJECT, v, "Goodbye World", Interpolator.LINEAR, kv);
+        assertKeyValue(KeyValueType.OBJECT, v, "Goodbye World", Interpolator.LINEAR, kv);
     }
 
     @Test(expected=NullPointerException.class)
     public void testObjectFactory_NullTarget() {
         new KeyValue(null, "Goodbye World");