From 8c8b67fe59f2d87de92d0116703c61529194b5c2 Mon Sep 17 00:00:00 2001 From: Tim Peng Date: Thu, 29 Jul 2021 09:17:48 +0000 Subject: [PATCH] Fix SettingsLib test cases -Update test cases according to ag/14909662 Bug: 194743689 Test: make -j50 RunSettingsLibRoboTests ROBOTEST_FILTER=InfoMediaManagerTest Change-Id: Iebdf4b7610bf065bfe45442956bc6ea1197308fb --- .../media/InfoMediaManagerTest.java | 18 +++++++----------- .../testutils/shadow/ShadowRouter2Manager.java | 9 +++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java index 58ca734683164..0d03f33eadd4e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java @@ -27,7 +27,6 @@ import static android.media.MediaRoute2ProviderService.REASON_UNKNOWN_ERROR; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -108,7 +107,7 @@ public class InfoMediaManagerTest { final List routes = new ArrayList<>(); routes.add(info); - mShadowRouter2Manager.setAvailableRoutes(routes); + mShadowRouter2Manager.setTransferableRoutes(routes); final MediaDevice mediaDevice = mInfoMediaManager.findMediaDevice(TEST_ID); assertThat(mediaDevice).isNull(); @@ -159,7 +158,7 @@ public class InfoMediaManagerTest { final List routes = new ArrayList<>(); routes.add(info); - mShadowRouter2Manager.setAvailableRoutes(routes); + mShadowRouter2Manager.setTransferableRoutes(routes); final MediaDevice mediaDevice = mInfoMediaManager.findMediaDevice(TEST_ID); assertThat(mediaDevice).isNull(); @@ -195,7 +194,7 @@ public class InfoMediaManagerTest { final List routes = new ArrayList<>(); routes.add(info); - mShadowRouter2Manager.setAvailableRoutes(routes); + mShadowRouter2Manager.setTransferableRoutes(routes); final MediaDevice mediaDevice = mInfoMediaManager.findMediaDevice(TEST_ID); assertThat(mediaDevice).isNull(); @@ -618,7 +617,7 @@ public class InfoMediaManagerTest { final List routes = new ArrayList<>(); routes.add(info); - mShadowRouter2Manager.setAvailableRoutes(routes); + mShadowRouter2Manager.setTransferableRoutes(routes); final MediaDevice mediaDevice = mInfoMediaManager.findMediaDevice(TEST_ID); assertThat(mediaDevice).isNull(); @@ -728,9 +727,8 @@ public class InfoMediaManagerTest { final MediaRoute2Info info = mock(MediaRoute2Info.class); final List infos = new ArrayList<>(); infos.add(info); - mShadowRouter2Manager.setAvailableRoutes(infos); + mShadowRouter2Manager.setTransferableRoutes(infos); - when(mRouterManager.getAvailableRoutes(anyString())).thenReturn(infos); when(info.getType()).thenReturn(TYPE_REMOTE_SPEAKER); assertThat(mInfoMediaManager.shouldDisableMediaOutput("test")).isTrue(); @@ -741,9 +739,8 @@ public class InfoMediaManagerTest { final MediaRoute2Info info = mock(MediaRoute2Info.class); final List infos = new ArrayList<>(); infos.add(info); - mShadowRouter2Manager.setAvailableRoutes(infos); + mShadowRouter2Manager.setTransferableRoutes(infos); - when(mRouterManager.getAvailableRoutes(anyString())).thenReturn(infos); when(info.getType()).thenReturn(TYPE_BUILTIN_SPEAKER); assertThat(mInfoMediaManager.shouldDisableMediaOutput("test")).isFalse(); @@ -757,9 +754,8 @@ public class InfoMediaManagerTest { final List infos = new ArrayList<>(); infos.add(info); infos.add(info2); - mShadowRouter2Manager.setAvailableRoutes(infos); + mShadowRouter2Manager.setTransferableRoutes(infos); - when(mRouterManager.getAvailableRoutes(anyString())).thenReturn(infos); when(info.getType()).thenReturn(TYPE_REMOTE_SPEAKER); when(info2.getType()).thenReturn(TYPE_REMOTE_SPEAKER); diff --git a/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowRouter2Manager.java b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowRouter2Manager.java index 5bb550053a12a..595986339343f 100644 --- a/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowRouter2Manager.java +++ b/packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowRouter2Manager.java @@ -85,4 +85,13 @@ public class ShadowRouter2Manager { return (ShadowRouter2Manager) Shadow.extract( MediaRouter2Manager.getInstance(RuntimeEnvironment.application)); } + + @Implementation + protected List getTransferableRoutes(String packageName) { + return mAvailableRoutes; + } + + public void setTransferableRoutes(List infos) { + mAvailableRoutes = infos; + } }