PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Fix MobileNetworkActivity test case am: 2fad549b08

Browse Source 
Change-Id: I31a8f50caf0c783d659eb9fbbe49261bdd5590fe
This commit is contained in:
Automerger Merge Worker
2020-03-16 09:46:47 +00:00
parent fa49765db7 2fad549b08
commit 9c6921cfb7
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
View File

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