Ignore existing failed tests and promote SettingsUnitTests to Presubmit. Exclude a few tests from Presubmit as they are failing in Presubmit but can pass locally.

Bug: 339533415

Test: atest and presubmit
Change-Id: Icdc94195f3b4dda4e523d4b7498698a5ada198ea
This commit is contained in:
Fan Wu
2024-05-09 11:08:05 +08:00
parent 8231d00bb9
commit f44ea077d6
25 changed files with 71 additions and 20 deletions

View File

@@ -572,6 +572,7 @@ public class SubscriptionUtilTest {
}
@Test
@Ignore("b/339149463")
public void isSimHardwareVisible_configAsVisible_returnTrue() {
when(mResources.getBoolean(R.bool.config_show_sim_info))
.thenReturn(true);

View File

@@ -41,6 +41,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.common.collect.ImmutableList;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -753,6 +754,7 @@ public class UiccSlotUtilTest {
}
@Test
@Ignore("b/337417975")
public void onReceiveSimCardStateChangeReceiver_receiveAction_timerCountDown() {
CountDownLatch latch = spy(new CountDownLatch(1));
UiccSlotUtil.SimCardStateChangeReceiver receive =

View File

@@ -25,6 +25,7 @@ import com.android.internal.telephony.OperatorInfo
import com.android.settings.network.telephony.CellInfoUtil.getNetworkTitle
import com.android.settings.network.telephony.CellInfoUtil.getOperatorNumeric
import com.google.common.truth.Truth.assertThat
import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
@@ -96,6 +97,7 @@ class CellInfoUtilTest {
}
@Test
@Ignore("b/337417936")
fun convertOperatorInfoToCellInfo() {
val operatorInfo = OperatorInfo(LONG, SHORT, "12301")
@@ -108,6 +110,7 @@ class CellInfoUtilTest {
}
@Test
@Ignore("b/337417222")
fun cellInfoListToString() {
val cellInfoList =
listOf(

View File

@@ -60,6 +60,7 @@ import com.android.settings.network.telephony.TelephonyConstants.TelephonyManage
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -346,6 +347,7 @@ public class EnabledNetworkModePreferenceControllerTest {
@UiThreadTest
@Test
@Ignore("b/337418033")
public void updateState_updateByNetworkMode() {
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
@@ -377,6 +379,7 @@ public class EnabledNetworkModePreferenceControllerTest {
@UiThreadTest
@Test
@Ignore("b/337418033")
public void onPreferenceChange_updateSuccess() {
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
@@ -393,6 +396,7 @@ public class EnabledNetworkModePreferenceControllerTest {
@UiThreadTest
@Test
@Ignore("b/337418033")
public void onPreferenceChange_updateFail() {
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
@@ -408,6 +412,7 @@ public class EnabledNetworkModePreferenceControllerTest {
@UiThreadTest
@Test
@Ignore("b/337418033")
public void preferredNetworkModeNotification_preferenceUpdates() {
final PreferenceManager preferenceManager = new PreferenceManager(mContext);

View File

@@ -48,6 +48,7 @@ import com.android.settings.network.ims.MockWfcQueryImsState;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -176,6 +177,7 @@ public class NetworkProviderWifiCallingGroupTest {
}
@Test
@Ignore("b/337417499")
public void
shouldShowWifiCallingForSub_wifiCallingEnabledWithActivityHandleIntent_returnTrue() {
buildPhoneAccountConfigureIntent(true);

View File

@@ -38,6 +38,7 @@ import com.android.settings.network.CarrierConfigCache;
import com.android.settingslib.RestrictedSwitchPreference;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -180,6 +181,7 @@ public class NrAdvancedCallingPreferenceControllerTest {
}
@Test
@Ignore("b/339542743")
public void updateState_configOn_prefChecked() {
doReturn(TelephonyManager.ENABLE_VONR_SUCCESS).when(
mTelephonyManager).setVoNrEnabled(anyBoolean());

View File

@@ -38,6 +38,7 @@ 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;
@@ -99,6 +100,7 @@ public class CdmaSystemSelectPreferenceControllerTest {
}
@Test
@Ignore("b/337417544")
public void updateState_stateHome_displayHome() {
doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
mTelephonyManager).getCdmaRoamingMode();
@@ -110,6 +112,7 @@ public class CdmaSystemSelectPreferenceControllerTest {
}
@Test
@Ignore("b/337417897")
public void updateState_LteGSMWcdma_disabled() {
doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
mTelephonyManager).getCdmaRoamingMode();
@@ -123,6 +126,7 @@ public class CdmaSystemSelectPreferenceControllerTest {
}
@Test
@Ignore("b/337417917")
public void updateState_stateOther_resetToDefault() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.CDMA_ROAMING_MODE,