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

Merge "Fix NPE during unit test"

Browse Source
This commit is contained in:
android-build-team Robot
2018-04-30 23:44:27 +00:00
committed by Android (Google) Code Review
parent db9c8d3b16 16de45d8ec
commit bd825f408b
11 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.backup;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import androidx.preference.SwitchPreference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,6 +31,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import androidx.preference.SwitchPreference;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class AutoRestorePreferenceControllerTest {
@@ -44,7 +45,7 @@ public class AutoRestorePreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mPSCD = new PrivacySettingsConfigData();
mPSCD = PrivacySettingsConfigData.getInstance();
mController = new AutoRestorePreferenceController(mContext,
PrivacySettingsUtils.AUTO_RESTORE);
mPreference = new SwitchPreference(mContext);
@@ -59,7 +60,7 @@ public class AutoRestorePreferenceControllerTest {
public void updateState_backupEnabled_prefShouldBeEnabled() {
mPSCD.setBackupEnabled(true);
mPSCD.setBackupGray(false);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isTrue();
}

12
tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
View File

@@ -19,8 +19,6 @@ package com.android.settings.backup;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -34,6 +32,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class BackupDataPreferenceControllerTest {
@@ -46,7 +46,7 @@ public class BackupDataPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mPSCD = new PrivacySettingsConfigData();
mPSCD = PrivacySettingsConfigData.getInstance();
mController = new BackupDataPreferenceController(mContext,
PrivacySettingsUtils.BACKUP_DATA);
mPreference = new Preference(mContext);
@@ -61,7 +61,7 @@ public class BackupDataPreferenceControllerTest {
public void updateState_backupEnabled_prefShouldBeEnabled() {
mPSCD.setBackupEnabled(true);
mPSCD.setBackupGray(false);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isTrue();
}
@@ -70,7 +70,7 @@ public class BackupDataPreferenceControllerTest {
public void updateState_backupEnabled_prefShouldDisplayOnSummary() {
mPSCD.setBackupEnabled(true);
mPSCD.setBackupGray(false);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.accessibility_feature_state_on));
@@ -80,7 +80,7 @@ public class BackupDataPreferenceControllerTest {
public void updateState_backupDisabled_prefShouldDisplayOffSummary() {
mPSCD.setBackupEnabled(false);
mPSCD.setBackupGray(false);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.accessibility_feature_state_off));

11
tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
View File

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.Intent;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -35,6 +34,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class ConfigureAccountPreferenceControllerTest {
@@ -51,7 +52,7 @@ public class ConfigureAccountPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mPSCD = new PrivacySettingsConfigData();
mPSCD = PrivacySettingsConfigData.getInstance();
mController = new ConfigureAccountPreferenceController(mContext,
PrivacySettingsUtils.CONFIGURE_ACCOUNT);
mPreference = new Preference(mContext);
@@ -68,7 +69,7 @@ public class ConfigureAccountPreferenceControllerTest {
mPSCD.setBackupEnabled(true);
mPSCD.setBackupGray(false);
mPSCD.setConfigIntent(mIntent);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isTrue();
}
@@ -80,7 +81,7 @@ public class ConfigureAccountPreferenceControllerTest {
mPSCD.setBackupGray(false);
mPSCD.setConfigIntent(mIntent);
mPSCD.setConfigSummary(null);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.backup_configure_account_default_summary));
@@ -93,7 +94,7 @@ public class ConfigureAccountPreferenceControllerTest {
mPSCD.setBackupGray(false);
mPSCD.setConfigIntent(mIntent);
mPSCD.setConfigSummary(mTestSummary);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.getSummary()).isEqualTo(mTestSummary);
}

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

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.content.Intent;
import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,6 +33,8 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class DataManagementPreferenceControllerTest {
@@ -56,7 +57,7 @@ public class DataManagementPreferenceControllerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mPSCD = new PrivacySettingsConfigData();
mPSCD = PrivacySettingsConfigData.getInstance();
mController = new DataManagementPreferenceController(mContext, KEY);
mPreference = new Preference(mContext);
mTitle = "Title";
@@ -68,26 +69,25 @@ public class DataManagementPreferenceControllerTest {
mPSCD.setBackupGray(false);
mPSCD.setManageIntent(mIntent);
mPSCD.setManageLabel(mTitle);
mController.setPrivacySettingsConfigData(mPSCD);
mController.updateState(mPreference);
assertThat(mPreference.getTitle())
.isEqualTo(mTitle);
}
@Test
public void getAvailabilityStatus_isAdmiUser_backupEnabled_hadManageIntent_shouldBeAvailable() {
public void getAvailabilityStatus_isAdmin_backupEnabled_hadManageIntent_shouldBeAvailable() {
ShadowPrivacySettingsUtils.setIsAdminUser(true);
mPSCD.setBackupEnabled(true);
mPSCD.setBackupGray(false);
mPSCD.setManageIntent(mIntent);
mPSCD.setManageLabel(mTitle);
mController.setPrivacySettingsConfigData(mPSCD);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
public void getAvailabilityStatus_isnotAdmiUser_shouldBeDisabledForUser() {
public void getAvailabilityStatus_isNotAdminUser_shouldBeDisabledForUser() {
ShadowPrivacySettingsUtils.setIsAdminUser(false);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_FOR_USER);
@@ -95,13 +95,13 @@ public class DataManagementPreferenceControllerTest {
@Test
public void
getAvailabilityStatus_isAdmiUser_backupEnabled_nullManageIntent_shouldBeDisabledUnsupported() {
getAvailabilityStatus_isAdminUser_backupEnabled_nullManageIntent_shouldBeDisabledUnsupported() {
ShadowPrivacySettingsUtils.setIsAdminUser(true);
mPSCD.setBackupEnabled(true);
mPSCD.setBackupGray(false);
mPSCD.setManageIntent(null);
mPSCD.setManageLabel(mTitle);
mController.setPrivacySettingsConfigData(mPSCD);
assertThat(mController.getAvailabilityStatus())
.isEqualTo(BasePreferenceController.DISABLED_UNSUPPORTED);
}