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

Use new dataManagementLabel AIDL in Backup Settings

Browse Source 
1) Uses new AIDL method getDataManagementLabelForUser
2) Changes data management label type from String to CharSequence

Bug: 113856654
Test: atest $(find \
packages/apps/Settings/tests/robotests/src/com/android/settings/backup \
-name '*Test.java')

Change-Id: I2325527c67878467b96fb93de50faafe153fdb21
This commit is contained in:
Annie Meng
2019-03-15 12:29:27 +00:00
parent cd829aced1
commit ae53699277
7 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
View File

@@ -256,20 +256,21 @@ public class BackupSettingsHelperTest {
@Test
public void testGetLabelBackupTransport() throws Exception {
String label = "test_label";
CharSequence label = "test_label";
when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
when(mBackupManager.getDataManagementLabelForUser(anyInt(), anyString())).thenReturn(label);
String backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
CharSequence backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
assertThat(backupLabel).isEqualTo(label);
}
@Test
public void testGetLabelBackupTransport_RemoteException() throws Exception {
when(mBackupManager.getDataManagementLabel(anyString())).thenThrow(new RemoteException());
when(mBackupManager.getDataManagementLabelForUser(anyInt(), anyString()))
.thenThrow(new RemoteException());
String backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
CharSequence backupLabel = mBackupSettingsHelper.getLabelFromBackupTransport();
assertThat(backupLabel).isNull();
}
@@ -291,31 +292,31 @@ public class BackupSettingsHelperTest {
@Test
public void testGetLabelForBackupSettings_WithLabelFromTransport() throws Exception {
String label = "test_label";
CharSequence label = "test_label";
when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
when(mBackupManager.getDataManagementLabelForUser(anyInt(), anyString())).thenReturn(label);
String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
CharSequence backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
assertThat(backupLabel).isEqualTo(label);
}
@Test
public void testGetLabelForBackupSettings_WithEmptyLabelFromTransport() throws Exception {
String label = "";
CharSequence label = "";
when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(label);
when(mBackupManager.getDataManagementLabelForUser(anyInt(), anyString())).thenReturn(label);
String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
CharSequence backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
assertThat(backupLabel).isEqualTo(mContext.getString(DEFAULT_LABEL_RESOURCE));
}
@Test
public void testGetLabelForBackupSettings_WithoutLabelFromTransport() throws Exception {
when(mBackupManager.getDataManagementLabel(anyString())).thenReturn(null);
when(mBackupManager.getDataManagementLabelForUser(anyInt(), anyString())).thenReturn(null);
String backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
CharSequence backupLabel = mBackupSettingsHelper.getLabelForBackupSettings();
assertThat(backupLabel).isEqualTo(mContext.getString(DEFAULT_LABEL_RESOURCE));
}

2
tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java
View File

@@ -43,7 +43,7 @@ public class DataManagementPreferenceControllerTest {
private DataManagementPreferenceController mController;
private PrivacySettingsConfigData mPSCD;
private Preference mPreference;
private String mTitle;
private CharSequence mTitle;
@Mock
private Intent mIntent;