From 3531778a0898bdc50d806a463783650764bf46ba Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Thu, 4 Mar 2021 13:27:44 -0600 Subject: [PATCH] Defer AllAppsUpdate while edu test is running Bug: 159671700 Test: Presubmit Change-Id: I6f1421117286225d80a1538e45fbf2592229b586 --- .../com/android/launcher3/ui/WorkTabTest.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tests/src/com/android/launcher3/ui/WorkTabTest.java b/tests/src/com/android/launcher3/ui/WorkTabTest.java index 5e41d43d95..63220adad0 100644 --- a/tests/src/com/android/launcher3/ui/WorkTabTest.java +++ b/tests/src/com/android/launcher3/ui/WorkTabTest.java @@ -17,6 +17,7 @@ package com.android.launcher3.ui; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.NORMAL; +import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -77,6 +78,17 @@ public class WorkTabTest extends AbstractLauncherUiTest { mDevice.executeShellCommand("pm remove-user " + mProfileUserId); } + @After + public void resumeAppStoreUpdate() { + executeOnLauncher(launcher -> { + if (launcher == null || launcher.getAppsView() == null) { + return; + } + launcher.getAppsView().getAppsStore().disableDeferUpdates(DEFER_UPDATES_TEST); + Log.d(TestProtocol.WORK_PROFILE_REMOVED, "resuming AppStore updates"); + }); + } + @Test public void workTabExists() { mDevice.pressHome(); @@ -145,6 +157,12 @@ public class WorkTabTest extends AbstractLauncherUiTest { "work profile status (" + mProfileUserId + ") :" + launcher.getAppsView().isWorkTabVisible())); + + executeOnLauncher(launcher -> { + launcher.getAppsView().getAppsStore().enableDeferUpdates(DEFER_UPDATES_TEST); + Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Defer all apps update"); + }); + AtomicInteger attempt = new AtomicInteger(0); // verify work edu is seen next waitForLauncherCondition("Launcher did not show the next edu screen", l -> { @@ -157,7 +175,6 @@ public class WorkTabTest extends AbstractLauncherUiTest { if (((AllAppsPagedView) l.getAppsView().getContentView()).getCurrentPage() != WORK_PAGE) { Log.d(TestProtocol.WORK_PROFILE_REMOVED, "Work page not highlighted"); - return false; } return ((TextView) workEduView.findViewById(R.id.content_text)).getText().equals( l.getResources().getString(R.string.work_profile_edu_work_apps));