diff options
author | Vadim Tryshev <vadimt@google.com> | 2019-09-04 12:37:40 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-04 12:37:40 -0700 |
commit | 72fddba837afb28ad31f775b566ee4ba3f02eab9 (patch) | |
tree | 27ad399f248f41aef836b2fea3de0e850969d751 /tests/src/com/android/launcher3 | |
parent | c6c63706faa2e84f5db9a464a4a4e9fabd9eaaf8 (diff) | |
parent | 846656f13898a9fe8745a738db922b4e97d8280b (diff) | |
download | android_packages_apps_Trebuchet-72fddba837afb28ad31f775b566ee4ba3f02eab9.tar.gz android_packages_apps_Trebuchet-72fddba837afb28ad31f775b566ee4ba3f02eab9.tar.bz2 android_packages_apps_Trebuchet-72fddba837afb28ad31f775b566ee4ba3f02eab9.zip |
Merge "Enabling debug tracing for all UI tests" into ub-launcher3-qt-qpr1-dev
am: 846656f138
Change-Id: Ie40cc1d55d40ffefe6c1b2d3588b03ff92d2cb38
Diffstat (limited to 'tests/src/com/android/launcher3')
-rw-r--r-- | tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java | 2 | ||||
-rw-r--r-- | tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java index 6d636cf69..761253dcf 100644 --- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java +++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java @@ -112,6 +112,7 @@ public abstract class AbstractLauncherUiTest { launcher -> checkLauncherIntegrity(launcher, containerType))); } + mLauncher.enableDebugTracing(); } protected final LauncherActivityRule mActivityMonitor = new LauncherActivityRule(); @@ -202,6 +203,7 @@ public abstract class AbstractLauncherUiTest { resetLoaderState(); } else { clearPackageData(mDevice.getLauncherPackageName()); + mLauncher.enableDebugTracing(); } } diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index 0c87ab908..c2a3c1c52 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -173,7 +173,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { @Test public void testWorkspace() throws Exception { - mLauncher.enableDebugTracing(); final Workspace workspace = mLauncher.getWorkspace(); // Test that ensureWorkspaceIsScrollable adds a page by dragging an icon there. @@ -209,7 +208,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { // Test starting a workspace app. final AppIcon app = workspace.getWorkspaceAppIcon("Chrome"); assertNotNull("No Chrome app in workspace", app); - mLauncher.disableDebugTracing(); } public static void runIconLaunchFromAllAppsTest(AbstractLauncherUiTest test, AllApps allApps) { @@ -300,7 +298,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { @Test @PortraitLandscape public void testDragAppIcon() throws Throwable { - mLauncher.enableDebugTracing(); // 1. Open all apps and wait for load complete. // 2. Drag icon to homescreen. // 3. Verify that the icon works on homescreen. @@ -317,13 +314,11 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { "Launcher activity is the top activity; expecting another activity to be the top " + "one", isInBackground(launcher))); - mLauncher.disableDebugTracing(); } @Test @PortraitLandscape public void testDragShortcut() throws Throwable { - mLauncher.enableDebugTracing(); // 1. Open all apps and wait for load complete. // 2. Find the app and long press it to show shortcuts. // 3. Press icon center until shortcuts appear @@ -343,7 +338,6 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { } finally { allApps.unfreeze(); } - mLauncher.disableDebugTracing(); } public static String getAppPackageName() { |