Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 119110ab authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "Defer AllAppsUpdate while edu test is running" into sc-dev

parents 72d748f7 3531778a
Loading
Loading
Loading
Loading
+18 −1
Original line number Diff line number Diff line
@@ -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));