summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-05-08 23:23:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-08 23:23:41 +0000
commit758be45bac2fbf0e1d28087240aeb82535f582bc (patch)
treea21771362402febf2cf06b783ba9a54638c4dd2c
parent09edbf3c73dff7c2cadbeb82567df0897666aed8 (diff)
parentb9300ef8494264143534674b73f4d1dd12e0a941 (diff)
downloadpackages_apps_Trebuchet-758be45bac2fbf0e1d28087240aeb82535f582bc.tar.gz
packages_apps_Trebuchet-758be45bac2fbf0e1d28087240aeb82535f582bc.tar.bz2
packages_apps_Trebuchet-758be45bac2fbf0e1d28087240aeb82535f582bc.zip
Merge "Not starting calculator from TaplTestsLauncher3.testAppIconLaunchFromAllAppsFromHome" into ub-launcher3-qt-dev
-rw-r--r--tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index 581e886b6..7578dfff2 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import android.content.Intent;
import android.util.Log;
import androidx.test.filters.LargeTest;
@@ -241,9 +240,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest {
}
public static void runIconLaunchFromAllAppsTest(AbstractLauncherUiTest test, AllApps allApps) {
- final AppIcon app = allApps.getAppIcon("Calculator");
- assertNotNull("AppIcon.launch returned null", app.launch(
- test.resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)));
+ final AppIcon app = allApps.getAppIcon("TestActivity7");
+ assertNotNull("AppIcon.launch returned null", app.launch(getAppPackageName()));
test.executeOnLauncher(launcher -> assertTrue(
"Launcher activity is the top activity; expecting another activity to be the top "
+ "one",