From ead4ab9655683050a967864a3213d8782be0344c Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 19 Oct 2015 17:32:10 -0700 Subject: Using UiSelector instead of BySelector Change-Id: Ie912cc7291a2533f6686bdb34e108be15ce244ac --- .../src/com/android/launcher3/RotationPreferenceTest.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/src/com/android/launcher3/RotationPreferenceTest.java b/tests/src/com/android/launcher3/RotationPreferenceTest.java index 5f6347557..4e18aa6bf 100644 --- a/tests/src/com/android/launcher3/RotationPreferenceTest.java +++ b/tests/src/com/android/launcher3/RotationPreferenceTest.java @@ -4,9 +4,9 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.graphics.Rect; -import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; -import android.support.test.uiautomator.Until; +import android.support.test.uiautomator.UiObject; +import android.support.test.uiautomator.UiSelector; import android.test.InstrumentationTestCase; /** @@ -73,15 +73,17 @@ public class RotationPreferenceTest extends InstrumentationTestCase { .setPackage(mTargetPackage) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); getInstrumentation().getContext().startActivity(homeIntent); - mDevice.wait(Until.hasObject(By.pkg(mTargetPackage).depth(0)), 3000); + mDevice.findObject(new UiSelector().packageName(mTargetPackage)).waitForExists(6000); } private void setRotationEnabled(boolean enabled) { mPrefs.edit().putBoolean(Utilities.ALLOW_ROTATION_PREFERENCE_KEY, enabled).commit(); } - private Rect getHotseatBounds() { - mDevice.wait(Until.hasObject(By.res(mTargetPackage, "hotseat")), 3000); - return mDevice.findObject(By.res(mTargetPackage, "hotseat")).getVisibleBounds(); + private Rect getHotseatBounds() throws Exception { + UiObject hotseat = mDevice.findObject( + new UiSelector().resourceId(mTargetPackage + ":id/hotseat")); + hotseat.waitForExists(6000); + return hotseat.getVisibleBounds(); } } -- cgit v1.2.3