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

Commit 8dfc9d1c authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Fix tests broken by PermissionCheckerManager. 

Simple pass-through to the real instance; no need to mock.

Bug: 190059397
Test: atest BluetoothInstrumentationTests
Change-Id: I637b26897d394adeb21041d8f6d127a51252c319
parent 477128c0

android/app/tests/unit/src/com/android/bluetooth/btservice/AdapterServiceTest.java

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.Process; 
import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.permission.PermissionCheckerManager;

import android.test.mock.MockContentResolver;

import android.util.Log;
@@ -105,6 +106,7 @@ public class AdapterServiceTest { 
            Process.myUid()).build();



    private PowerManager mPowerManager;

    private PermissionCheckerManager mPermissionCheckerManager;

    private PackageManager mMockPackageManager;

    private MockContentResolver mMockContentResolver;

    private HashMap<String, HashMap<String, String>> mAdapterConfig;
@@ -144,6 +146,8 @@ public class AdapterServiceTest { 
        MockitoAnnotations.initMocks(this);

        mPowerManager = (PowerManager) InstrumentationRegistry.getTargetContext()

                .getSystemService(Context.POWER_SERVICE);

        mPermissionCheckerManager = InstrumentationRegistry.getTargetContext()

                .getSystemService(PermissionCheckerManager.class);



        when(mMockContext.getApplicationInfo()).thenReturn(mMockApplicationInfo);

        when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);
@@ -157,6 +161,10 @@ public class AdapterServiceTest { 
        when(mMockContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(

                mMockDevicePolicyManager);

        when(mMockContext.getSystemService(Context.POWER_SERVICE)).thenReturn(mPowerManager);

        when(mMockContext.getSystemServiceName(PermissionCheckerManager.class))

                .thenReturn(Context.PERMISSION_CHECKER_SERVICE);

        when(mMockContext.getSystemService(PermissionCheckerManager.class))

                .thenReturn(mPermissionCheckerManager);

        when(mMockContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mMockAlarmManager);

        when(mMockContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);

        when(mMockContext.getAttributionSource()).thenReturn(mAttributionSource);