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

Commit 52d28d7e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use TestUtils for setting mock AdapterService" into tm-qpr-dev am: 9198c4fd 

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



Change-Id: Ifa818b0c1964138835eea0abebe511c93a635b03
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84853bc2 9198c4fd

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −7
Original line number Diff line number Diff line
@@ -247,13 +247,7 @@ public class AdapterService extends Service { 
        return sAdapterService;

    }



    /**

     * Sets AdapterService for testing.

     *

     * @hide

     */

    @VisibleForTesting

    public static synchronized void setAdapterService(AdapterService instance) {

    private static synchronized void setAdapterService(AdapterService instance) {

        Log.d(TAG, "setAdapterService() - trying to set service to " + instance);

        if (instance == null) {

            return;

android/app/tests/unit/src/com/android/bluetooth/hfpclient/HfpNativeInterfaceTest.java

+4 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import com.android.bluetooth.TestUtils;

import com.android.bluetooth.btservice.AdapterService;



import org.junit.After;
@@ -45,14 +46,14 @@ public class HfpNativeInterfaceTest { 
        MockitoAnnotations.initMocks(this);

        when(mService.isAvailable()).thenReturn(true);

        HeadsetClientService.setHeadsetClientService(mService);

        AdapterService.setAdapterService(mAdapterService);

        TestUtils.setAdapterService(mAdapterService);

        mNativeInterface = NativeInterface.getInstance();

    }



    @After

    public void tearDown() {

    public void tearDown() throws Exception {

        HeadsetClientService.setHeadsetClientService(null);

        AdapterService.setAdapterService(null);

        TestUtils.clearAdapterService(mAdapterService);

    }



    @Test

android/app/tests/unit/src/com/android/bluetooth/hid/HidDeviceNativeInterfaceTest.java

+4 −3
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; 


import android.bluetooth.BluetoothHidDevice;



import com.android.bluetooth.TestUtils;

import com.android.bluetooth.btservice.AdapterService;



import org.junit.After;
@@ -47,14 +48,14 @@ public class HidDeviceNativeInterfaceTest { 
        MockitoAnnotations.initMocks(this);

        when(mService.isAvailable()).thenReturn(true);

        HidDeviceService.setHidDeviceService(mService);

        AdapterService.setAdapterService(mAdapterService);

        TestUtils.setAdapterService(mAdapterService);

        mNativeInterface = HidDeviceNativeInterface.getInstance();

    }



    @After

    public void tearDown() {

    public void tearDown() throws Exception {

        HidDeviceService.setHidDeviceService(null);

        AdapterService.setAdapterService(null);

        TestUtils.clearAdapterService(mAdapterService);

    }



    @Test