Remove flakey ObjectAnimatorTest
(set|get)CurrentPlayTime rely upon the current system time, so this test
cannot be reliable.
Bug 6346629
Change-Id: Iba8d88a7d062e298fd3c8df8749e0942b1f1f6dd
diff --git a/development/ide/eclipse/.classpath b/development/ide/eclipse/.classpath
index c074195..123416d 100644
--- a/development/ide/eclipse/.classpath
+++ b/development/ide/eclipse/.classpath
@@ -25,6 +25,7 @@
<classpathentry kind="src" path="cts/tests/tests/accessibilityservice/src"/>
<classpathentry kind="src" path="cts/tests/tests/accounts/src"/>
<classpathentry kind="src" path="cts/tests/tests/admin/src"/>
+ <classpathentry kind="src" path="cts/tests/tests/animation/src"/>
<classpathentry kind="src" path="cts/tests/tests/app/src"/>
<classpathentry kind="src" path="cts/tests/tests/bluetooth/src"/>
<classpathentry kind="src" path="cts/tests/tests/content/src"/>
diff --git a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
index c1cbfcc..71945ac 100644
--- a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
@@ -20,8 +20,8 @@
import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
import android.animation.ValueAnimator;
+import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
-import android.util.Property;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.Interpolator;
@@ -133,7 +133,7 @@
int values[] = {startColor, endColor};
ArgbEvaluator evaluator = new ArgbEvaluator();
PropertyValuesHolder propertyValuesHolder = PropertyValuesHolder.ofInt(propertyName, values);
- ObjectAnimator colorAnimator = ObjectAnimator.ofPropertyValuesHolder(object,
+ ObjectAnimator colorAnimator = ObjectAnimator.ofPropertyValuesHolder(object,
propertyValuesHolder);
colorAnimator.setDuration(1000);
colorAnimator.setRepeatCount(1);
@@ -160,21 +160,6 @@
assertEquals(propertyName, actualPropertyName);
}
- public void testSetCurrentPlayTime() throws Throwable {
- Object object = mActivity.view.newBall;
- String propertyName = "backgroundColor";
- int startColor = mActivity.view.RED;
- int endColor = mActivity.view.BLUE;
- long playTime = 10000l;
- Object[] values = {new Integer(startColor), new Integer(endColor)};
- ArgbEvaluator evaluator = new ArgbEvaluator();
- ObjectAnimator colorAnimator = ObjectAnimator.ofObject(object, propertyName,
- evaluator, values);
- colorAnimator.setCurrentPlayTime(playTime);
- long actualPlayTime = colorAnimator.getCurrentPlayTime();
- assertEquals(playTime, actualPlayTime);
- }
-
public void testSetFloatValues() throws Throwable {
Object object = mActivity.view.newBall;
String property = "y";