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

Commit 5318aba4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AdapterService: Fix package name in test" into main am: 797f86c9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2697537



Change-Id: I5a5b369c676121ccf29c13c73bc7f3a03454f226
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6adb5eb2 797f86c9

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

+16 −16
Original line number Diff line number Diff line
@@ -149,7 +149,9 @@ public class AdapterServiceFactoryResetTest { 
        when(mMockPackageManager.getPermissionInfo(any(), anyInt()))

                .thenReturn(new PermissionInfo());



        mMockContentResolver = new MockContentResolver(InstrumentationRegistry.getTargetContext());

        Context targetContext = InstrumentationRegistry.getTargetContext();



        mMockContentResolver = new MockContentResolver(targetContext);

        mMockContentResolver.addProvider(Settings.AUTHORITY, new MockContentProvider() {

            @Override

            public Bundle call(String method, String request, Bundle args) {
@@ -157,8 +159,6 @@ public class AdapterServiceFactoryResetTest { 
            }

        });



        Context targetContext = InstrumentationRegistry.getTargetContext();



        mBluetoothManager = targetContext.getSystemService(BluetoothManager.class);

        mCompanionDeviceManager = targetContext.getSystemService(CompanionDeviceManager.class);

        mDisplayManager = targetContext.getSystemService(DisplayManager.class);
@@ -166,11 +166,9 @@ public class AdapterServiceFactoryResetTest { 
        mPermissionManager = targetContext.getSystemService(PermissionManager.class);

        mPowerManager = targetContext.getSystemService(PowerManager.class);



        when(mMockContext.getCacheDir())

                .thenReturn(InstrumentationRegistry.getTargetContext().getCacheDir());

        when(mMockContext.getUser())

                .thenReturn(InstrumentationRegistry.getTargetContext().getUser());

        when(mMockContext.getPackageName()).thenReturn("com.android.bluetooth");

        when(mMockContext.getCacheDir()).thenReturn(targetContext.getCacheDir());

        when(mMockContext.getUser()).thenReturn(targetContext.getUser());

        when(mMockContext.getPackageName()).thenReturn(targetContext.getPackageName());

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

        when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);

        when(mMockContext.getApplicationContext()).thenReturn(mMockContext);
@@ -206,14 +204,16 @@ public class AdapterServiceFactoryResetTest { 


        when(mMockContext.getSharedPreferences(anyString(), anyInt()))

                .thenReturn(

                        InstrumentationRegistry.getTargetContext()

                                .getSharedPreferences(

                        targetContext.getSharedPreferences(

                                "AdapterServiceTestPrefs", Context.MODE_PRIVATE));



        doAnswer(invocation -> {

        doAnswer(

                invocation -> {

                    Object[] args = invocation.getArguments();

            return InstrumentationRegistry.getTargetContext().getDatabasePath((String) args[0]);

        }).when(mMockContext).getDatabasePath(anyString());

                    return targetContext.getDatabasePath((String) args[0]);

                })

                .when(mMockContext)

                .getDatabasePath(anyString());



        // Sets the foreground user id to match that of the tests (restored in tearDown)

        mForegroundUserId = Utils.getForegroundUserId();

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

+22 −24
Original line number Diff line number Diff line
@@ -137,7 +137,9 @@ public class AdapterServiceRestartTest { 
        when(mMockPackageManager.getPermissionInfo(any(), anyInt()))

                .thenReturn(new PermissionInfo());



        mMockContentResolver = new MockContentResolver(InstrumentationRegistry.getTargetContext());

        Context targetContext = InstrumentationRegistry.getTargetContext();



        mMockContentResolver = new MockContentResolver(targetContext);

        mMockContentResolver.addProvider(Settings.AUTHORITY, new MockContentProvider() {

            @Override

            public Bundle call(String method, String request, Bundle args) {
@@ -145,26 +147,18 @@ public class AdapterServiceRestartTest { 
            }

        });



        mPowerManager = InstrumentationRegistry.getTargetContext()

                .getSystemService(PowerManager.class);

        mPermissionCheckerManager = InstrumentationRegistry.getTargetContext()

                .getSystemService(PermissionCheckerManager.class);

        mPowerManager = targetContext.getSystemService(PowerManager.class);

        mPermissionCheckerManager = targetContext.getSystemService(PermissionCheckerManager.class);



        mPermissionManager = InstrumentationRegistry.getTargetContext()

                .getSystemService(PermissionManager.class);

        mPermissionManager = targetContext.getSystemService(PermissionManager.class);



        mBluetoothManager = InstrumentationRegistry.getTargetContext()

                .getSystemService(BluetoothManager.class);

        mBluetoothManager = targetContext.getSystemService(BluetoothManager.class);



        mCompanionDeviceManager =

                InstrumentationRegistry.getTargetContext()

                        .getSystemService(CompanionDeviceManager.class);

        mCompanionDeviceManager = targetContext.getSystemService(CompanionDeviceManager.class);



        when(mMockContext.getCacheDir()).thenReturn(InstrumentationRegistry.getTargetContext()

                .getCacheDir());

        when(mMockContext.getUser())

                .thenReturn(InstrumentationRegistry.getTargetContext().getUser());

        when(mMockContext.getPackageName()).thenReturn("com.android.bluetooth");

        when(mMockContext.getCacheDir()).thenReturn(targetContext.getCacheDir());

        when(mMockContext.getUser()).thenReturn(targetContext.getUser());

        when(mMockContext.getPackageName()).thenReturn(targetContext.getPackageName());

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

        when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);

        when(mMockContext.getApplicationContext()).thenReturn(mMockContext);
@@ -197,13 +191,17 @@ public class AdapterServiceRestartTest { 
        mockGetSystemService(Context.POWER_SERVICE, PowerManager.class, mPowerManager);



        when(mMockContext.getSharedPreferences(anyString(), anyInt()))

                .thenReturn(InstrumentationRegistry.getTargetContext()

                        .getSharedPreferences("AdapterServiceTestPrefs", Context.MODE_PRIVATE));

                .thenReturn(

                        targetContext.getSharedPreferences(

                                "AdapterServiceTestPrefs", Context.MODE_PRIVATE));



        doAnswer(invocation -> {

        doAnswer(

                invocation -> {

                    Object[] args = invocation.getArguments();

            return InstrumentationRegistry.getTargetContext().getDatabasePath((String) args[0]);

        }).when(mMockContext).getDatabasePath(anyString());

                    return targetContext.getDatabasePath((String) args[0]);

                })

                .when(mMockContext)

                .getDatabasePath(anyString());



        // Sets the foreground user id to match that of the tests (restored in tearDown)

        mForegroundUserId = Utils.getForegroundUserId();

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

+17 −15
Original line number Diff line number Diff line
@@ -242,7 +242,9 @@ public class AdapterServiceTest { 
        when(mMockPackageManager.getPermissionInfo(any(), anyInt()))

                .thenReturn(new PermissionInfo());



        mMockContentResolver = new MockContentResolver(InstrumentationRegistry.getTargetContext());

        Context targetContext = InstrumentationRegistry.getTargetContext();



        mMockContentResolver = new MockContentResolver(targetContext);

        mMockContentResolver.addProvider(Settings.AUTHORITY, new MockContentProvider() {

            @Override

            public Bundle call(String method, String request, Bundle args) {
@@ -250,8 +252,6 @@ public class AdapterServiceTest { 
            }

        });



        Context targetContext = InstrumentationRegistry.getTargetContext();



        mBluetoothManager = targetContext.getSystemService(BluetoothManager.class);

        mCompanionDeviceManager = targetContext.getSystemService(CompanionDeviceManager.class);

        mDisplayManager = targetContext.getSystemService(DisplayManager.class);
@@ -259,11 +259,9 @@ public class AdapterServiceTest { 
        mPermissionManager = targetContext.getSystemService(PermissionManager.class);

        mPowerManager = targetContext.getSystemService(PowerManager.class);



        when(mMockContext.getCacheDir()).thenReturn(InstrumentationRegistry.getTargetContext()

                .getCacheDir());

        when(mMockContext.getUser())

                .thenReturn(InstrumentationRegistry.getTargetContext().getUser());

        when(mMockContext.getPackageName()).thenReturn("com.android.bluetooth");

        when(mMockContext.getCacheDir()).thenReturn(targetContext.getCacheDir());

        when(mMockContext.getUser()).thenReturn(targetContext.getUser());

        when(mMockContext.getPackageName()).thenReturn(targetContext.getPackageName());

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

        when(mMockContext.getContentResolver()).thenReturn(mMockContentResolver);

        when(mMockContext.getApplicationContext()).thenReturn(mMockContext);
@@ -298,13 +296,17 @@ public class AdapterServiceTest { 
        mockGetSystemService(Context.POWER_SERVICE, PowerManager.class, mPowerManager);



        when(mMockContext.getSharedPreferences(anyString(), anyInt()))

                .thenReturn(InstrumentationRegistry.getTargetContext()

                        .getSharedPreferences("AdapterServiceTestPrefs", Context.MODE_PRIVATE));

                .thenReturn(

                        targetContext.getSharedPreferences(

                                "AdapterServiceTestPrefs", Context.MODE_PRIVATE));



        doAnswer(invocation -> {

        doAnswer(

                invocation -> {

                    Object[] args = invocation.getArguments();

            return InstrumentationRegistry.getTargetContext().getDatabasePath((String) args[0]);

        }).when(mMockContext).getDatabasePath(anyString());

                    return targetContext.getDatabasePath((String) args[0]);

                })

                .when(mMockContext)

                .getDatabasePath(anyString());



        // Sets the foreground user id to match that of the tests (restored in tearDown)

        mForegroundUserId = Utils.getForegroundUserId();