Merge "Revert "[Settings] Ignore some failure test cases"" (7d920ca2) · Commits · e / os / android_packages_apps_Settings

tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ import com.android.settings.core.BasePreferenceController;
		import com.android.settings.testutils.ResourcesUtils;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -103,7 +102,6 @@ public class PhoneNumberPreferenceControllerTest {
		}

		@Test
		@Ignore
		public void getAvailabilityStatus_isNotVoiceCapable_shouldBeUNSUPPORTED_ON_DEVICE() {
		when(mTelephonyManager.isVoiceCapable()).thenReturn(false);

		@@ -123,7 +121,6 @@ public class PhoneNumberPreferenceControllerTest {
		}

		@Test
		@Ignore
		public void updateState_singleSim_shouldUpdateTitleAndPhoneNumber() {
		final String phoneNumber = "1111111111";
		doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
		@@ -137,7 +134,6 @@ public class PhoneNumberPreferenceControllerTest {
		}

		@Test
		@Ignore
		public void updateState_multiSim_shouldUpdateTitleAndPhoneNumberOfMultiplePreferences() {
		final String phoneNumber = "1111111111";
		doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);
		@@ -155,7 +151,6 @@ public class PhoneNumberPreferenceControllerTest {
		}

		@Test
		@Ignore
		public void getSummary_cannotGetActiveSubscriptionInfo_shouldShowUnknown() {
		when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null);

		@@ -167,7 +162,6 @@ public class PhoneNumberPreferenceControllerTest {
		}

		@Test
		@Ignore
		public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() {
		List<SubscriptionInfo> infos = new ArrayList<>();
		when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(infos);

tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ import com.android.settings.testutils.ResourcesUtils;
		import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -178,7 +177,6 @@ public class InternetPreferenceControllerTest {
		any(Handler.class));
		}

		@Ignore
		@Test
		@UiThreadTest
		public void onPause_shouldUnregisterCallback() {

tests/unit/src/com/android/settings/network/InternetResetHelperTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
		import com.android.settingslib.utils.HandlerInjector;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -242,7 +241,6 @@ public class InternetResetHelperTest {
		verify(mRecoveryWorker).triggerRestart();
		}

		@Ignore
		@Test
		public void checkRecovering_isRecovering_showResetting() {
		when(mRecoveryWorker.isRecovering()).thenReturn(true);
		@@ -252,7 +250,6 @@ public class InternetResetHelperTest {
		verify(mResettingPreference).setVisible(true);
		}

		@Ignore
		@Test
		public void checkRecovering_isNotRecovering_doNotShowResetting() {
		when(mRecoveryWorker.isRecovering()).thenReturn(false);

tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -66,7 +66,6 @@ import com.android.wifitrackerlib.WifiEntry;
		import com.android.wifitrackerlib.WifiPickerTracker;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -463,7 +462,6 @@ public class ProviderModelSliceTest {
		}
		}

		@Ignore
		@Test
		@UiThreadTest
		public void onNotifyChange_FirstTimeDisableToggleState_showDialog() {

tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -459,7 +459,6 @@ public class SubscriptionUtilTest {
		}

		@Test
		@Ignore
		public void isSimHardwareVisible_configAsVisible_returnTrue() {
		when(mContext.getResources()).thenReturn(mResources);
		when(mResources.getBoolean(R.bool.config_show_sim_info))