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

Merge "[Settings] Adopting public API" am: 8ddd0da0a1 am: 40d2a2dd8d am: 11fa77b023

Browse Source 
Change-Id: I87282b78a9db6eb3611591f0c4702447b8470db4
This commit is contained in:
Automerger Merge Worker
2019-12-16 08:31:03 +00:00
parent 4b6ff82d92 11fa77b023
commit 107cd136a3
12 changed files with 17 additions and 21 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

@@ -21,7 +21,6 @@ import static android.content.Context.CLIPBOARD_SERVICE;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -141,7 +140,7 @@ public class PhoneNumberPreferenceControllerTest {
@Test
public void getSummary_cannotGetActiveSubscriptionInfo_shouldShowUnknown() {
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(null);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null);
CharSequence primaryNumber = mController.getSummary();
@@ -152,7 +151,7 @@ public class PhoneNumberPreferenceControllerTest {
@Test
public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() {
List<SubscriptionInfo> infos = new ArrayList<>();
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(infos);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(infos);
CharSequence primaryNumber = mController.getSummary();
@@ -168,7 +167,7 @@ public class PhoneNumberPreferenceControllerTest {
public void copy_shouldCopyPhoneNumberToClipboard() {
final List<SubscriptionInfo> list = new ArrayList<>();
list.add(mSubscriptionInfo);
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(list);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(list);
final String phoneNumber = "1111111111";
doReturn(phoneNumber).when(mController).getFormattedPhoneNumber(mSubscriptionInfo);