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

Commit 57c43b09 authored by Michal Belusiak's avatar Michal Belusiak Committed by Gerrit Code Review
Browse files

Merge "ActiveDeviceManagerTest: Remove unnecessary setting mock behavior" into main

parents 9e1f4702 7b9618af

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

+0 −25
Original line number Diff line number Diff line
@@ -599,8 +599,6 @@ public class ActiveDeviceManagerTest { 
        connectedHearingAidDevices.add(mHearingAidDevice);

        connectedHearingAidDevices.add(mSecondaryAudioDevice);

        when(mHearingAidService.getHiSyncId(mSecondaryAudioDevice)).thenReturn(mHearingAidHiSyncId);

        when(mHearingAidService.getConnectedPeerDevices(mHearingAidHiSyncId))

                .thenReturn(connectedHearingAidDevices);



        hearingAidConnected(mHearingAidDevice);

        hearingAidConnected(mSecondaryAudioDevice);
@@ -678,7 +676,6 @@ public class ActiveDeviceManagerTest { 
    /** One LE Audio is connected. */

    @Test

    public void onlyLeAudioConnected_setHeadsetActive() {

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);

        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);

    }
@@ -694,7 +691,6 @@ public class ActiveDeviceManagerTest { 
    /** Two LE Audio are connected. Should set the second one active. */

    @Test

    public void secondLeAudioConnected_setSecondLeAudioActive() {

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);

        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -705,7 +701,6 @@ public class ActiveDeviceManagerTest { 
    /** One LE Audio is connected and disconnected later. Should then set active device to null. */

    @Test

    public void lastLeAudioDisconnected_clearLeAudioActive() {

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);

        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -716,7 +711,6 @@ public class ActiveDeviceManagerTest { 
    /** Two LE Audio are connected and active device is explicitly set. */

    @Test

    public void leAudioActiveDeviceSelected_setActive() {

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);

        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -829,7 +823,6 @@ public class ActiveDeviceManagerTest { 
    @Test

    public void leAudioSetConnectedThenNotActiveOneDisconnected_noFallback() {

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -854,7 +847,6 @@ public class ActiveDeviceManagerTest { 
    @Test

    public void leAudioSetConnectedThenActiveOneDisconnected_noFallback() {

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -882,7 +874,6 @@ public class ActiveDeviceManagerTest { 
    @Test

    public void leAudioSetConnectedThenActiveOneDisconnected_hasFallback() {

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -903,7 +894,6 @@ public class ActiveDeviceManagerTest { 
        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);



        leAudioConnected(mLeAudioDevice);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -939,8 +929,6 @@ public class ActiveDeviceManagerTest { 
        a2dpConnected(mA2dpDevice, false);

        verify(mA2dpService, timeout(TIMEOUT_MS)).setActiveDevice(mA2dpDevice);



        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        leAudioConnected(mLeAudioDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeAudioDevice);
@@ -981,10 +969,6 @@ public class ActiveDeviceManagerTest { 
    @Test

    public void activeDeviceDisconnected_fallbackToHearingAid() {

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);

        when(mA2dpService.setActiveDevice(any())).thenReturn(true);

        when(mLeAudioService.setActiveDevice(any())).thenReturn(true);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);

        when(mHearingAidService.setActiveDevice(any())).thenReturn(true);

        when(mHearingAidService.removeActiveDevice(anyBoolean())).thenReturn(true);



        hearingAidConnected(mHearingAidDevice);
@@ -1011,8 +995,6 @@ public class ActiveDeviceManagerTest { 
        leHearingAidConnected(mLeHearingAidDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());



        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        verify(mLeAudioService, never()).setActiveDevice(mLeHearingAidDevice);



        leAudioConnected(mLeHearingAidDevice);
@@ -1024,8 +1006,6 @@ public class ActiveDeviceManagerTest { 
    public void leAudioConnectedAfterLeHearingAid_setLeAudioActiveShouldNotBeCalled() {

        leHearingAidConnected(mLeHearingAidDevice);



        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        leAudioConnected(mLeHearingAidDevice);

        verify(mLeAudioService, timeout(TIMEOUT_MS)).setActiveDevice(mLeHearingAidDevice);
@@ -1042,7 +1022,6 @@ public class ActiveDeviceManagerTest { 
    public void activeDeviceChange_withHearingAidLeHearingAidAndA2dpDevices() {

        when(mAudioManager.getMode()).thenReturn(AudioManager.MODE_NORMAL);

        when(mHearingAidService.removeActiveDevice(anyBoolean())).thenReturn(true);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        hearingAidConnected(mHearingAidDevice);

        verify(mHearingAidService, timeout(TIMEOUT_MS)).setActiveDevice(mHearingAidDevice);
@@ -1073,7 +1052,6 @@ public class ActiveDeviceManagerTest { 
    public void dualModeAudioDeviceConnected_withDualModeFeatureDisabled() {

        // Turn off the dual mode audio flag

        Utils.setDualModeAudioStateForTesting(false);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        // Ensure we remove the LEA active device when classic audio profiles are made active

        a2dpConnected(mDualModeAudioDevice, true);
@@ -1117,7 +1095,6 @@ public class ActiveDeviceManagerTest { 
        Assert.assertNull(mActiveDeviceManager.getHfpActiveDevice());



        when(mLeAudioService.setActiveDevice(any())).thenReturn(true);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);

        when(mLeAudioService.removeActiveDevice(anyBoolean())).thenReturn(true);

        when(mLeAudioService.getLeadDevice(mDualModeAudioDevice)).thenReturn(mDualModeAudioDevice);
@@ -1159,7 +1136,6 @@ public class ActiveDeviceManagerTest { 
        when(mA2dpService.setActiveDevice(any())).thenReturn(false);

        when(mHearingAidService.setActiveDevice(any())).thenReturn(false);

        when(mLeAudioService.setActiveDevice(any())).thenReturn(false);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);



        leAudioConnected(mDualModeAudioDevice);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());
@@ -1298,7 +1274,6 @@ public class ActiveDeviceManagerTest { 
        mSetFlagsRule.enableFlags(Flags.FLAG_LEAUDIO_BROADCAST_AUDIO_HANDOVER_POLICIES);

        final List<BluetoothLeBroadcastMetadata> metadataList = mock(List.class);

        when(mLeAudioService.getAllBroadcastMetadata()).thenReturn(metadataList);

        when(mLeAudioService.isGroupAvailableForStream(anyInt())).thenReturn(true);

        leHearingAidConnected(mLeHearingAidDevice);

        verify(mLeAudioService, never()).setActiveDevice(any());

    }