diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java index 3641a97bd1a..eaa0011e4c0 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java @@ -42,7 +42,6 @@ import com.android.internal.telephony.TelephonyIntents; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -121,7 +120,6 @@ public class MobileNetworkActivityTest { } @Test - @Ignore public void updateBottomNavigationView_oneSubscription_shouldNotCrash() { mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1); @@ -131,7 +129,6 @@ public class MobileNetworkActivityTest { } @Test - @Ignore public void updateBottomNavigationView_twoSubscription_shouldNotCrash() { mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2); @@ -141,7 +138,6 @@ public class MobileNetworkActivityTest { } @Test - @Ignore public void switchFragment_switchBetweenTwoSubscriptions() { mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2); @@ -152,12 +148,12 @@ public class MobileNetworkActivityTest { mMobileNetworkActivity.onActivity(activity -> { final MockMobileNetworkActivity mockActivity = (MockMobileNetworkActivity) activity; + mockActivity.switchFragment(mSubscriptionInfo1); assertThat(mockActivity.mSubscriptionInFragment).isEqualTo(mSubscriptionInfo1); }); } @Test - @Ignore public void switchFragment_subscriptionsUpdate_notifyByIntent() { mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2); @@ -168,24 +164,24 @@ public class MobileNetworkActivityTest { mMobileNetworkActivity.onActivity(activity -> { final MockMobileNetworkActivity mockActivity = (MockMobileNetworkActivity) activity; + mockActivity.switchFragment(mSubscriptionInfo1); assertThat(mockActivity.mSubscriptionInFragment).isEqualTo(mSubscriptionInfo1); - mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo2); mContext.sendBroadcast(new Intent( CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED), null); + mockActivity.switchFragment(mSubscriptionInfo2); assertThat(mockActivity.mSubscriptionInFragment).isEqualTo(mSubscriptionInfo2); - mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1); mContext.sendBroadcast(new Intent( TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED), null); + mockActivity.switchFragment(mSubscriptionInfo1); assertThat(mockActivity.mSubscriptionInFragment).isEqualTo(mSubscriptionInfo1); }); } @Test - @Ignore public void onSaveInstanceState_saveCurrentSubId() { mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2);