diff options
author | Joseph Pirozzo <pirozzoj@google.com> | 2021-02-23 22:47:10 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 22:47:10 +0000 |
commit | 7eeb7d3d8c152ddbb494fb230d763ea73f58d9a3 (patch) | |
tree | 9c55006690e8746211683b9eb36b5a4e841a9c5b | |
parent | bbf5a5b32ba1f83b4d2718b6d7eef9fb2662435f (diff) | |
parent | 8bb7103c0ebd8336fe85259e391bdb745249f9f0 (diff) | |
download | Messenger-7eeb7d3d8c152ddbb494fb230d763ea73f58d9a3.tar.gz |
Merge "CarMessenger Test update" am: be4ed9889b am: 8bb7103c0e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Car/Messenger/+/1585188
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id78f9588c5dfe9b29da2e99dc38c6b61c3380c1c
-rw-r--r-- | tests/robotests/src/com/android/car/messenger/bluetooth/BluetoothHelperTest.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/robotests/src/com/android/car/messenger/bluetooth/BluetoothHelperTest.java b/tests/robotests/src/com/android/car/messenger/bluetooth/BluetoothHelperTest.java index 711d8e0..7e9e9ac 100644 --- a/tests/robotests/src/com/android/car/messenger/bluetooth/BluetoothHelperTest.java +++ b/tests/robotests/src/com/android/car/messenger/bluetooth/BluetoothHelperTest.java @@ -35,7 +35,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadow.api.Shadow; @@ -50,7 +53,6 @@ public class BluetoothHelperTest { private static final String BLUETOOTH_ADDRESS_ONE = "FA:F8:14:CA:32:39"; private static final String BLUETOOTH_ADDRESS_TWO = "FA:F8:33:44:32:39"; - @Mock private BluetoothMapClient mMockMapClient; @Mock private BluetoothDevice mMockDeviceOne; @@ -59,10 +61,15 @@ public class BluetoothHelperTest { @Before public void setUp() { + Answer returnTrue = new Answer() { + public Object answer(InvocationOnMock invocation) { + return true; + } + }; MockitoAnnotations.initMocks(this); when(mMockDeviceOne.getAddress()).thenReturn(BLUETOOTH_ADDRESS_ONE); when(mMockDeviceTwo.getAddress()).thenReturn(BLUETOOTH_ADDRESS_TWO); - when(mMockMapClient.sendMessage(any(), any(), any(), any(), any())).thenReturn(true); + mMockMapClient = Mockito.mock(BluetoothMapClient.class, returnTrue); BluetoothAdapter.getDefaultAdapter().enable(); } |