summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-04-26 23:58:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-04-26 23:58:15 +0000
commitfa671826e3eb377e438493fe4eb0fcf5b3e0086c (patch)
tree421c5100aade79a7eefd86ba815705ff757487ba /tests
parent9565c2a071d51477f58ee8a1e39dcc73d86ed96a (diff)
parent91b01f6c7fe6955a926f0cf6cf11068a4354cf21 (diff)
downloadandroid_packages_apps_Trebuchet-fa671826e3eb377e438493fe4eb0fcf5b3e0086c.tar.gz
android_packages_apps_Trebuchet-fa671826e3eb377e438493fe4eb0fcf5b3e0086c.tar.bz2
android_packages_apps_Trebuchet-fa671826e3eb377e438493fe4eb0fcf5b3e0086c.zip
Merge "Not starting Chrome for testing as it's unstable" into ub-launcher3-qt-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index c55bc72ca..2a6975762 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -239,12 +239,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
// Test starting a workspace app.
final AppIcon app = workspace.tryGetWorkspaceAppIcon("Chrome");
assertNotNull("No Chrome app in workspace", app);
- assertNotNull("AppIcon.launch returned null",
- app.launch(resolveSystemApp(Intent.CATEGORY_APP_BROWSER)));
- executeOnLauncher(launcher -> assertTrue(
- "Launcher activity is the top activity; expecting another activity to be the top "
- + "one",
- isInBackground(launcher)));
}
public static void runIconLaunchFromAllAppsTest(AbstractLauncherUiTest test, AllApps allApps) {
@@ -340,6 +334,10 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
dragToWorkspace().
getWorkspaceAppIcon(APP_NAME).
launch(getAppPackageName());
+ executeOnLauncher(launcher -> assertTrue(
+ "Launcher activity is the top activity; expecting another activity to be the "
+ + "top one",
+ isInBackground(launcher)));
} finally {
TestProtocol.sDebugTracing = false;
}