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

Commit b4fc3974 authored by arangelov's avatar arangelov
Browse files

Tests for personal and work tab logic. 

Bug: 142537267
Bug: 142538125
Test: atest com.android.internal.app.ChooserActivityTest
Test: atest com.android.internal.app.ResolverActivityTest
Change-Id: I542c6d42ac94a255c1cb934db02cecfd4601fa03
parent cf26864a

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

+148 −9
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import static com.android.internal.app.ChooserActivity.TARGET_TYPE_SHORTCUTS_FRO 
import static com.android.internal.app.ChooserListAdapter.CALLER_TARGET_SCORE_BOOST;

import static com.android.internal.app.ChooserListAdapter.SHORTCUT_TARGET_SCORE_BOOST;

import static com.android.internal.app.ChooserWrapperActivity.sOverrides;

import static com.android.internal.app.MatcherUtils.first;



import static org.hamcrest.CoreMatchers.is;

import static org.hamcrest.CoreMatchers.not;
@@ -63,6 +64,8 @@ import android.graphics.Paint; 
import android.graphics.drawable.Icon;

import android.metrics.LogMaker;

import android.net.Uri;

import android.os.Bundle;

import android.os.UserHandle;

import android.service.chooser.ChooserTarget;



import androidx.test.platform.app.InstrumentationRegistry;
@@ -74,7 +77,11 @@ import com.android.internal.app.chooser.DisplayResolveInfo; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;



import org.hamcrest.BaseMatcher;

import org.hamcrest.Description;

