commit 05399e95730792c391882bc51973e34db44e5d7e
author Brian Muramatsu <btmura@google.com> Tue Jun 05 16:51:14 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 05 16:51:14 2012 -0700
tree 156c43eff4a344d0af1184d93f10d20e6bcee21c
parent 3002bb4e43403ed21461a88d664da4e90a8ca4c1
parent 0aec05454b91e0839578afe1d37b7b45ccfb3de0

Merge "Improve ValueAnimatorTest Reliability" into jb-dev

tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java

diff --git a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
index 1bfe737..dd73475 100644
--- a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
@@ -24,7 +24,7 @@
         ActivityInstrumentationTestCase2<AnimationActivity> {
     private AnimationActivity mActivity;
     private ValueAnimator mValueAnimator;
-    private long mDuration = 1000;
+    private long mDuration = 2000;
 
     public ValueAnimatorTest() {
         super(AnimationActivity.class);
@@ -133,7 +133,7 @@
         ValueAnimator objAnimator = getAnimator();
         startAnimation(objAnimator);
         assertNotNull(objAnimator);
-        float[] fractions = getValue(objAnimator, 10, "getAnimatedFraction()", 100l, null);
+        float[] fractions = getValue(objAnimator, 10, "getAnimatedFraction()", 200l, null);
         for(int j = 0; j < 9; j++){
             assertTrue(fractions[j] >= 0.0);
             assertTrue(fractions[j] <= 1.0);
@@ -145,7 +145,7 @@
         ValueAnimator objAnimator = getAnimator();
         startAnimation(objAnimator);
         assertNotNull(objAnimator);
-        float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue()", 100l, null);
+        float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue()", 200l, null);
 
         for(int j = 0; j < 9; j++){
             assertTrue(animatedValues[j + 1] != animatedValues[j]);
@@ -157,7 +157,7 @@
         ValueAnimator objAnimator = getAnimator();
         startAnimation(objAnimator);
         assertNotNull(objAnimator);
-        float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue(property)", 100l,
+        float[] animatedValues = getValue(objAnimator, 10, "getAnimatedValue(property)", 200l,
             property);
         for(int j = 0; j < 9; j++){
             assertTrue(animatedValues[j + 1] != animatedValues[j]);
@@ -225,7 +225,7 @@
         return objAnimator;
     }
 
-    private float[] getValue(ValueAnimator animator, int n, String methodName, 
+    private float[] getValue(ValueAnimator animator, int n, String methodName,
             long sleepTime, String property) throws InterruptedException {
         float[] values = new float[n];
         for(int i = 0; i < (n-1); i++){