From 1dd47d5c1d5fa33d92ebb5ca885c94db1a5099cd Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Thu, 22 Dec 2022 14:45:11 +0000 Subject: [PATCH] Revert "[Settings] Ignore some failure test cases" This reverts commit c9db203edd4c456556ff75b26745fa418f44d120. Reason for revert: Try to see how many test cases can be passed. Change-Id: I6499c6499d4f30718d18ca03e02cf1f5e4b7918e --- .../deviceinfo/PhoneNumberPreferenceControllerTest.java | 6 ------ .../settings/network/InternetPreferenceControllerTest.java | 2 -- .../android/settings/network/InternetResetHelperTest.java | 3 --- .../android/settings/network/ProviderModelSliceTest.java | 2 -- .../com/android/settings/network/SubscriptionUtilTest.java | 1 - .../settings/wifi/RequestToggleWiFiActivityTest.java | 3 --- 6 files changed, 17 deletions(-) diff --git a/tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index bff9d4137ee..5f02b04f7e0 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -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 infos = new ArrayList<>(); when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(infos); diff --git a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java index cd9d2a349db..8beeffb96e8 100644 --- a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java @@ -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() { diff --git a/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java b/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java index a5278224d81..3fe688273d8 100644 --- a/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java +++ b/tests/unit/src/com/android/settings/network/InternetResetHelperTest.java @@ -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); diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java index 553fefd58b3..345631cf5f6 100644 --- a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java +++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java @@ -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() { diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java index e06e0a5b738..63dca7e88eb 100644 --- a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java +++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java @@ -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)) diff --git a/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java b/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java index 8810386b4e1..0e3dd4038e4 100644 --- a/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java +++ b/tests/unit/src/com/android/settings/wifi/RequestToggleWiFiActivityTest.java @@ -34,7 +34,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -77,7 +76,6 @@ public class RequestToggleWiFiActivityTest { } @Test - @Ignore public void getAppLabel_nullPackageName_returnNull() { fakeCallingPackage(null); @@ -85,7 +83,6 @@ public class RequestToggleWiFiActivityTest { } @Test - @Ignore public void getAppLabel_settingsPackageName_returnNotNull() { fakeCallingPackage("com.android.settings");