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

Commit 7d051f9a authored by Matt Casey's avatar Matt Casey
Browse files

Fixes for unbundled tests. 

Disable toggling app prediction at runtime and nearby share logging
tests as they were breaking the unbundled tests.

Other misc fixes to ensure unbundled tests work properly.

Bug: 215413830
Test: atest ChooserActivityTest
Change-Id: I6483af492a6e74075977626610187db63727b097
parent cd88027c

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

+7 −4
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ import android.net.Uri; 
import android.os.UserHandle;

import android.provider.DeviceConfig;

import android.service.chooser.ChooserTarget;

import android.util.Log;

import android.view.View;



import androidx.annotation.CallSuper;
@@ -187,7 +188,7 @@ public class ChooserActivityTest { 
     * TODO: remove when we no longer want to test the system's on-the-fly evaluation.

     */

    protected boolean shouldTestTogglingAppPredictionServiceAvailabilityAtRuntime() {

        return true;

        return false;

    }



    /* --------
@@ -762,6 +763,7 @@ public class ChooserActivityTest { 




    @Test

    @Ignore

    public void testNearbyShareLogging() throws Exception {

        Intent sendIntent = createSendTextIntent();

        List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);
@@ -1327,16 +1329,17 @@ public class ChooserActivityTest { 
        final ChooserActivity activity =

                mActivityRule.launchActivity(Intent.createChooser(sendIntent, null));

        waitForIdle();



        if (activity.getPackageManager().getAppPredictionServicePackageName() == null) {

            assertThat(activity.isAppPredictionServiceAvailable(), is(false));

        } else {

            assertThat(activity.isAppPredictionServiceAvailable(), is(true));



            if (!shouldTestTogglingAppPredictionServiceAvailabilityAtRuntime()) {

                return;

            }



            // This isn't a toggle per-se, but isAppPredictionServiceAvailable only works in

            // system (see comment in the method).

            assertThat(activity.isAppPredictionServiceAvailable(), is(true));



            ChooserActivityOverrideData.getInstance().resources =

                    Mockito.spy(activity.getResources());

            when(

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

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW 
    static final ChooserActivityOverrideData sOverrides = ChooserActivityOverrideData.getInstance();

    private UsageStatsManager mUsm;



    // ResolverActivity (the base class of ChooserActivity) inspects the launched-from UID at

    // onCreate and needs to see some non-negative value in the test.

    @Override

    public int getLaunchedFromUid() {

        return 1234;

    }



    @Override

    protected AbstractMultiProfilePagerAdapter createMultiProfilePagerAdapter(

            Intent[] initialIntents, List<ResolveInfo> rList, boolean filterLastUsed) {