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

Commit 550e33b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixes broken Settings test." into udc-dev am: 01c585ed 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419



Change-Id: I2b0bf456f6f494de4f626f93320a0bef8051b6ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6fb097c0 01c585ed

tests/robotests/src/com/android/settings/display/ControlsTrivialPrivacyPreferenceControllerTest.java

+23 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.display; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.atLeastOnce;
@@ -27,6 +28,10 @@ import static org.mockito.Mockito.when; 


import android.content.ContentResolver;

import android.content.Context;

import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.database.Cursor;

import android.database.MatrixCursor;

import android.provider.Settings;
@@ -64,12 +69,16 @@ public class ControlsTrivialPrivacyPreferenceControllerTest { 
    @Mock

    private PreferenceScreen mPreferenceScreen;



    @Mock

    private PackageManager mPackageManager;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        mContext = spy(ApplicationProvider.getApplicationContext());

        mContentResolver = spy(mContext.getContentResolver());

        when(mContext.getContentResolver()).thenReturn(mContentResolver);

        when(mContext.getPackageManager()).thenReturn(mPackageManager);



        setCustomizableLockScreenQuickAffordancesEnabled(false);
@@ -199,5 +208,19 @@ public class ControlsTrivialPrivacyPreferenceControllerTest { 
                            });

                    return cursor;

                });



        if (isEnabled) {

            final ApplicationInfo applicationInfo = new ApplicationInfo();

            applicationInfo.packageName = "package";



            final ActivityInfo activityInfo = new ActivityInfo();

            activityInfo.applicationInfo = applicationInfo;

            activityInfo.name = "activity";



            final ResolveInfo resolveInfo = new ResolveInfo();

            resolveInfo.activityInfo = activityInfo;



            when(mPackageManager.resolveActivity(any(), any())).thenReturn(resolveInfo);

        }

    }

}