From 2a166676d4a41a7613bff06a4a697f47558b7a1e Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 24 Oct 2023 18:14:50 +0800 Subject: [PATCH] Migrate test to TwoStatePreference Bug: 306771414 Test: m SettingsUnitTests Change-Id: I67c8e0c7f04faba377a156587f43929ac73e500f --- .../telephony/Enhanced4gBasePreferenceControllerTest.java | 7 ++----- .../NrAdvancedCallingPreferenceControllerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java index b0cd7809109..9edbf9e673c 100644 --- a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java @@ -28,9 +28,8 @@ import android.os.PersistableBundle; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.telephony.ims.ProvisioningManager; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -57,13 +56,11 @@ public class Enhanced4gBasePreferenceControllerTest { private SubscriptionManager mSubscriptionManager; @Mock private CarrierConfigCache mCarrierConfigCache; - @Mock - private ProvisioningManager mProvisioningManager; private MockVolteQueryImsState mQueryImsState; private Enhanced4gLtePreferenceController mController; - private SwitchPreference mPreference; + private TwoStatePreference mPreference; private PersistableBundle mCarrierConfig; private Context mContext; diff --git a/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java index 053fb4d8916..bed8ef1506f 100644 --- a/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java @@ -29,7 +29,7 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; @@ -57,7 +57,7 @@ public class NrAdvancedCallingPreferenceControllerTest { private CarrierConfigCache mCarrierConfigCache; private NrAdvancedCallingPreferenceController mController; - private SwitchPreference mPreference; + private TwoStatePreference mPreference; private PersistableBundle mCarrierConfig; private Context mContext;