summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-10-19 17:32:10 -0700
committerSunny Goyal <sunnygoyal@google.com>2015-10-19 17:32:10 -0700
commitead4ab9655683050a967864a3213d8782be0344c (patch)
tree67e4c55d14d853dd54430ebbfb56fce22205cc29 /tests
parent705b4abd5793f2b989bca9c53220ffff3014a6ec (diff)
downloadandroid_packages_apps_Trebuchet-ead4ab9655683050a967864a3213d8782be0344c.tar.gz
android_packages_apps_Trebuchet-ead4ab9655683050a967864a3213d8782be0344c.tar.bz2
android_packages_apps_Trebuchet-ead4ab9655683050a967864a3213d8782be0344c.zip
Using UiSelector instead of BySelector
Change-Id: Ie912cc7291a2533f6686bdb34e108be15ce244ac
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/launcher3/RotationPreferenceTest.java14
1 files changed, 8 insertions, 6 deletions
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();
}
}