Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2db02286 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix CDMA roaming and subscription mode tests"

parents 3318cc3b 92dfa7b2

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

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.network.telephony.cdma; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;
@@ -81,8 +80,6 @@ public class CdmaSubscriptionPreferenceControllerTest { 


    @Test

    public void onPreferenceChange_selectNV_returnNVMode() {

        doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());



        mController.onPreferenceChange(mPreference, Integer.toString(

                TelephonyManager.CDMA_SUBSCRIPTION_NV));

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

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.network.telephony.cdma; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;
@@ -94,7 +93,6 @@ public class CdmaSystemSelectPreferenceControllerTest { 
        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.CDMA_ROAMING_MODE,

                TelephonyManager.CDMA_ROAMING_MODE_ANY);

        doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());



        mController.onPreferenceChange(mPreference,

                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));