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

Commit 341a6e0e authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "[Chooser/ResolverActivity] Fix flakiness in work profile tests" into... 

Merge "[Chooser/ResolverActivity] Fix flakiness in work profile tests" into tm-qpr-dev am: da209b10

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20803247



Change-Id: Ie7fd6c74c6f52802dbe99fe6d7b0b8b22520796d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a52d45b da209b10

core/tests/coretests/src/com/android/internal/app/ChooserActivityWorkProfileTest.java

+16 −2
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


package com.android.internal.app;



import static android.util.PollingCheck.waitFor;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.action.ViewActions.swipeUp;

import static androidx.test.espresso.assertion.ViewAssertions.matches;

import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;

import static androidx.test.espresso.matcher.ViewMatchers.isSelected;

import static androidx.test.espresso.matcher.ViewMatchers.withId;

import static androidx.test.espresso.matcher.ViewMatchers.withText;
@@ -49,6 +52,8 @@ import com.android.internal.R; 
import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;

import com.android.internal.app.ChooserActivityWorkProfileTest.TestCase.Tab;



import junit.framework.AssertionFailedError;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -331,9 +336,18 @@ public class ChooserActivityWorkProfileTest { 
        final int stringId = tab == Tab.WORK ? R.string.resolver_work_tab

                : R.string.resolver_personal_tab;



        waitFor(() -> {

            onView(withText(stringId)).perform(click());

            waitForIdle();



            try {

                onView(withText(stringId)).check(matches(isSelected()));

                return true;

            } catch (AssertionFailedError e) {

                return false;

            }

        });



        onView(withId(R.id.contentPanel))

                .perform(swipeUp());

        waitForIdle();

core/tests/coretests/src/com/android/internal/app/ResolverActivityWorkProfileTest.java

+16 −2
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


package com.android.internal.app;



import static android.util.PollingCheck.waitFor;



import static androidx.test.espresso.Espresso.onView;

import static androidx.test.espresso.action.ViewActions.click;

import static androidx.test.espresso.action.ViewActions.swipeUp;

import static androidx.test.espresso.assertion.ViewAssertions.matches;

import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;

import static androidx.test.espresso.matcher.ViewMatchers.isSelected;

import static androidx.test.espresso.matcher.ViewMatchers.withId;

import static androidx.test.espresso.matcher.ViewMatchers.withText;
@@ -48,6 +51,8 @@ import com.android.internal.R; 
import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;

import com.android.internal.app.ResolverActivityWorkProfileTest.TestCase.Tab;



import junit.framework.AssertionFailedError;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -309,9 +314,18 @@ public class ResolverActivityWorkProfileTest { 
        final int stringId = tab == Tab.WORK ? R.string.resolver_work_tab

                : R.string.resolver_personal_tab;



        waitFor(() -> {

            onView(withText(stringId)).perform(click());

            waitForIdle();



            try {

                onView(withText(stringId)).check(matches(isSelected()));

                return true;

            } catch (AssertionFailedError e) {

                return false;

            }

        });



        onView(withId(R.id.contentPanel))

                .perform(swipeUp());

        waitForIdle();