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

Commit 9198c4fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use TestUtils for setting mock AdapterService" into tm-qpr-dev

parents 3c28736c c1cdae79

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