From ecea1383c13ba8edb51a52dba2a402e60593de89 Mon Sep 17 00:00:00 2001 From: Vladimir Komsiyski Date: Thu, 23 Mar 2023 16:08:28 +0100 Subject: Add support for more VirtualSensor properties. Bug: 274938312 Test: atest VirtualDeviceManagerServiceTest Test: atest SensorControllerTest Change-Id: Iae0771f41b92ba4b679895e1a4b90e7906f03d20 --- .../com/android/server/companion/virtual/SensorControllerTest.java | 7 +++++-- .../server/companion/virtual/VirtualDeviceManagerServiceTest.java | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'services/tests/servicestests') diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/SensorControllerTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/SensorControllerTest.java index 1259d7189a6d..aea8b8658984 100644 --- a/services/tests/servicestests/src/com/android/server/companion/virtual/SensorControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/companion/virtual/SensorControllerTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import static org.junit.Assert.assertThrows; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyFloat; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; @@ -81,7 +82,8 @@ public class SensorControllerTest { @Test public void createSensor_invalidHandle_throwsException() { doReturn(/* handle= */0).when(mSensorManagerInternalMock).createRuntimeSensor( - anyInt(), anyInt(), anyString(), anyString(), anyInt(), any()); + anyInt(), anyInt(), anyString(), anyString(), anyFloat(), anyFloat(), anyFloat(), + anyInt(), anyInt(), anyInt(), any()); Throwable thrown = assertThrows( RuntimeException.class, @@ -138,7 +140,8 @@ public class SensorControllerTest { private void doCreateSensorSuccessfully() { doReturn(SENSOR_HANDLE).when(mSensorManagerInternalMock).createRuntimeSensor( - anyInt(), anyInt(), anyString(), anyString(), anyInt(), any()); + anyInt(), anyInt(), anyString(), anyString(), anyFloat(), anyFloat(), anyFloat(), + anyInt(), anyInt(), anyInt(), any()); assertThat(mSensorController.createSensor(mSensorToken, mVirtualSensorConfig)) .isEqualTo(SENSOR_HANDLE); } diff --git a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java index 339ccd80c351..a4a3e363ab4d 100644 --- a/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceManagerServiceTest.java @@ -536,7 +536,8 @@ public class VirtualDeviceManagerServiceTest { .build(); doReturn(SENSOR_HANDLE).when(mSensorManagerInternalMock).createRuntimeSensor( - anyInt(), anyInt(), anyString(), anyString(), anyInt(), any()); + anyInt(), anyInt(), anyString(), anyString(), anyFloat(), anyFloat(), anyFloat(), + anyInt(), anyInt(), anyInt(), any()); mDeviceImpl.close(); mDeviceImpl = createVirtualDevice(VIRTUAL_DEVICE_ID_1, DEVICE_OWNER_UID_1, params); -- cgit v1.2.3-59-g8ed1b