From 2353147905418eaa5877e79af38ee3c7fbd5aeeb Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Tue, 8 Feb 2022 17:23:35 +0800 Subject: [PATCH] [Settings] Fix the test fail in robo tests Bug: 215047192 Test: make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest Change-Id: Iea894d989a3f255085cbf280619e28b65553658a --- .../MobileNetworkSummaryControllerTest.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java index fc6481b8cc4..dcf086c68fb 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java @@ -44,6 +44,8 @@ import androidx.lifecycle.Lifecycle; import androidx.preference.PreferenceScreen; import com.android.settings.Settings.MobileNetworkActivity; +import com.android.settings.network.helper.SubscriptionAnnotation; +import com.android.settings.network.helper.SubscriptionGrouping; import com.android.settings.widget.AddPreference; import com.android.settingslib.RestrictedLockUtils; @@ -123,7 +125,6 @@ public class MobileNetworkSummaryControllerTest { @Test - @Ignore public void getSummary_noSubscriptions_correctSummaryAndClickHandler() { mController.displayPreference(mPreferenceScreen); mController.onResume(); @@ -211,23 +212,6 @@ public class MobileNetworkSummaryControllerTest { SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isEqualTo(sub1.getSubscriptionId()); } - @Test - @Ignore - public void getSummary_providerModel_Enabled() { - final SubscriptionInfo sub1 = mock(SubscriptionInfo.class); - final SubscriptionInfo sub2 = mock(SubscriptionInfo.class); - when(sub1.getSubscriptionId()).thenReturn(1); - when(sub2.getSubscriptionId()).thenReturn(2); - when(sub1.getDisplayName()).thenReturn("sub1"); - when(sub2.getDisplayName()).thenReturn("sub2"); - - SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - mController.displayPreference(mPreferenceScreen); - mController.onResume(); - assertThat(mController.getSummary()).isEqualTo("sub1, sub2"); - } - @Test public void addButton_noSubscriptionsNoEuiccMgr_noAddClickListener() { when(mEuiccManager.isEnabled()).thenReturn(false); @@ -319,7 +303,6 @@ public class MobileNetworkSummaryControllerTest { } @Test - @Ignore public void onAirplaneModeChanged_oneSubscriptionAirplaneModeGetsTurnedOn_isDisabled() { final SubscriptionInfo sub1 = mock(SubscriptionInfo.class); SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1));