Renaming DelayedCheck to PollingCheck
This should not change functionality in any way.
Better name, also moving to package android.cts.util when I'm
already there doing renaming.
Want to modify it to check before the first wait as well, but will
wait for this check to be commited first so we can better track
any new test failures.
Change-Id: If6281dd59cb3b183e39c4b9c4f89364e69811751
diff --git a/tests/src/android/app/cts/IntentServiceStub.java b/tests/src/android/app/cts/IntentServiceStub.java
index af4cd27..043ff85 100644
--- a/tests/src/android/app/cts/IntentServiceStub.java
+++ b/tests/src/android/app/cts/IntentServiceStub.java
@@ -18,9 +18,9 @@
import android.app.IntentService;
import android.content.Intent;
+import android.cts.util.PollingCheck;
import android.os.Binder;
import android.os.IBinder;
-import android.view.animation.cts.DelayedCheck;
public class IntentServiceStub extends IntentService {
public IntentServiceStub() {
@@ -50,7 +50,7 @@
}
public static void waitToFinish(long timeout) throws Throwable {
- new DelayedCheck(timeout) {
+ new PollingCheck(timeout) {
@Override
protected boolean check() {
return IntentServiceStub.onDestroyCalled;
diff --git a/tests/src/android/view/animation/cts/DelayedCheck.java b/tests/src/android/cts/util/PollingCheck.java
similarity index 89%
rename from tests/src/android/view/animation/cts/DelayedCheck.java
rename to tests/src/android/cts/util/PollingCheck.java
index 7179426..934feea 100644
--- a/tests/src/android/view/animation/cts/DelayedCheck.java
+++ b/tests/src/android/cts/util/PollingCheck.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package android.view.animation.cts;
+package android.cts.util;
import junit.framework.Assert;
-public abstract class DelayedCheck {
+public abstract class PollingCheck {
private static final long TIME_SLICE = 200;
private long mTimeout = 3000;
- public DelayedCheck() {
-
+ public PollingCheck() {
}
- public DelayedCheck(long timeout) {
+ public PollingCheck(long timeout) {
mTimeout = timeout;
}
diff --git a/tests/src/android/view/animation/cts/AnimationTestUtils.java b/tests/src/android/view/animation/cts/AnimationTestUtils.java
index 3ee22c7..a2b786d 100644
--- a/tests/src/android/view/animation/cts/AnimationTestUtils.java
+++ b/tests/src/android/view/animation/cts/AnimationTestUtils.java
@@ -17,6 +17,7 @@
package android.view.animation.cts;
import android.app.Instrumentation;
+import android.cts.util.PollingCheck;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.Animation;
@@ -66,7 +67,7 @@
});
// check whether it has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return animation.hasStarted();
@@ -74,7 +75,7 @@
}.run();
// check whether it has ended after duration
- new DelayedCheck(duration + TIMEOUT_DELTA) {
+ new PollingCheck(duration + TIMEOUT_DELTA) {
@Override
protected boolean check() {
return animation.hasEnded();
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index fdcd395..1b76924 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -32,6 +32,7 @@
import android.content.DialogInterface.OnKeyListener;
import android.content.res.Resources;
import android.content.res.TypedArray;
+import android.cts.util.PollingCheck;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.drawable.Drawable;
@@ -42,7 +43,6 @@
import android.os.Message;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -684,7 +684,7 @@
mInstrumentation.waitForIdleSync();
// Wait until TestDialog#OnWindowFocusChanged() is called
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return d.isOnWindowFocusChangedCalled;
}
diff --git a/tests/tests/app/src/android/app/cts/DownloadManagerTest.java b/tests/tests/app/src/android/app/cts/DownloadManagerTest.java
index a225749..1da6af9 100644
--- a/tests/tests/app/src/android/app/cts/DownloadManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/DownloadManagerTest.java
@@ -22,12 +22,12 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.cts.CtsTestServer;
import java.io.File;
@@ -314,7 +314,7 @@
}
private void assertDownloadQueryableByStatus(final int status) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
Cursor cursor= null;
diff --git a/tests/tests/app/src/android/app/cts/IntentServiceTest.java b/tests/tests/app/src/android/app/cts/IntentServiceTest.java
index d844aa9..0d2f11b 100644
--- a/tests/tests/app/src/android/app/cts/IntentServiceTest.java
+++ b/tests/tests/app/src/android/app/cts/IntentServiceTest.java
@@ -21,8 +21,8 @@
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
+import android.cts.util.PollingCheck;
import android.os.IBinder;
-import android.view.animation.cts.DelayedCheck;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
@@ -106,7 +106,7 @@
public void testIntentServiceLifeCycle() throws Throwable {
// start service
mContext.startService(mIntent);
- new DelayedCheck(TIMEOUT_MSEC) {
+ new PollingCheck(TIMEOUT_MSEC) {
protected boolean check() {
return IntentServiceStub.onHandleIntentCalled > 0;
}
@@ -117,7 +117,7 @@
// bind service
ServiceConnection conn = new TestConnection();
mContext.bindService(mIntent, conn, Context.BIND_AUTO_CREATE);
- new DelayedCheck(TIMEOUT_MSEC) {
+ new PollingCheck(TIMEOUT_MSEC) {
protected boolean check() {
return mConnected;
}
diff --git a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
index ae02e0a..ca6bba7 100644
--- a/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
+++ b/tests/tests/content/src/android/content/cts/ClipboardManagerListenerTest.java
@@ -18,9 +18,9 @@
import android.content.ClipData;
import android.content.ClipboardManager.OnPrimaryClipChangedListener;
+import android.cts.util.PollingCheck;
import android.net.Uri;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
public class ClipboardManagerListenerTest
@@ -57,7 +57,7 @@
}
private void assertClipChangedCount(final int expectedCount) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return expectedCount == mListener.getCount();
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index b866375..9378e63 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -29,13 +29,13 @@
import android.content.ContentValues;
import android.content.Context;
import android.content.res.AssetFileDescriptor;
+import android.cts.util.PollingCheck;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -637,7 +637,7 @@
values.put(COLUMN_KEY_NAME, "key10");
values.put(COLUMN_VALUE_NAME, 10);
mContentResolver.update(TABLE1_URI, values, null, null);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mco.hadOnChanged();
@@ -689,7 +689,7 @@
assertFalse(mco.hadOnChanged());
mContentResolver.notifyChange(TABLE1_URI, mco);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mco.hadOnChanged();
@@ -713,7 +713,7 @@
assertFalse(mco.hadOnChanged());
mContentResolver.notifyChange(TABLE1_URI, mco, false);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mco.hadOnChanged();
diff --git a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
index 6ad14e0..3e1e3e4 100644
--- a/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextWrapperTest.java
@@ -35,6 +35,7 @@
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.database.sqlite.SQLiteCursorDriver;
import android.database.sqlite.SQLiteDatabase;
@@ -48,7 +49,6 @@
import android.os.IBinder;
import android.preference.PreferenceManager;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.io.File;
import java.io.IOException;
@@ -176,7 +176,7 @@
final Intent broadcastIntent = new Intent(ResultReceiver.MOCK_ACTION);
mContextWrapper.sendOrderedBroadcast(broadcastIntent, null);
- new DelayedCheck(BROADCAST_TIMEOUT) {
+ new PollingCheck(BROADCAST_TIMEOUT) {
@Override
protected boolean check() {
return highPriorityReceiver.hasReceivedBroadCast()
@@ -188,7 +188,7 @@
highPriorityReceiver.notify();
}
- new DelayedCheck(BROADCAST_TIMEOUT) {
+ new PollingCheck(BROADCAST_TIMEOUT) {
@Override
protected boolean check() {
return highPriorityReceiver.hasReceivedBroadCast()
@@ -957,7 +957,7 @@
mContextWrapper.sendBroadcast(new Intent(ResultReceiver.MOCK_ACTION));
- new DelayedCheck(BROADCAST_TIMEOUT){
+ new PollingCheck(BROADCAST_TIMEOUT){
@Override
protected boolean check() {
return receiver.hasReceivedBroadCast();
@@ -977,7 +977,7 @@
mContextWrapper.sendBroadcast(new Intent(ResultReceiver.MOCK_ACTION), null);
- new DelayedCheck(BROADCAST_TIMEOUT){
+ new PollingCheck(BROADCAST_TIMEOUT){
@Override
protected boolean check() {
return receiver.hasReceivedBroadCast();
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
index 3edaad8..17ab976 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
@@ -30,12 +30,12 @@
import android.app.Activity;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.cts.util.PollingCheck;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.DrawableContainer.DrawableContainerState;
import android.test.ActivityInstrumentationTestCase2;
import android.util.Xml;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ImageView;
import android.widget.cts.ImageViewStubActivity;
@@ -107,7 +107,7 @@
assertSame(mAnimationDrawable.getFrame(FIRST_FRAME_INDEX),
mAnimationDrawable.getCurrent());
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -159,7 +159,7 @@
assertTrue(mAnimationDrawable.isRunning());
assertSame(mAnimationDrawable.getFrame(FIRST_FRAME_INDEX),
mAnimationDrawable.getCurrent());
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -167,7 +167,7 @@
mAnimationDrawable.start();
}
});
- delayedCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
+ pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -210,7 +210,7 @@
});
assertTrue(mAnimationDrawable.isRunning());
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -342,10 +342,10 @@
mAnimationDrawable.start();
}
});
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
- delayedCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
// begin to repeat
- delayedCheckDrawable(FIRST_FRAME_INDEX, THIRD_FRAME_DURATION);
+ pollingCheckDrawable(FIRST_FRAME_INDEX, THIRD_FRAME_DURATION);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -355,8 +355,8 @@
mAnimationDrawable.start();
}
});
- delayedCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
- delayedCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+ pollingCheckDrawable(THIRD_FRAME_INDEX, SECOND_FRAME_DURATION);
// do not repeat
assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
}
@@ -471,12 +471,12 @@
}
/**
- * Delayed check specific frame should be current one in timeout.
+ * Polling check specific frame should be current one in timeout.
* @param index - expected index of frame.
* @param timeout - timeout.
*/
- private void delayedCheckDrawable(final int index, long timeout) {
- new DelayedCheck(timeout + TOLERANCE) {
+ private void pollingCheckDrawable(final int index, long timeout) {
+ new PollingCheck(timeout + TOLERANCE) {
Drawable expected = mAnimationDrawable.getFrame(index);
@Override
protected boolean check() {
diff --git a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
index 504a304..e597827 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecord_BufferSizeTest.java
@@ -17,12 +17,12 @@
package android.media.cts;
import android.content.pm.PackageManager;
+import android.cts.util.PollingCheck;
import android.media.AudioFormat;
import android.media.AudioRecord;
import android.media.MediaRecorder.AudioSource;
import android.test.AndroidTestCase;
import android.util.Log;
-import android.view.animation.cts.DelayedCheck;
import java.util.ArrayList;
import java.util.List;
@@ -85,7 +85,7 @@
}
private void checkRecordingState(final int state) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return mAudioRecord.getRecordingState() == state;
diff --git a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
index cc25d07..2c9fe1a 100644
--- a/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaScannerConnectionTest.java
@@ -26,12 +26,12 @@
import android.content.ComponentName;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.media.MediaScannerConnection;
import android.media.MediaScannerConnection.MediaScannerConnectionClient;
import android.net.Uri;
import android.os.IBinder;
import android.test.AndroidTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.io.File;
import java.io.FileOutputStream;
@@ -157,12 +157,12 @@
}
private void checkMediaScannerConnection() {
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
protected boolean check() {
return mMediaScannerConnectionClient.isOnMediaScannerConnectedCalled;
}
}.run();
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
protected boolean check() {
return mMediaScannerConnectionClient.mediaPath != null;
}
@@ -170,7 +170,7 @@
}
private void checkConnectionState(final boolean expected) {
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
protected boolean check() {
return mMediaScannerConnection.isConnected() == expected;
}
diff --git a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
index 94300b6..f5eca5e 100644
--- a/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
+++ b/tests/tests/os/src/android/os/cts/AsyncTaskTest.java
@@ -21,9 +21,9 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import android.cts.util.PollingCheck;
import android.os.AsyncTask;
import android.test.InstrumentationTestCase;
-import android.view.animation.cts.DelayedCheck;
import java.util.concurrent.TimeUnit;
@@ -108,7 +108,7 @@
}
// wait for the task to finish completely (including onPostResult()).
- new DelayedCheck(DURATION) {
+ new PollingCheck(DURATION) {
protected boolean check() {
return mAsyncTask.getStatus() == AsyncTask.Status.FINISHED;
}
@@ -132,7 +132,7 @@
}
// wait for progress update to be processed (happens asynchronously)
- new DelayedCheck(DURATION) {
+ new PollingCheck(DURATION) {
protected boolean check() {
return mAsyncTask.updateValue != null;
}
diff --git a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
index 1395de1..13ef4c8 100644
--- a/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SearchRecentSuggestionsTest.java
@@ -24,11 +24,11 @@
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.database.Cursor;
import android.net.Uri;
import android.provider.SearchRecentSuggestions;
import android.test.ProviderTestCase2;
-import android.view.animation.cts.DelayedCheck;
@TestTargetClass(android.provider.SearchRecentSuggestions.class)
public class SearchRecentSuggestionsTest extends
@@ -227,7 +227,7 @@
private void waitForCursorCount(final Uri uri, final String[] projection,
final int expectedCount) {
- new DelayedCheck() {
+ new PollingCheck() {
protected boolean check() {
Cursor cursor = null;
try {
diff --git a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
index 6dde08d..087b930 100755
--- a/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/PasswordTransformationMethodTest.java
@@ -22,6 +22,7 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.cts.util.PollingCheck;
import android.graphics.Rect;
import android.provider.Settings.SettingNotFoundException;
import android.provider.Settings.System;
@@ -30,7 +31,6 @@
import android.text.method.PasswordTransformationMethod;
import android.view.KeyCharacterMap;
import android.view.View;
-import android.view.animation.cts.DelayedCheck;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
@@ -175,7 +175,7 @@
assertTrue(mMethod.hasCalledAfterTextChanged());
// it will get transformed after a while
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
// "******"
diff --git a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
index 6343da6..447ec84 100644
--- a/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/AnimationTest.java
@@ -26,6 +26,7 @@
import android.app.Activity;
import android.content.res.XmlResourceParser;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.util.AttributeSet;
import android.util.Xml;
@@ -355,7 +356,7 @@
// test repeat mode REVERSE
anim.setRepeatCount(1);
anim.setRepeatMode(Animation.REVERSE);
- // we have to DelayedCheck the animation status on test thread,
+ // we have to PollingCheck the animation status on test thread,
// it cannot be done on UI thread, so we invoke runOnMainSync method here.
getInstrumentation().runOnMainSync(new Runnable() {
public void run() {
@@ -364,7 +365,7 @@
});
// check whether animation has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return anim.hasStarted();
@@ -386,7 +387,7 @@
// wait for animation has ended.
// timeout is larger than duration, in case the system is sluggish
- new DelayedCheck(duration * 2 + 1000) {
+ new PollingCheck(duration * 2 + 1000) {
@Override
protected boolean check() {
return anim.hasEnded();
@@ -414,7 +415,7 @@
// test repeat mode RESTART
anim.setRepeatMode(Animation.RESTART);
- // we have to DelayedCheck the animation status on test thread,
+ // we have to PollingCheck the animation status on test thread,
// it cannot be done on UI thread, so we invoke runOnMainSync method here.
getInstrumentation().runOnMainSync(new Runnable() {
public void run() {
@@ -423,7 +424,7 @@
});
// check whether animation has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return anim.hasStarted();
@@ -445,7 +446,7 @@
// wait for animation has ended.
// timeout is larger than duration, in case the system is sluggish
- new DelayedCheck(duration * 2 + 1000) {
+ new PollingCheck(duration * 2 + 1000) {
@Override
protected boolean check() {
return anim.hasEnded();
@@ -627,7 +628,7 @@
final Animation anim = AnimationUtils.loadAnimation(mActivity, R.anim.accelerate_alpha);
assertFalse(anim.hasStarted());
- // we have to DelayedCheck the animation status on test thread,
+ // we have to PollingCheck the animation status on test thread,
// it cannot be done on UI thread, so we invoke runOnMainSync method here.
getInstrumentation().runOnMainSync(new Runnable() {
public void run() {
@@ -636,7 +637,7 @@
});
// check whether animation has started
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return anim.hasStarted();
@@ -662,7 +663,7 @@
// wait for animation has ended.
// timeout is larger than duration, in case the system is sluggish
- new DelayedCheck(2000) {
+ new PollingCheck(2000) {
@Override
protected boolean check() {
return anim.hasEnded();
diff --git a/tests/tests/view/src/android/view/cts/ViewTest.java b/tests/tests/view/src/android/view/cts/ViewTest.java
index be60976..aee9075 100644
--- a/tests/tests/view/src/android/view/cts/ViewTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewTest.java
@@ -29,6 +29,7 @@
import android.content.Context;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.graphics.Point;
import android.graphics.Rect;
@@ -69,7 +70,6 @@
import android.view.accessibility.AccessibilityEvent;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
-import android.view.animation.cts.DelayedCheck;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.view.inputmethod.InputMethodManager;
@@ -287,7 +287,7 @@
assertTrue(view.hasCalledOnAnimationStart());
// check whether it has ended after duration, and alpha changed during this time.
- new DelayedCheck(duration + TIMEOUT_DELTA) {
+ new PollingCheck(duration + TIMEOUT_DELTA) {
@Override
protected boolean check() {
return view.hasCalledOnSetAlpha() && view.hasCalledOnAnimationEnd();
@@ -2257,7 +2257,7 @@
// mAttachInfo is not null
final View view2 = mActivity.findViewById(R.id.fit_windows);
// Wait until the window has been focused.
- new DelayedCheck(TIMEOUT_DELTA) {
+ new PollingCheck(TIMEOUT_DELTA) {
@Override
protected boolean check() {
return view2.hasWindowFocus();
@@ -4429,7 +4429,7 @@
viewGroup.addView(editText);
editText.requestFocus();
- new DelayedCheck(TIMEOUT_DELTA) {
+ new PollingCheck(TIMEOUT_DELTA) {
@Override
protected boolean check() {
return editText.isFocused();
diff --git a/tests/tests/view/src/android/view/cts/View_AnimationTest.java b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
index 144e670..d2085c6 100644
--- a/tests/tests/view/src/android/view/cts/View_AnimationTest.java
+++ b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
@@ -17,12 +17,12 @@
package android.view.cts;
import android.app.Activity;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.TranslateAnimation;
import android.view.animation.cts.AnimationTestUtils;
-import android.view.animation.cts.DelayedCheck;
import com.android.cts.stub.R;
@@ -155,7 +155,7 @@
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mAnimation.hasStarted();
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java b/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
index 2cf6b58..1556cc3 100755
--- a/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
@@ -25,6 +25,7 @@
import android.app.Instrumentation;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.os.Bundle;
import android.test.ActivityInstrumentationTestCase2;
import android.text.Editable;
@@ -35,7 +36,6 @@
import android.view.KeyEvent;
import android.view.View;
import android.view.Window;
-import android.view.animation.cts.DelayedCheck;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.CompletionInfo;
import android.view.inputmethod.ExtractedTextRequest;
@@ -260,7 +260,7 @@
// dummy mode
BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
dummyConnection.commitText(inputText, inputText.length());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return text2.toString().equals(mView.getText().toString());
@@ -323,7 +323,7 @@
BaseInputConnection dummyConnection = new BaseInputConnection(mView, false);
dummyConnection.setComposingText(str, str.length());
dummyConnection.finishComposingText();
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return text.toString().equals(mView.getText().toString());
@@ -359,7 +359,7 @@
mInstrumentation.sendStringSync("q");
mInstrumentation.waitForIdleSync();
}
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return "q".equals(mView.getText().toString());
diff --git a/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
index bebb1fa..a531e30 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CacheManagerTest.java
@@ -22,8 +22,8 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.CacheManager;
import android.webkit.WebView;
import android.webkit.CacheManager.CacheResult;
@@ -98,7 +98,7 @@
final String url = mWebServer.getAssetUrl(TestHtmlConstants.EMBEDDED_IMG_URL);
// Wait for CacheManager#init() finish.
- new DelayedCheck(CACHEMANAGER_INIT_TIMEOUT) {
+ new PollingCheck(CACHEMANAGER_INIT_TIMEOUT) {
@Override
protected boolean check() {
return CacheManager.getCacheFileBaseDir() != null;
@@ -106,7 +106,7 @@
}.run();
mWebView.clearCache(true);
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ new PollingCheck(NETWORK_OPERATION_DELAY) {
@Override
protected boolean check() {
CacheResult result = CacheManager.getCacheFile(url, null);
@@ -115,7 +115,7 @@
}.run();
loadUrl(url);
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ new PollingCheck(NETWORK_OPERATION_DELAY) {
@Override
protected boolean check() {
CacheResult result = CacheManager.getCacheFile(url, null);
@@ -141,7 +141,7 @@
private void loadUrl(String url){
mWebView.loadUrl(url);
// check whether loadURL successfully
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ new PollingCheck(NETWORK_OPERATION_DELAY) {
@Override
protected boolean check() {
return mWebView.getProgress() == 100;
diff --git a/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java b/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java
index 48a6a1f..d962b5d 100755
--- a/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CacheManager_CacheResultTest.java
@@ -24,8 +24,8 @@
import org.apache.http.HttpStatus;
import org.apache.http.impl.cookie.DateUtils;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.CacheManager;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
@@ -139,7 +139,7 @@
mWebServer.setDocumentValidity(validity);
mWebView.clearCache(true);
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ new PollingCheck(NETWORK_OPERATION_DELAY) {
@Override
protected boolean check() {
CacheResult result =
@@ -175,7 +175,7 @@
private void loadUrl(String url){
mWebView.loadUrl(url);
// check whether loadURL successfully
- new DelayedCheck(NETWORK_OPERATION_DELAY) {
+ new PollingCheck(NETWORK_OPERATION_DELAY) {
@Override
protected boolean check() {
return mWebView.getProgress() == 100;
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
index 712d641..4d71048 100755
--- a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
@@ -22,8 +22,8 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
import android.webkit.WebChromeClient;
@@ -187,7 +187,7 @@
// sync cookie from RAM to FLASH, because hasCookies() only counts FLASH cookies
CookieSyncManager.getInstance().sync();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_DELAY) {
@Override
protected boolean check() {
return mCookieManager.hasCookies();
@@ -196,7 +196,7 @@
// clean up all cookies
mCookieManager.removeAllCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_DELAY) {
@Override
protected boolean check() {
return !mCookieManager.hasCookies();
@@ -247,7 +247,7 @@
assertTrue(allCookies.contains(cookie3));
mCookieManager.removeSessionCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_DELAY) {
protected boolean check() {
String c = mCookieManager.getCookie(url);
return !c.contains(cookie1) && c.contains(cookie2) && c.contains(cookie3);
@@ -256,7 +256,7 @@
Thread.sleep(expiration + 1000); // wait for cookie to expire
mCookieManager.removeExpiredCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_DELAY) {
protected boolean check() {
String c = mCookieManager.getCookie(url);
return !c.contains(cookie1) && c.contains(cookie2) && !c.contains(cookie3);
@@ -264,7 +264,7 @@
}.run();
mCookieManager.removeAllCookie();
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_DELAY) {
protected boolean check() {
return mCookieManager.getCookie(url) == null;
}
@@ -273,7 +273,7 @@
private void loadUrl(String url) {
mWebView.loadUrl(url);
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_DELAY) {
protected boolean check() {
return mWebView.getProgress() == 100;
}
@@ -281,7 +281,7 @@
}
private void waitForCookie(final String url) {
- new DelayedCheck(TEST_DELAY) {
+ new PollingCheck(TEST_DELAY) {
protected boolean check() {
return mCookieManager.getCookie(url) != null;
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java
index 9450c70..320edc3 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieSyncManagerTest.java
@@ -22,8 +22,8 @@
import dalvik.annotation.TestTargets;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.CookieManager;
import android.webkit.CookieSyncManager;
@@ -65,7 +65,7 @@
// Remove all cookies from the database.
cookieManager.removeAllCookie();
- new DelayedCheck(30000) {
+ new PollingCheck(30000) {
@Override
protected boolean check() {
return !cookieManager.hasCookies();
@@ -83,7 +83,7 @@
// Store the cookie to the database.
csm1.sync();
- new DelayedCheck(30000) {
+ new PollingCheck(30000) {
@Override
protected boolean check() {
return cookieManager.hasCookies();
@@ -92,7 +92,7 @@
// Remove all cookies from the database.
cookieManager.removeAllCookie();
- new DelayedCheck(30000) {
+ new PollingCheck(30000) {
@Override
protected boolean check() {
return !cookieManager.hasCookies();
diff --git a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
index 8721326..f7e5402 100644
--- a/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/HttpAuthHandlerTest.java
@@ -23,8 +23,8 @@
import org.apache.http.HttpStatus;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.HttpAuthHandler;
import android.webkit.WebChromeClient;
import android.webkit.WebView;
@@ -133,7 +133,7 @@
private void assertLoadUrlSuccessfully(String url) throws InterruptedException {
mWebView.loadUrl(url);
- new DelayedCheck(TIMEOUT) {
+ new PollingCheck(TIMEOUT) {
@Override
protected boolean check() {
return mWebView.getProgress() == 100;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
index 6cddfb3..66730bb 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
@@ -21,8 +21,8 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.WebBackForwardList;
import android.webkit.WebHistoryItem;
import android.webkit.WebView;
@@ -90,7 +90,7 @@
}
private void checkBackForwardList(final WebView view, final String... url) {
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
if (view.getProgress() < 100) {
return false;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
index cf20217..b40bfc9 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
@@ -21,10 +21,10 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.os.Message;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.JsPromptResult;
import android.webkit.JsResult;
import android.webkit.WebChromeClient;
@@ -79,7 +79,7 @@
assertFalse(webChromeClient.hadOnProgressChanged());
mWebView.loadUrl(TestHtmlConstants.HELLO_WORLD_URL);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnProgressChanged();
@@ -102,7 +102,7 @@
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnReceivedTitle();
@@ -140,7 +140,7 @@
String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnReceivedIcon();
@@ -180,14 +180,14 @@
// after which the child will be closed
loadUrl(mWebServer.getAssetUrl(TestHtmlConstants.JS_WINDOW_URL));
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnCreateWindow();
}
}.run();
assertFalse(webChromeClient.hadOnRequestFocus());
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnCloseWindow();
@@ -216,7 +216,7 @@
// unload should trigger when we try to navigate away
loadUrl(mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL));
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsBeforeUnload();
@@ -245,7 +245,7 @@
String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_ALERT_URL);
mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsAlert();
@@ -274,7 +274,7 @@
String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_CONFIRM_URL);
mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsConfirm();
@@ -305,14 +305,14 @@
String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_PROMPT_URL);
mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.hadOnJsPrompt();
}
}.run();
// the result returned by the client gets set as the page title
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return mWebView.getTitle().equals(promptResult);
}
@@ -322,7 +322,7 @@
private void loadUrl(String url) {
mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return mWebView.getProgress() == 100;
}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
index 71ba504..bcb2924 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
@@ -23,9 +23,9 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.WebBackForwardList;
import android.webkit.WebChromeClient;
import android.webkit.WebHistoryItem;
@@ -107,7 +107,7 @@
private void assertLoadUrlSuccessfully(final WebView view, String url) {
view.loadUrl(url);
// wait for the page load to complete
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
@Override
protected boolean check() {
return view.getProgress() == 100;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 639f795..ef5831b 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -21,10 +21,10 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.cts.util.PollingCheck;
import android.os.Build;
import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.MimeTypeMap;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
@@ -252,7 +252,7 @@
assertFalse(mSettings.getBlockNetworkImage());
assertTrue(mSettings.getLoadsImagesAutomatically());
loadAssetUrl(url);
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !mWebServer.getLastRequestUrl().endsWith(ext);
@@ -543,7 +543,7 @@
mSettings.setJavaScriptCanOpenWindowsAutomatically(false);
assertFalse(mSettings.getJavaScriptCanOpenWindowsAutomatically());
loadAssetUrl(TestHtmlConstants.POPUP_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
protected boolean check() {
String title = mWebView.getTitle();
return title != null && title.length() > 0;
@@ -554,7 +554,7 @@
mSettings.setJavaScriptCanOpenWindowsAutomatically(true);
assertTrue(mSettings.getJavaScriptCanOpenWindowsAutomatically());
loadAssetUrl(TestHtmlConstants.POPUP_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
protected boolean check() {
String title = mWebView.getTitle();
return title != null && title.length() > 0;
@@ -579,7 +579,7 @@
mSettings.setJavaScriptEnabled(true);
assertTrue(mSettings.getJavaScriptEnabled());
loadAssetUrl(TestHtmlConstants.JAVASCRIPT_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
@Override
protected boolean check() {
return mWebView.getTitle() != null;
@@ -590,7 +590,7 @@
mSettings.setJavaScriptEnabled(false);
assertFalse(mSettings.getJavaScriptEnabled());
loadAssetUrl(TestHtmlConstants.JAVASCRIPT_URL);
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
@Override
protected boolean check() {
return mWebView.getTitle() != null;
@@ -1013,7 +1013,7 @@
mSettings.setJavaScriptEnabled(true);
loadUrl(url);
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
protected boolean check() {
return mWebView.getTitle() != null && mWebView.getTitle().equals("Done");
}
@@ -1021,7 +1021,7 @@
mSettings.setAppCachePath("/data/foo");
loadUrl(url);
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
protected boolean check() {
return mWebView.getTitle() != null && mWebView.getTitle().equals("Done");
}
@@ -1061,7 +1061,7 @@
*/
private void loadUrl(String url) {
mWebView.loadUrl(url);
- new DelayedCheck(10000) {
+ new PollingCheck(10000) {
@Override
protected boolean check() {
return mWebView.getProgress() == 100;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index 2cd2deb..86b8070 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -22,11 +22,11 @@
import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.os.Message;
import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.HttpAuthHandler;
import android.webkit.WebSettings;
import android.webkit.WebView;
@@ -99,19 +99,19 @@
assertFalse(webViewClient.hasOnPageFinishedCalled());
mWebView.loadUrl(url);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return webViewClient.hasOnPageStartedCalled();
}
}.run();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return webViewClient.hasOnLoadResourceCalled();
}
}.run();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return webViewClient.hasOnPageFinishedCalled();
}
@@ -155,7 +155,7 @@
assertFalse(url.equals(mWebView.getUrl()));
// reloading the current URL should trigger the callback
mWebView.reload();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return webViewClient.hasOnFormResubmissionCalled();
}
@@ -177,7 +177,7 @@
String url2 = mWebServer.getAssetUrl(TestHtmlConstants.BR_TAG_URL);
assertLoadUrlSuccessfully(mWebView, url1);
assertLoadUrlSuccessfully(mWebView, url2);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return webViewClient.hasDoUpdateVisitedHistoryCalled();
}
@@ -231,7 +231,7 @@
assertFalse(webViewClient.hasOnUnhandledKeyEventCalled());
sendKeys(KeyEvent.KEYCODE_1);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return webViewClient.hasOnUnhandledKeyEventCalled();
}
@@ -260,7 +260,7 @@
private void assertLoadUrlSuccessfully(final WebView view, String url) {
view.loadUrl(url);
// wait until load is complete
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return view.getProgress() == 100;
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 3eb49b3..fe24012 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -25,6 +25,7 @@
import android.content.Context;
import android.content.res.AssetManager;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@@ -48,7 +49,6 @@
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
-import android.view.animation.cts.DelayedCheck;
import android.webkit.CacheManager;
import android.webkit.CacheManager.CacheResult;
import android.webkit.ConsoleMessage;
@@ -472,7 +472,7 @@
String url = mWebServer.getDelayedAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
mWebView.loadUrl(url);
mWebView.stopLoading();
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return 100 == mWebView.getProgress();
@@ -524,37 +524,37 @@
String url3 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL3);
assertLoadUrlSuccessfully(url1);
- delayedCheckWebBackForwardList(url1, 0, 1);
+ pollingCheckWebBackForwardList(url1, 0, 1);
assertGoBackOrForwardBySteps(false, -1);
assertGoBackOrForwardBySteps(false, 1);
assertLoadUrlSuccessfully(url2);
- delayedCheckWebBackForwardList(url2, 1, 2);
+ pollingCheckWebBackForwardList(url2, 1, 2);
assertGoBackOrForwardBySteps(true, -1);
assertGoBackOrForwardBySteps(false, 1);
assertLoadUrlSuccessfully(url3);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
assertGoBackOrForwardBySteps(true, -2);
assertGoBackOrForwardBySteps(false, 1);
mWebView.goBack();
- delayedCheckWebBackForwardList(url2, 1, 3);
+ pollingCheckWebBackForwardList(url2, 1, 3);
assertGoBackOrForwardBySteps(true, -1);
assertGoBackOrForwardBySteps(true, 1);
mWebView.goForward();
- delayedCheckWebBackForwardList(url3, 2, 3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
assertGoBackOrForwardBySteps(true, -2);
assertGoBackOrForwardBySteps(false, 1);
mWebView.goBackOrForward(-2);
- delayedCheckWebBackForwardList(url1, 0, 3);
+ pollingCheckWebBackForwardList(url1, 0, 3);
assertGoBackOrForwardBySteps(false, -1);
assertGoBackOrForwardBySteps(true, 2);
mWebView.goBackOrForward(2);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
assertGoBackOrForwardBySteps(true, -2);
assertGoBackOrForwardBySteps(false, 1);
}
@@ -864,7 +864,7 @@
assertLoadUrlSuccessfully(url);
}
});
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return listener.callCount > 0;
}
@@ -879,7 +879,7 @@
assertLoadUrlSuccessfully(newUrl);
}
});
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
protected boolean check() {
return listener.callCount > oldCallCount;
}
@@ -931,7 +931,7 @@
});
// File saving is done in a separate thread.
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return f.length() > 0;
@@ -1243,7 +1243,7 @@
public void testFindNext() throws Throwable {
final ScrollRunnable runnable = new ScrollRunnable();
- final class StopScrollingDelayedCheck extends DelayedCheck {
+ final class StopScrollingPollingCheck extends PollingCheck {
private int mPreviousScrollY = -1;
@Override
protected boolean check() {
@@ -1292,25 +1292,25 @@
// Focus "all" in the second page and assert that the view scrolls.
runTestOnUiThread(new FindNextRunnable(true));
- new StopScrollingDelayedCheck().run();
+ new StopScrollingPollingCheck().run();
assertTrue(runnable.getScrollY() > previousScrollY);
previousScrollY = runnable.getScrollY();
// Focus "all" in the first page and assert that the view scrolls.
runTestOnUiThread(new FindNextRunnable(true));
- new StopScrollingDelayedCheck().run();
+ new StopScrollingPollingCheck().run();
assertTrue(runnable.getScrollY() < previousScrollY);
previousScrollY = runnable.getScrollY();
// Focus "all" in the second page and assert that the view scrolls.
runTestOnUiThread(new FindNextRunnable(false));
- new StopScrollingDelayedCheck().run();
+ new StopScrollingPollingCheck().run();
assertTrue(runnable.getScrollY() > previousScrollY);
previousScrollY = runnable.getScrollY();
// Focus "all" in the first page and assert that the view scrolls.
runTestOnUiThread(new FindNextRunnable(false));
- new StopScrollingDelayedCheck().run();
+ new StopScrollingPollingCheck().run();
assertTrue(runnable.getScrollY() < previousScrollY);
previousScrollY = runnable.getScrollY();
@@ -1324,11 +1324,11 @@
// can not scroll any more
runTestOnUiThread(new FindNextRunnable(false));
- new StopScrollingDelayedCheck().run();
+ new StopScrollingPollingCheck().run();
assertTrue(runnable.getScrollY() == previousScrollY);
runTestOnUiThread(new FindNextRunnable(true));
- new StopScrollingDelayedCheck().run();
+ new StopScrollingPollingCheck().run();
assertTrue(runnable.getScrollY() == previousScrollY);
}
@@ -1377,7 +1377,7 @@
mWebView.documentHasImages(response);
}
});
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1558,7 +1558,7 @@
final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
mWebView.loadUrl(url);
waitForLoadComplete();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
CacheResult result = CacheManager.getCacheFile(url, null);
@@ -1575,7 +1575,7 @@
mWebView.clearCache(true);
// check the files are deleted
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return cacheFileBaseDir.list().length == 0;
@@ -1714,7 +1714,7 @@
mWebView.requestFocusNodeHref(hrefMsg);
}
});
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1732,7 +1732,7 @@
mWebView.requestFocusNodeHref(hrefMsg2);
}
});
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1800,7 +1800,7 @@
mWebView.requestImageRef(msg);
}
});
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return handler.hasCalledHandleMessage();
@@ -1989,18 +1989,18 @@
String url3 = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL3);
assertLoadUrlSuccessfully(url1);
- delayedCheckWebBackForwardList(url1, 0, 1);
+ pollingCheckWebBackForwardList(url1, 0, 1);
assertLoadUrlSuccessfully(url2);
- delayedCheckWebBackForwardList(url2, 1, 2);
+ pollingCheckWebBackForwardList(url2, 1, 2);
assertLoadUrlSuccessfully(url3);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
mWebView.clearHistory();
// only current URL is left after clearing
- delayedCheckWebBackForwardList(url3, 0, 1);
+ pollingCheckWebBackForwardList(url3, 0, 1);
}
@TestTargets({
@@ -2033,11 +2033,11 @@
// make a history list
assertLoadUrlSuccessfully(url1);
- delayedCheckWebBackForwardList(url1, 0, 1);
+ pollingCheckWebBackForwardList(url1, 0, 1);
assertLoadUrlSuccessfully(url2);
- delayedCheckWebBackForwardList(url2, 1, 2);
+ pollingCheckWebBackForwardList(url2, 1, 2);
assertLoadUrlSuccessfully(url3);
- delayedCheckWebBackForwardList(url3, 2, 3);
+ pollingCheckWebBackForwardList(url3, 2, 3);
// save the list
Bundle bundle = new Bundle();
@@ -2063,7 +2063,7 @@
assertEquals(2, saveList.getCurrentIndex());
/* ToBeFixed: The WebHistoryItems do not get inflated. Uncomment remaining tests when fixed.
// wait for the list items to get inflated
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return restoreList.getItemAtIndex(0).getUrl() != null &&
@@ -2169,7 +2169,7 @@
runTestOnUiThread(new Runnable() {
public void run() {
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return mWebView.getCertificate() == null;
@@ -2213,7 +2213,7 @@
runTestOnUiThread(new Runnable() {
public void run() {
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return mWebView.getCertificate() != null;
@@ -2508,7 +2508,7 @@
});
getInstrumentation().waitForIdleSync();
getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_DPAD_CENTER);
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return listener.called;
@@ -2607,7 +2607,7 @@
});
getInstrumentation().waitForIdleSync();
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return webChromeClient.onProgressChangedCalled();
@@ -2837,9 +2837,9 @@
}
}
- private void delayedCheckWebBackForwardList(final String currUrl, final int currIndex,
+ private void pollingCheckWebBackForwardList(final String currUrl, final int currIndex,
final int size) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
WebBackForwardList list = mWebView.copyBackForwardList();
@@ -2935,7 +2935,7 @@
}
private void waitForLoadComplete() {
- new DelayedCheck(TEST_TIMEOUT) {
+ new PollingCheck(TEST_TIMEOUT) {
@Override
protected boolean check() {
return mWebView.getProgress() == 100;
diff --git a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
index 9627b6f..e2dd2fd 100644
--- a/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CursorAdapterTest.java
@@ -19,6 +19,7 @@
import java.io.File;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.database.ContentObserver;
import android.database.Cursor;
import android.database.DataSetObserver;
@@ -29,7 +30,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.animation.cts.DelayedCheck;
import android.widget.CursorAdapter;
import android.widget.Filter;
import android.widget.FilterQueryProvider;
@@ -428,7 +428,7 @@
assertFalse(mMockCursorAdapter.hasContentChanged());
// insert a new row
mDatabase.execSQL("INSERT INTO test (number) VALUES ('" + FIRST_NUMBER + "');");
- new DelayedCheck(TEST_TIME_OUT) {
+ new PollingCheck(TEST_TIME_OUT) {
@Override
protected boolean check() {
return mMockCursorAdapter.hasContentChanged();
diff --git a/tests/tests/widget/src/android/widget/cts/FilterTest.java b/tests/tests/widget/src/android/widget/cts/FilterTest.java
index 862cb03..1306bd2 100644
--- a/tests/tests/widget/src/android/widget/cts/FilterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/FilterTest.java
@@ -20,8 +20,8 @@
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
-import android.view.animation.cts.DelayedCheck;
import android.widget.Filter;
import android.widget.Filter.FilterListener;
@@ -70,7 +70,7 @@
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPerformedFiltering();
@@ -78,7 +78,7 @@
}.run();
assertEquals(TEST_CONSTRAINT, mMockFilter.getPerformFilteringConstraint());
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPublishedResults();
@@ -102,7 +102,7 @@
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPerformedFiltering();
@@ -110,7 +110,7 @@
}.run();
assertEquals(TEST_CONSTRAINT, mMockFilter.getPerformFilteringConstraint());
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mMockFilter.hadPublishedResults();
@@ -119,7 +119,7 @@
assertEquals(TEST_CONSTRAINT, mMockFilter.getPublishResultsConstraint());
assertSame(mMockFilter.getExpectResults(), mMockFilter.getResults());
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return mockFilterListener.hasCalledOnFilterComplete();
diff --git a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
index 31b0b7b..c6302f9 100644
--- a/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/HorizontalScrollViewTest.java
@@ -28,6 +28,7 @@
import android.app.Activity;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.graphics.Rect;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
@@ -39,7 +40,6 @@
import android.view.ViewGroup;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
-import android.view.animation.cts.DelayedCheck;
import android.widget.HorizontalScrollView;
import android.widget.TextView;
@@ -363,7 +363,7 @@
mScrollView.fullScroll(View.FOCUS_RIGHT);
}
});
- delayedCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
+ pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
runTestOnUiThread(new Runnable() {
@@ -371,7 +371,7 @@
mScrollView.fullScroll(View.FOCUS_LEFT);
}
});
- delayedCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
+ pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
assertEquals(0, mScrollView.getScrollX());
}
@@ -521,7 +521,7 @@
mScrollView.smoothScrollBy(SCROLL_RIGHT, 0);
}
});
- delayedCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
+ pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
@@ -530,7 +530,7 @@
mScrollView.smoothScrollBy(-SCROLL_RIGHT, 0);
}
});
- delayedCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
+ pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
assertEquals(0, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
}
@@ -549,7 +549,7 @@
mScrollView.smoothScrollTo(SCROLL_RIGHT, 0);
}
});
- delayedCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
+ pollingCheckSmoothScrolling(0, SCROLL_RIGHT, 0, 0);
assertEquals(SCROLL_RIGHT, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
@@ -558,7 +558,7 @@
mScrollView.smoothScrollTo(0, 0);
}
});
- delayedCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
+ pollingCheckSmoothScrolling(SCROLL_RIGHT, 0, 0, 0);
assertEquals(0, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
}
@@ -677,7 +677,7 @@
mScrollView.fling(velocityX);
}
});
- delayedCheckFling(0, true);
+ pollingCheckFling(0, true);
final int currentX = mScrollView.getScrollX();
// fling towards left
@@ -686,7 +686,7 @@
mScrollView.fling(-velocityX);
}
});
- delayedCheckFling(currentX, false);
+ pollingCheckFling(currentX, false);
}
@TestTargetNew(
@@ -832,7 +832,7 @@
return current <= from && current >= to;
}
- private void delayedCheckSmoothScrolling(final int fromX, final int toX,
+ private void pollingCheckSmoothScrolling(final int fromX, final int toX,
final int fromY, final int toY) {
if (fromX == toX && fromY == toY) {
@@ -840,7 +840,7 @@
}
if (fromY != toY) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollY(), fromY, toY);
@@ -849,7 +849,7 @@
}
if (fromX != toX) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollX(), fromX, toX);
@@ -857,7 +857,7 @@
}.run();
}
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return toX == mScrollView.getScrollX() && toY == mScrollView.getScrollY();
@@ -865,8 +865,8 @@
}.run();
}
- private void delayedCheckFling(final int startPosition, final boolean movingRight) {
- new DelayedCheck() {
+ private void pollingCheckFling(final int startPosition, final boolean movingRight) {
+ new PollingCheck() {
@Override
protected boolean check() {
if (movingRight) {
@@ -876,7 +876,7 @@
}
}.run();
- new DelayedCheck() {
+ new PollingCheck() {
private int mPreviousScrollX = mScrollView.getScrollX();
@Override
diff --git a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
index 9f27138..dc007e4 100644
--- a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
@@ -29,6 +29,7 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
import android.util.AttributeSet;
@@ -36,7 +37,6 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.animation.cts.DelayedCheck;
import android.widget.MediaController;
import android.widget.VideoView;
@@ -222,7 +222,7 @@
assertTrue(mMediaController.isShowing());
// isShowing() should return false, but MediaController still shows, this may be a bug.
- new DelayedCheck(timeout + 500) {
+ new PollingCheck(timeout + 500) {
@Override
protected boolean check() {
return mMediaController.isShowing();
diff --git a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
index 681e641..cd336da 100644
--- a/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ScrollViewTest.java
@@ -28,6 +28,7 @@
import android.app.Activity;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.graphics.Rect;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
@@ -39,7 +40,6 @@
import android.view.ViewGroup;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ScrollView;
import android.widget.TextView;
@@ -382,7 +382,7 @@
mScrollView.fullScroll(View.FOCUS_DOWN);
}
});
- delayedCheckSmoothScrolling(0, 0, 0, mScrollBottom);
+ pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
assertEquals(mScrollBottom, mScrollView.getScrollY(), TOLERANCE);
runTestOnUiThread(new Runnable() {
@@ -390,7 +390,7 @@
mScrollView.fullScroll(View.FOCUS_UP);
}
});
- delayedCheckSmoothScrolling(0, 0, mScrollBottom, 0);
+ pollingCheckSmoothScrolling(0, 0, mScrollBottom, 0);
assertEquals(0, mScrollView.getScrollY());
}
@@ -547,7 +547,7 @@
}
});
// smoothScrollBy doesn't scroll in X
- delayedCheckSmoothScrolling(0, 0, 0, mScrollBottom);
+ pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
assertEquals(0, mScrollView.getScrollX());
assertEquals(mScrollBottom, mScrollView.getScrollY());
@@ -556,7 +556,7 @@
mScrollView.smoothScrollBy(-mScrollRight, -mScrollBottom);
}
});
- delayedCheckSmoothScrolling(mScrollRight, 0, mScrollBottom, 0);
+ pollingCheckSmoothScrolling(mScrollRight, 0, mScrollBottom, 0);
assertEquals(0, mScrollView.getScrollX());
assertEquals(0, mScrollView.getScrollY());
}
@@ -576,7 +576,7 @@
}
});
// smoothScrollTo doesn't scroll in X
- delayedCheckSmoothScrolling(0, 0, 0, mScrollBottom);
+ pollingCheckSmoothScrolling(0, 0, 0, mScrollBottom);
assertEquals(0, mScrollView.getScrollX());
assertEquals(mScrollBottom, mScrollView.getScrollY());
@@ -585,7 +585,7 @@
mScrollView.smoothScrollTo(mPageWidth, mPageHeight);
}
});
- delayedCheckSmoothScrolling(0, 0, mScrollBottom, mPageHeight);
+ pollingCheckSmoothScrolling(0, 0, mScrollBottom, mPageHeight);
assertEquals(0, mScrollView.getScrollX());
assertEquals(mPageHeight, mScrollView.getScrollY());
}
@@ -706,7 +706,7 @@
mScrollView.fling(2000);
}
});
- delayedCheckFling(0, true);
+ pollingCheckFling(0, true);
final int currentY = mScrollView.getScrollY();
// fling towards top
@@ -715,7 +715,7 @@
mScrollView.fling(-2000);
}
});
- delayedCheckFling(currentY, false);
+ pollingCheckFling(currentY, false);
}
@TestTargetNew(
@@ -860,7 +860,7 @@
return current <= from && current >= to;
}
- private void delayedCheckSmoothScrolling(final int fromX, final int toX,
+ private void pollingCheckSmoothScrolling(final int fromX, final int toX,
final int fromY, final int toY) {
if (fromX == toX && fromY == toY) {
@@ -868,7 +868,7 @@
}
if (fromY != toY) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollY(), fromY, toY);
@@ -877,7 +877,7 @@
}
if (fromX != toX) {
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return isInRange(mScrollView.getScrollX(), fromX, toX);
@@ -885,7 +885,7 @@
}.run();
}
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return toX == mScrollView.getScrollX() && toY == mScrollView.getScrollY();
@@ -893,8 +893,8 @@
}.run();
}
- private void delayedCheckFling(final int startPosition, final boolean movingDown) {
- new DelayedCheck() {
+ private void pollingCheckFling(final int startPosition, final boolean movingDown) {
+ new PollingCheck() {
@Override
protected boolean check() {
if (movingDown) {
@@ -904,7 +904,7 @@
}
};
- new DelayedCheck() {
+ new PollingCheck() {
private int mPreviousScrollY = mScrollView.getScrollY();
@Override
diff --git a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
index 3207a15..70310de 100644
--- a/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SlidingDrawerTest.java
@@ -28,13 +28,13 @@
import android.app.Activity;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
import android.util.AttributeSet;
import android.util.Xml;
import android.view.MotionEvent;
import android.view.View;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ImageView;
import android.widget.SlidingDrawer;
import android.widget.TextView;
@@ -192,7 +192,7 @@
assertFalse(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
@@ -210,7 +210,7 @@
assertTrue(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
@@ -253,7 +253,7 @@
assertFalse(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
@@ -271,7 +271,7 @@
assertTrue(drawer.isOpened());
assertEquals(View.GONE, content.getVisibility());
- new DelayedCheck() {
+ new PollingCheck() {
@Override
protected boolean check() {
return !drawer.isMoving();
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index c714d8a..dcf574c 100755
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -35,6 +35,7 @@
import android.content.Intent;
import android.content.res.ColorStateList;
import android.content.res.Resources.NotFoundException;
+import android.cts.util.PollingCheck;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Paint;
@@ -86,7 +87,6 @@
import android.view.ContextMenu.ContextMenuInfo;
import android.view.View.OnCreateContextMenuListener;
import android.view.View.OnLongClickListener;
-import android.view.animation.cts.DelayedCheck;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.ExtractedText;
@@ -2580,7 +2580,7 @@
mInstrumentation.waitForIdleSync();
// it will get transformed after a while
- new DelayedCheck(TIMEOUT) {
+ new PollingCheck(TIMEOUT) {
@Override
protected boolean check() {
// "******"
@@ -3432,7 +3432,7 @@
// wait for the marquee to run
// fading is shown on both sides if the marquee runs for a while
- new DelayedCheck(TIMEOUT) {
+ new PollingCheck(TIMEOUT) {
@Override
protected boolean check() {
return textView.getLeftFadingEdgeStrength() > 0.0f
@@ -3446,7 +3446,7 @@
// wait for the marquee to continue
// the left fading becomes thicker while the right fading becomes thiner
// as the text moves towards left
- new DelayedCheck(TIMEOUT) {
+ new PollingCheck(TIMEOUT) {
@Override
protected boolean check() {
return leftFadingEdgeStrength < textView.getLeftFadingEdgeStrength()
diff --git a/tests/tests/widget/src/android/widget/cts/ToastTest.java b/tests/tests/widget/src/android/widget/cts/ToastTest.java
index c54b205..c5f1c9f 100644
--- a/tests/tests/widget/src/android/widget/cts/ToastTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToastTest.java
@@ -26,6 +26,7 @@
import android.app.Activity;
import android.app.Instrumentation;
+import android.cts.util.PollingCheck;
import android.graphics.drawable.Drawable;
import android.os.SystemClock;
import android.test.ActivityInstrumentationTestCase2;
@@ -33,7 +34,6 @@
import android.view.Gravity;
import android.view.View;
import android.view.WindowManager;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ImageView;
import android.widget.Toast;
@@ -78,7 +78,7 @@
}
private void assertShowToast(final View view) {
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return null != view.getParent();
@@ -88,7 +88,7 @@
private void assertShowAndHide(final View view) {
assertShowToast(view);
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return null == view.getParent();
diff --git a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
index 57ea598..6b3cc4e 100644
--- a/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/VideoViewTest.java
@@ -26,13 +26,13 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
+import android.cts.util.PollingCheck;
import android.media.MediaPlayer;
import android.media.MediaPlayer.OnCompletionListener;
import android.media.MediaPlayer.OnErrorListener;
import android.media.MediaPlayer.OnPreparedListener;
import android.test.ActivityInstrumentationTestCase2;
import android.view.View.MeasureSpec;
-import android.view.animation.cts.DelayedCheck;
import android.widget.MediaController;
import android.widget.VideoView;
@@ -214,7 +214,7 @@
mVideoView.setVideoPath(mVideoPath);
}
});
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return preparedListener.isTriggered();
@@ -228,7 +228,7 @@
}
});
// wait time is longer than duration in case system is sluggish
- new DelayedCheck(mVideoView.getDuration() + TIME_OUT) {
+ new PollingCheck(mVideoView.getDuration() + TIME_OUT) {
@Override
protected boolean check() {
return completionListener.isTriggered();
@@ -254,7 +254,7 @@
});
mInstrumentation.waitForIdleSync();
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return listener.isTriggered();
@@ -278,7 +278,7 @@
});
mInstrumentation.waitForIdleSync();
- new DelayedCheck(TIME_OUT) {
+ new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
return prepareListener.isTriggered();
diff --git a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
index 4bb412c..f98528a 100644
--- a/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ZoomButtonTest.java
@@ -27,13 +27,13 @@
import org.xmlpull.v1.XmlPullParser;
import android.app.Activity;
+import android.cts.util.PollingCheck;
import android.test.ActivityInstrumentationTestCase2;
import android.test.UiThreadTest;
import android.util.AttributeSet;
import android.util.Xml;
import android.view.View;
import android.view.View.OnClickListener;
-import android.view.animation.cts.DelayedCheck;
import android.widget.ListView;
import android.widget.ZoomButton;
@@ -157,7 +157,7 @@
assertFalse(listener.hasOnClickCalled());
mZoomButton.performLongClick();
- new DelayedCheck(speed + 500) {
+ new PollingCheck(speed + 500) {
@Override
protected boolean check() {
return listener.hasOnClickCalled();