From f7d302c935e880ad3aa79dd32a8c3002e96d4a9c Mon Sep 17 00:00:00 2001 From: Jeremy Goldman Date: Thu, 12 Nov 2020 07:02:57 +0000 Subject: [PATCH] Underlying telephony library interface changed, updating tests accordingly. Test: atest -c CdmaSystemSelectPreferenceControllerTest Change-Id: I6bbcf2422b1f87cc50ba8554fdc9e59b4b1bb0ba --- .../cdma/CdmaSubscriptionPreferenceControllerTest.java | 3 --- .../cdma/CdmaSystemSelectPreferenceControllerTest.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java index f0f34d16deb..d888c9e990c 100644 --- a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java @@ -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)); diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java index 4f44a29aae3..3bc3935ba23 100644 --- a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java @@ -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));