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

Commit 679e6fd8 authored by Hall Liu's avatar Hall Liu
Browse files

Fix tests 

Broke some tests in cloud unintentionally. Adding a when..thenReturn to
fix them.

Bug: 80082746
Test: run unit tests
Change-Id: I70d0faebe581fe480a8461bb63157e84d41bab81
parent 8cf65743

tests/src/com/android/server/telecom/tests/BluetoothRouteManagerTest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ import java.util.Arrays; 
import java.util.Objects;

import java.util.Objects;





import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Matchers.eq;

import static org.mockito.Matchers.eq;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atLeast;
@@ -130,6 +131,8 @@ public class BluetoothRouteManagerTest extends TelecomTestCase { 
        when(mDeviceManager.getNumConnectedDevices()).thenReturn(devices.length);

        when(mDeviceManager.getNumConnectedDevices()).thenReturn(devices.length);

        when(mDeviceManager.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mDeviceManager.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mHeadsetProxy.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mHeadsetProxy.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mHeadsetProxy.getAudioState(any(BluetoothDevice.class)))

                .thenReturn(BluetoothHeadset.STATE_AUDIO_DISCONNECTED);

        if (activeDevice != null) {

        if (activeDevice != null) {

            when(mHeadsetProxy.getAudioState(eq(activeDevice)))

            when(mHeadsetProxy.getAudioState(eq(activeDevice)))

                    .thenReturn(BluetoothHeadset.STATE_AUDIO_CONNECTED);

                    .thenReturn(BluetoothHeadset.STATE_AUDIO_CONNECTED);

tests/src/com/android/server/telecom/tests/BluetoothRouteTransitionTests.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import static com.android.server.telecom.tests.BluetoothRouteManagerTest.DEVICE2 
import static com.android.server.telecom.tests.BluetoothRouteManagerTest.DEVICE3;

import static com.android.server.telecom.tests.BluetoothRouteManagerTest.DEVICE3;

import static com.android.server.telecom.tests.BluetoothRouteManagerTest.executeRoutingAction;

import static com.android.server.telecom.tests.BluetoothRouteManagerTest.executeRoutingAction;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doAnswer;
@@ -306,6 +307,8 @@ public class BluetoothRouteTransitionTests extends TelecomTestCase { 
        when(mDeviceManager.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mDeviceManager.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mHeadsetProxy.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mHeadsetProxy.getConnectedDevices()).thenReturn(Arrays.asList(devices));

        when(mHeadsetProxy.getActiveDevice()).thenReturn(activeDevice);

        when(mHeadsetProxy.getActiveDevice()).thenReturn(activeDevice);

        when(mHeadsetProxy.getAudioState(any(BluetoothDevice.class)))

                .thenReturn(BluetoothHeadset.STATE_AUDIO_DISCONNECTED);

        if (audioOnDevice != null) {

        if (audioOnDevice != null) {

            when(mHeadsetProxy.getAudioState(eq(audioOnDevice)))

            when(mHeadsetProxy.getAudioState(eq(audioOnDevice)))

                    .thenReturn(BluetoothHeadset.STATE_AUDIO_CONNECTED);

                    .thenReturn(BluetoothHeadset.STATE_AUDIO_CONNECTED);