import org.hamcrest.Matcher;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -302,6 +309,7 @@ public class ChooserActivityTest { 
        assertThat(activity.getIsSelected(), is(true));

    }



    @Ignore // b/148158199

    @Test

    public void noResultsFromPackageManager() {

        when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
@@ -346,6 +354,9 @@ public class ChooserActivityTest { 


    @Test

    public void hasOtherProfileOneOption() throws Exception {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;



        Intent sendIntent = createSendTextIntent();

        List<ResolvedComponentInfo> resolvedComponentInfos =

                createResolvedComponentsForTestWithOtherProfile(2);
@@ -372,9 +383,7 @@ public class ChooserActivityTest { 
        // Make a stable copy of the components as the original list may be modified

        List<ResolvedComponentInfo> stableCopy =

                createResolvedComponentsForTestWithOtherProfile(2);

        // Check that the "Other Profile" activity is put in the right spot

        onView(withId(R.id.profile_button)).check(matches(

                withText(stableCopy.get(0).getResolveInfoAt(0).activityInfo.name)));

        waitForIdle();

        onView(withText(stableCopy.get(1).getResolveInfoAt(0).activityInfo.name))

                .perform(click());

        waitForIdle();
@@ -383,6 +392,9 @@ public class ChooserActivityTest { 


    @Test

    public void hasOtherProfileTwoOptionsAndUserSelectsOne() throws Exception {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;



        Intent sendIntent = createSendTextIntent();

        List<ResolvedComponentInfo> resolvedComponentInfos =

                createResolvedComponentsForTestWithOtherProfile(3);
@@ -411,9 +423,6 @@ public class ChooserActivityTest { 
        // Make a stable copy of the components as the original list may be modified

        List<ResolvedComponentInfo> stableCopy =

                createResolvedComponentsForTestWithOtherProfile(3);

        // Check that the "Other Profile" activity is put in the right spot

        onView(withId(R.id.profile_button)).check(matches(

                withText(stableCopy.get(0).getResolveInfoAt(0).activityInfo.name)));

        onView(withText(stableCopy.get(1).getResolveInfoAt(0).activityInfo.name))

                .perform(click());

        waitForIdle();
@@ -422,6 +431,9 @@ public class ChooserActivityTest { 


    @Test

    public void hasLastChosenActivityAndOtherProfile() throws Exception {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;



        Intent sendIntent = createSendTextIntent();

        List<ResolvedComponentInfo> resolvedComponentInfos =

                createResolvedComponentsForTestWithOtherProfile(3);
@@ -448,9 +460,6 @@ public class ChooserActivityTest { 
        // Make a stable copy of the components as the original list may be modified

        List<ResolvedComponentInfo> stableCopy =

                createResolvedComponentsForTestWithOtherProfile(3);

        // Check that the "Other Profile" activity is put in the right spot

        onView(withId(R.id.profile_button)).check(matches(

                withText(stableCopy.get(0).getResolveInfoAt(0).activityInfo.name)));

        onView(withText(stableCopy.get(1).getResolveInfoAt(0).activityInfo.name))

                .perform(click());

        waitForIdle();
@@ -1161,6 +1170,123 @@ public class ChooserActivityTest { 
                .getAllValues().get(2).getTaggedData(MetricsEvent.FIELD_RANKED_POSITION), is(-1));

    }



    @Test

    public void testWorkTab_displayedWhenWorkProfileUserAvailable() {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;

        Intent sendIntent = createSendTextIntent();

        sendIntent.setType("TestType");

        markWorkProfileUserAvailable();



        mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test"));

        waitForIdle();



        onView(withId(R.id.tabs)).check(matches(isDisplayed()));

    }



    @Test

    public void testWorkTab_hiddenWhenWorkProfileUserNotAvailable() {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;

        Intent sendIntent = createSendTextIntent();

        sendIntent.setType("TestType");



        mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test"));

        waitForIdle();



        onView(withId(R.id.tabs)).check(matches(not(isDisplayed())));

    }



    @Test

    public void testWorkTab_eachTabUsesExpectedAdapter() {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;

        int personalProfileTargets = 3;

        List<ResolvedComponentInfo> personalResolvedComponentInfos =

                createResolvedComponentsForTest(personalProfileTargets);

        int workProfileTargets = 4;

        List<ResolvedComponentInfo> workResolvedComponentInfos = createResolvedComponentsForTest(

                workProfileTargets);

        when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),

                Mockito.anyBoolean(),

                Mockito.isA(List.class))).thenReturn(personalResolvedComponentInfos);

        when(sOverrides.workResolverListController.getResolversForIntent(Mockito.anyBoolean(),

                Mockito.anyBoolean(),

                Mockito.isA(List.class))).thenReturn(workResolvedComponentInfos);

        Intent sendIntent = createSendTextIntent();

        sendIntent.setType("TestType");

        markWorkProfileUserAvailable();



        final ChooserWrapperActivity activity =

                mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test"));

        waitForIdle();



        assertThat(activity.getCurrentUserHandle().getIdentifier(), is(0));

        // The work list adapter must only be filled when we open the work tab

        assertThat(activity.getWorkListAdapter().getCount(), is(0));

        onView(withText(R.string.resolver_work_tab)).perform(click());

        assertThat(activity.getCurrentUserHandle().getIdentifier(), is(10));

        assertThat(activity.getPersonalListAdapter().getCount(), is(personalProfileTargets));

        assertThat(activity.getWorkListAdapter().getCount(), is(workProfileTargets));

    }



    @Test

    public void testWorkTab_workProfileHasExpectedNumberOfTargets() {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;

        markWorkProfileUserAvailable();

        int workProfileTargets = 4;

        List<ResolvedComponentInfo> workResolvedComponentInfos =

                createResolvedComponentsForTest(workProfileTargets);

        when(sOverrides.workResolverListController.getResolversForIntent(Mockito.anyBoolean(),

                Mockito.anyBoolean(),

                Mockito.isA(List.class))).thenReturn(workResolvedComponentInfos);

        Intent sendIntent = createSendTextIntent();

        sendIntent.setType("TestType");



        final ChooserWrapperActivity activity =

                mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test"));

        waitForIdle();

        onView(withText(R.string.resolver_work_tab)).perform(click());

        waitForIdle();



        assertThat(activity.getWorkListAdapter().getCount(), is(workProfileTargets));

    }



    @Ignore // b/148156663

    @Test

    public void testWorkTab_selectingWorkTabAppOpensAppInWorkProfile() throws InterruptedException {

        // enable the work tab feature flag

        ResolverActivity.ENABLE_TABBED_VIEW = true;

        markWorkProfileUserAvailable();

        int workProfileTargets = 4;

        List<ResolvedComponentInfo> workResolvedComponentInfos =

                createResolvedComponentsForTest(workProfileTargets);

        when(sOverrides.workResolverListController.getResolversForIntent(Mockito.anyBoolean(),

                Mockito.anyBoolean(),

                Mockito.isA(List.class))).thenReturn(workResolvedComponentInfos);

        Intent sendIntent = createSendTextIntent();

        sendIntent.setType("TestType");

        ResolveInfo[] chosen = new ResolveInfo[1];

        sOverrides.onSafelyStartCallback = targetInfo -> {

            chosen[0] = targetInfo.getResolveInfo();

            return true;

        };



        mActivityRule.launchActivity(Intent.createChooser(sendIntent, "work tab test"));

        waitForIdle();

        onView(withText(R.string.resolver_work_tab)).perform(click());

        waitForIdle();

        // wait for the share sheet to expand

        Thread.sleep(ChooserActivity.LIST_VIEW_UPDATE_INTERVAL_IN_MILLIS);



        onView(first(withText(workResolvedComponentInfos.get(0)

                .getResolveInfoAt(0).activityInfo.applicationInfo.name)))

                .perform(click());

        waitForIdle();

        assertThat(chosen[0], is(workResolvedComponentInfos.get(0).getResolveInfoAt(0)));

    }



    private Intent createSendTextIntent() {

        Intent sendIntent = new Intent();

        sendIntent.setAction(Intent.ACTION_SEND);
@@ -1224,6 +1350,15 @@ public class ChooserActivityTest { 
        return infoList;

    }



    private List<ResolvedComponentInfo> createResolvedComponentsForTestWithUserId(

            int numberOfResults, int userId) {

        List<ResolvedComponentInfo> infoList = new ArrayList<>(numberOfResults);

        for (int i = 0; i < numberOfResults; i++) {

            infoList.add(ResolverDataProvider.createResolvedComponentInfoWithOtherId(i, userId));

        }

        return infoList;

    }



    private List<ChooserTarget> createDirectShareTargets(int numberOfResults, String packageName) {

        Icon icon = Icon.createWithBitmap(createBitmap());

        String testTitle = "testTitle";
@@ -1308,4 +1443,8 @@ public class ChooserActivityTest { 
            assertEquals(cn.flattenToString(), ct.getComponentName().flattenToString());

        }

    }



    private void markWorkProfileUserAvailable() {

        sOverrides.workProfileUserHandle = UserHandle.of(10);

    }

}

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

+34 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.app;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import android.annotation.Nullable;

import android.app.usage.UsageStatsManager;
@@ -29,6 +30,7 @@ import android.content.res.Resources; 
import android.database.Cursor;

import android.graphics.Bitmap;

import android.net.Uri;

import android.os.Bundle;

import android.os.UserHandle;

import android.util.Size;
@@ -51,6 +53,19 @@ public class ChooserWrapperActivity extends ChooserActivity { 
        return mChooserMultiProfilePagerAdapter.getActiveListAdapter();

    }



    ChooserListAdapter getPersonalListAdapter() {

        return ((ChooserGridAdapter) mMultiProfilePagerAdapter.getAdapterForIndex(0))

                .getListAdapter();

    }



    ChooserListAdapter getWorkListAdapter() {

        if (mMultiProfilePagerAdapter.getInactiveListAdapter() == null) {

            return null;

        }

        return ((ChooserGridAdapter) mMultiProfilePagerAdapter.getAdapterForIndex(1))

                .getListAdapter();

    }



    boolean getIsSelected() { return mIsSuccessfullySelected; }



    UsageStatsManager getUsageStatsManager() {
@@ -79,8 +94,13 @@ public class ChooserWrapperActivity extends ChooserActivity { 


    @Override

    protected ResolverListController createListController(UserHandle userHandle) {

        if (userHandle == UserHandle.SYSTEM) {

            when(sOverrides.resolverListController.getUserHandle()).thenReturn(UserHandle.SYSTEM);

            return sOverrides.resolverListController;

        }

        when(sOverrides.workResolverListController.getUserHandle()).thenReturn(userHandle);

        return sOverrides.workResolverListController;

    }



    @Override

    public PackageManager getPackageManager() {
@@ -144,6 +164,15 @@ public class ChooserWrapperActivity extends ChooserActivity { 
                resolveInfoPresentationGetter);

    }



    @Override

    protected UserHandle getWorkProfileUserHandle() {

        return sOverrides.workProfileUserHandle;

    }



    protected UserHandle getCurrentUserHandle() {

        return mMultiProfilePagerAdapter.getCurrentUserHandle();

    }



    /**

     * We cannot directly mock the activity created since instrumentation creates it.

     * <p>
@@ -154,6 +183,7 @@ public class ChooserWrapperActivity extends ChooserActivity { 
        public Function<PackageManager, PackageManager> createPackageManager;

        public Function<TargetInfo, Boolean> onSafelyStartCallback;

        public ResolverListController resolverListController;

        public ResolverListController workResolverListController;

        public Boolean isVoiceInteraction;

        public boolean isImageType;

        public Cursor resolverCursor;
@@ -162,6 +192,7 @@ public class ChooserWrapperActivity extends ChooserActivity { 
        public MetricsLogger metricsLogger;

        public int alternateProfileSetting;

        public Resources resources;

        public UserHandle workProfileUserHandle;



        public void reset() {

            onSafelyStartCallback = null;
@@ -172,9 +203,11 @@ public class ChooserWrapperActivity extends ChooserActivity { 
            resolverCursor = null;

            resolverForceException = false;

            resolverListController = mock(ResolverListController.class);

            workResolverListController = mock(ResolverListController.class);

            metricsLogger = mock(MetricsLogger.class);

            alternateProfileSetting = 0;

            resources = null;

            workProfileUserHandle = null;

        }

    }

}

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

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.app;



import org.hamcrest.BaseMatcher;

import org.hamcrest.Description;

import org.hamcrest.Matcher;



/**

 * Utils for helping with more customized matching options, for example matching the first

 * occurrence of a set criteria.

 */

public class MatcherUtils {



    /**

     * Returns a {@link Matcher} which only matches the first occurrence of a set criteria.

     */

    static <T> Matcher<T> first(final Matcher<T> matcher) {

        return new BaseMatcher<T>() {

            boolean isFirstMatch = true;



            @Override

            public boolean matches(final Object item) {

                if (isFirstMatch && matcher.matches(item)) {

                    isFirstMatch = false;

                    return true;

                }

                return false;

            }



            @Override

            public void describeTo(final Description description) {

                description.appendText("Returns the first matching item");

            }

        };

    }

}

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

+237 −9

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,12 @@ class ResolverDataProvider { 
                createResolverIntent(i), createResolveInfo(i, USER_SOMEONE_ELSE));

    }



    static ResolverActivity.ResolvedComponentInfo createResolvedComponentInfoWithOtherId(int i,

            int userId) {

        return new ResolverActivity.ResolvedComponentInfo(createComponentName(i),

                createResolverIntent(i), createResolveInfo(i, userId));

    }



    static ComponentName createComponentName(int i) {

        final String name = "component" + i;

        return new ComponentName("foo.bar." + name, name);