summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-05-22 19:20:57 -0700
committervadimt <vadimt@google.com>2019-05-23 10:23:41 -0700
commit40bbfbed0f9104b83ffe5c8c16000d726177c91b (patch)
tree6fe0f99da551f7ff61e483194ba27f26423c9a94 /tests/src/com/android
parent9fb137bb7312b22dc58fca5af81ade54d01b3eac (diff)
downloadandroid_packages_apps_Trebuchet-40bbfbed0f9104b83ffe5c8c16000d726177c91b.tar.gz
android_packages_apps_Trebuchet-40bbfbed0f9104b83ffe5c8c16000d726177c91b.tar.bz2
android_packages_apps_Trebuchet-40bbfbed0f9104b83ffe5c8c16000d726177c91b.zip
Reducing test wait time from 60 sec to 10 sec
Bug: 112282235 Bug: 121279417 Change-Id: Id88e782145b5fdae42354f6fce830aa05b78857a
Diffstat (limited to 'tests/src/com/android')
-rw-r--r--tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index 74cece836..92bc77fac 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -91,7 +91,6 @@ public abstract class AbstractLauncherUiTest {
public static final long SHORT_UI_TIMEOUT = 300;
public static final long DEFAULT_UI_TIMEOUT = 10000;
- protected static final int LONG_WAIT_TIME_MS = 60000;
private static final String TAG = "AbstractLauncherUiTest";
private static int sScreenshotCount = 0;
@@ -394,7 +393,7 @@ public abstract class AbstractLauncherUiTest {
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
instrumentation.getTargetContext().startActivity(intent);
assertTrue(packageName + " didn't start",
- mDevice.wait(Until.hasObject(By.pkg(packageName).depth(0)), LONG_WAIT_TIME_MS));
+ mDevice.wait(Until.hasObject(By.pkg(packageName).depth(0)), DEFAULT_UI_TIMEOUT));
}
protected void startTestActivity(int activityNumber) {
@@ -410,7 +409,7 @@ public abstract class AbstractLauncherUiTest {
assertTrue(packageName + " didn't start",
mDevice.wait(
Until.hasObject(By.pkg(packageName).text("TestActivity" + activityNumber)),
- LONG_WAIT_TIME_MS));
+ DEFAULT_UI_TIMEOUT));
}
protected static String resolveSystemApp(String category) {