Merge "Fix CdmaSystemSelectPreferenceControllerTest" into main (3c32c3e2) · Commits · e / os / android_packages_apps_Settings

tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;

		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;
		@@ -66,6 +65,7 @@ public class CdmaSystemSelectPreferenceControllerTest {
		mContext = spy(ApplicationProvider.getApplicationContext());
		when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
		doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
		when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);

		mPreference = new ListPreference(mContext);
		mController = new CdmaSystemSelectPreferenceController(mContext, "mobile_data");
		@@ -100,7 +100,6 @@ public class CdmaSystemSelectPreferenceControllerTest {
		}

		@Test
		@Ignore("b/337417544")
		public void updateState_stateHome_displayHome() {
		doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
		mTelephonyManager).getCdmaRoamingMode();
		@@ -112,7 +111,6 @@ public class CdmaSystemSelectPreferenceControllerTest {
		}

		@Test
		@Ignore("b/337417897")
		public void updateState_LteGSMWcdma_disabled() {
		doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
		mTelephonyManager).getCdmaRoamingMode();
		@@ -126,7 +124,6 @@ public class CdmaSystemSelectPreferenceControllerTest {
		}

		@Test
		@Ignore("b/337417917")
		public void updateState_stateOther_resetToDefault() {
		Settings.Global.putInt(mContext.getContentResolver(),
		Settings.Global.CDMA_ROAMING_MODE,