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

Merge "Migrate test to TwoStatePreference" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-10-25 03:30:10 +00:00
committed by Android (Google) Code Review
parent 187067647c 2a166676d4
commit 03a064fcd1
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
View File

@@ -28,9 +28,8 @@ import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; 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.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -57,13 +56,11 @@ public class Enhanced4gBasePreferenceControllerTest {
private SubscriptionManager mSubscriptionManager; private SubscriptionManager mSubscriptionManager;
@Mock @Mock
private CarrierConfigCache mCarrierConfigCache; private CarrierConfigCache mCarrierConfigCache;
@Mock
private ProvisioningManager mProvisioningManager;
private MockVolteQueryImsState mQueryImsState; private MockVolteQueryImsState mQueryImsState;
private Enhanced4gLtePreferenceController mController; private Enhanced4gLtePreferenceController mController;
private SwitchPreference mPreference; private TwoStatePreference mPreference;
private PersistableBundle mCarrierConfig; private PersistableBundle mCarrierConfig;
private Context mContext; private Context mContext;

4
tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java
View File

@@ -29,7 +29,7 @@ import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import androidx.preference.SwitchPreference; import androidx.preference.TwoStatePreference;
import androidx.test.core.app.ApplicationProvider; import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -57,7 +57,7 @@ public class NrAdvancedCallingPreferenceControllerTest {
private CarrierConfigCache mCarrierConfigCache; private CarrierConfigCache mCarrierConfigCache;
private NrAdvancedCallingPreferenceController mController; private NrAdvancedCallingPreferenceController mController;
private SwitchPreference mPreference; private TwoStatePreference mPreference;
private PersistableBundle mCarrierConfig; private PersistableBundle mCarrierConfig;
private Context mContext; private Context mContext;