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

Commit a1324961 authored by Yuyang Huang's avatar Yuyang Huang Committed by Gerrit Code Review
Browse files

Merge "Change when().thenReturn() to doReturn().when() to reduce test flakiness" into main

parents 8235482a de9c7ebc

android/app/tests/unit/src/com/android/bluetooth/hfp/HeadsetStateMachineTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -116,8 +116,8 @@ public class HeadsetStateMachineTest { 
        MockitoAnnotations.initMocks(this);

        MockitoAnnotations.initMocks(this);

        TestUtils.setAdapterService(mAdapterService);

        TestUtils.setAdapterService(mAdapterService);

        // Stub system interface

        // Stub system interface

        when(mSystemInterface.getHeadsetPhoneState()).thenReturn(mPhoneState);

        doReturn(mPhoneState).when(mSystemInterface).getHeadsetPhoneState();

        when(mSystemInterface.getAudioManager()).thenReturn(mAudioManager);

        doReturn(mAudioManager).when(mSystemInterface).getAudioManager();

        // This line must be called to make sure relevant objects are initialized properly

        // This line must be called to make sure relevant objects are initialized properly

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        // Get a device for testing

        // Get a device for testing