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

Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee

Browse Source 
Change-Id: I16b31595e00e501c6c097ef3e4ad78f3fb0f9b75
This commit is contained in:
Automerger Merge Worker
2020-02-21 22:23:21 +00:00
parent fd2e26d4aa 7c849787ee
commit 63da73532d
6 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
View File

@@ -24,9 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@@ -39,7 +37,6 @@ import android.text.TextUtils;
import androidx.preference.Preference;
import com.android.internal.telephony.PhoneConstants;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
@@ -48,7 +45,6 @@ import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@@ -94,7 +90,7 @@ public class DataServiceSetupPreferenceControllerTest {
@Test
public void getAvailabilityStatus_allConfigOn_returnAvailable() {
doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode();
doReturn(true).when(mTelephonyManager).isGlobalModeEnabled();
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
false);
@@ -105,7 +101,7 @@ public class DataServiceSetupPreferenceControllerTest {
public void getAvailabilityStatus_missUrl_returnUnavailable() {
Settings.Global.putString(mContext.getContentResolver(),
Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, "");
doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode();
doReturn(true).when(mTelephonyManager).isGlobalModeEnabled();
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
false);
@@ -117,7 +113,7 @@ public class DataServiceSetupPreferenceControllerTest {
@Test
public void getAvailabilityStatus_notCdma_returnUnavailable() {
doReturn(PhoneConstants.LTE_ON_CDMA_FALSE).when(mTelephonyManager).getLteOnCdmaMode();
doReturn(false).when(mTelephonyManager).isGlobalModeEnabled();
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
false);