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

Commit 976bd24f authored by Vadim Tryshev's avatar Vadim Tryshev Committed by Android (Google) Code Review
Browse files

Merge "Increase wait times in TAPL" into sc-dev

parents b3545651 368dc79f

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.launcher3.ui; 
import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.ALL_APPS;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;

import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST;

import static com.android.launcher3.tapl.LauncherInstrumentation.LONG_WAIT_TIME_MS;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;
@@ -37,6 +36,7 @@ import com.android.launcher3.allapps.AllAppsContainerView; 
import com.android.launcher3.allapps.AllAppsPagedView;

import com.android.launcher3.allapps.AllAppsPagedView;

import com.android.launcher3.allapps.WorkModeSwitch;

import com.android.launcher3.allapps.WorkModeSwitch;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.tapl.LauncherInstrumentation;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.views.WorkEduView;

import com.android.launcher3.views.WorkEduView;
@@ -147,7 +147,7 @@ public class WorkTabTest extends AbstractLauncherUiTest { 
                return true;

                return true;

            }

            }

            return false;

            return false;

        }, LONG_WAIT_TIME_MS);

        }, LauncherInstrumentation.WAIT_TIME_MS);





        executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));

        executeOnLauncher(launcher -> launcher.getStateManager().goToState(ALL_APPS));

        WorkEduView workEduView = getEduView();

        WorkEduView workEduView = getEduView();

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -155,8 +155,7 @@ public final class LauncherInstrumentation { 
    private static final String OVERVIEW_RES_ID = "overview_panel";

    private static final String OVERVIEW_RES_ID = "overview_panel";

    private static final String WIDGETS_RES_ID = "primary_widgets_list_view";

    private static final String WIDGETS_RES_ID = "primary_widgets_list_view";

    private static final String CONTEXT_MENU_RES_ID = "deep_shortcuts_container";

    private static final String CONTEXT_MENU_RES_ID = "deep_shortcuts_container";

    public static final int WAIT_TIME_MS = 10000;

    public static final int WAIT_TIME_MS = 60000;

    public static final int LONG_WAIT_TIME_MS = 60000;

    private static final String SYSTEMUI_PACKAGE = "com.android.systemui";

    private static final String SYSTEMUI_PACKAGE = "com.android.systemui";

    private static final String ANDROID_PACKAGE = "android";

    private static final String ANDROID_PACKAGE = "android";
@@ -656,7 +655,7 @@ public final class LauncherInstrumentation { 
        try {

        try {

            final AccessibilityEvent event =

            final AccessibilityEvent event =

                    mInstrumentation.getUiAutomation().executeAndWaitForEvent(

                    mInstrumentation.getUiAutomation().executeAndWaitForEvent(

                            command, eventFilter, LONG_WAIT_TIME_MS);

                            command, eventFilter, WAIT_TIME_MS);

            assertNotNull("executeAndWaitForEvent returned null (this can't happen)", event);

            assertNotNull("executeAndWaitForEvent returned null (this can't happen)", event);

            final Parcelable parcelableData = event.getParcelableData();

            final Parcelable parcelableData = event.getParcelableData();

            event.recycle();

            event.recycle();