commit cc38b095d940d97e50871fcf55737c29816cc31e
author Vadim Tryshev <vadimt@google.com> Fri Feb 15 22:04:52 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 15 22:04:52 2019 +0000
tree a524fc9dbaee0ee86c300837f52cfda7ca3e20aa
parent 266415f11ef710800b07ad1433b5c8d74d5807c1
parent 270ddb93d9ce62dd1312182123b26afdb420e71a

Merge "Disabling some tests in OOP mode" into ub-launcher3-master

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
index c9d8b29..33cb5be 100644
--- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
+++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
@@ -39,6 +39,7 @@
 import com.android.launcher3.tapl.AppIcon;
 import com.android.launcher3.tapl.AppIconMenu;
 import com.android.launcher3.tapl.AppIconMenuItem;
+import com.android.launcher3.tapl.TestHelpers;
 import com.android.launcher3.tapl.Widgets;
 import com.android.launcher3.tapl.Workspace;
 import com.android.launcher3.views.OptionsPopupView;
@@ -300,6 +301,7 @@
     @Test
     @PortraitLandscape
     public void testLaunchMenuItem() throws Exception {
+        if (!TestHelpers.isInLauncherProcess()) return;
         final LauncherActivityInfo testApp = getSettingsApp();
 
         final AppIconMenu menu = mLauncher.
@@ -338,6 +340,7 @@
     @Test
     @PortraitLandscape
     public void testDragShortcut() throws Throwable {
+        if (!TestHelpers.isInLauncherProcess()) return;
         LauncherActivityInfo testApp = getSettingsApp();
 
         // 1. Open all apps and wait for load complete.