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

Merge "Fix the problem that the SIM status and IMEI after the "Build number"." into sc-dev

Browse Source
This commit is contained in:
Stanley Wang
2021-07-19 02:10:21 +00:00
committed by Android (Google) Code Review
parent 57b189b1cd 1fcdafbcda
commit 2ea54cc143
8 changed files with 237 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
View File

@@ -33,6 +33,7 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -64,6 +65,8 @@ public class PhoneNumberPreferenceControllerTest {
private SubscriptionManager mSubscriptionManager;
@Mock
private PreferenceScreen mScreen;
@Mock
private PreferenceCategory mCategory;
private Context mContext;
private PhoneNumberPreferenceController mController;
@@ -78,6 +81,8 @@ public class PhoneNumberPreferenceControllerTest {
final String prefKey = mController.getPreferenceKey();
when(mScreen.findPreference(prefKey)).thenReturn(mPreference);
when(mScreen.getContext()).thenReturn(mContext);
final String categoryKey = "basic_info_category";
when(mScreen.findPreference(categoryKey)).thenReturn(mCategory);
doReturn(mSubscriptionInfo).when(mController).getSubscriptionInfo(anyInt());
doReturn(mSecondPreference).when(mController).createNewPreference(mContext);
when(mPreference.isVisible()).thenReturn(true);
@@ -105,7 +110,7 @@ public class PhoneNumberPreferenceControllerTest {
mController.displayPreference(mScreen);
verify(mScreen).addPreference(mSecondPreference);
verify(mCategory).addPreference(mSecondPreference);
}
@Test

7
tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
View File

@@ -39,6 +39,7 @@ import android.telephony.TelephonyManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -68,6 +69,8 @@ public class ImeiInfoPreferenceControllerTest {
private UserManager mUserManager;
@Mock
private Fragment mFragment;
@Mock
private PreferenceCategory mCategory;
private Context mContext;
private ImeiInfoPreferenceController mController;
@@ -82,6 +85,8 @@ public class ImeiInfoPreferenceControllerTest {
doReturn(AVAILABLE).when(mController).getAvailabilityStatus();
when(mScreen.getContext()).thenReturn(mContext);
doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
final String categoryKey = "device_detail_category";
when(mScreen.findPreference(categoryKey)).thenReturn(mCategory);
ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
final String prefKey = mController.getPreferenceKey();
@@ -97,7 +102,7 @@ public class ImeiInfoPreferenceControllerTest {
mController.displayPreference(mScreen);
verify(mScreen).addPreference(mSecondSimPreference);
verify(mCategory).addPreference(mSecondSimPreference);
}
@Test

7
tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
View File

@@ -30,6 +30,7 @@ import android.telephony.TelephonyManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -59,6 +60,8 @@ public class SimStatusPreferenceControllerTest {
private UserManager mUserManager;
@Mock
private Fragment mFragment;
@Mock
private PreferenceCategory mCategory;
private Context mContext;
private SimStatusPreferenceController mController;
@@ -71,6 +74,8 @@ public class SimStatusPreferenceControllerTest {
mController = spy(new SimStatusPreferenceController(mContext, mFragment));
doReturn(true).when(mController).isAvailable();
when(mScreen.getContext()).thenReturn(mContext);
final String categoryKey = "device_detail_category";
when(mScreen.findPreference(categoryKey)).thenReturn(mCategory);
doReturn(mSecondSimPreference).when(mController).createNewPreference(mContext);
ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -85,7 +90,7 @@ public class SimStatusPreferenceControllerTest {
mController.displayPreference(mScreen);
verify(mScreen).addPreference(mSecondSimPreference);
verify(mCategory).addPreference(mSecondSimPreference);
}
@Test