Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
am: 5a8cf48813
Change-Id: Icea3822382cd2d6c21cedeb1560c4ed2f316d316
This commit is contained in:
@@ -84,43 +84,13 @@ public class CrossProfileCalendarPreferenceControllerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_noManagedUser_DISABLED() {
|
||||
public void getAvailabilityStatus_noManagedUser_shouldBeDisabled() {
|
||||
mController.setManagedUser(null);
|
||||
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isNotEqualTo(CrossProfileCalendarPreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("b/130896049")
|
||||
public void getAvailabilityStatus_hasManagedUser_AVAILABLE() {
|
||||
mController.setManagedUser(mManagedUser);
|
||||
assertThat(mController.getAvailabilityStatus())
|
||||
.isEqualTo(CrossProfileCalendarPreferenceController.AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateStateToDisabled_isNotChecked() {
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
CROSS_PROFILE_CALENDAR_ENABLED, 0, mManagedUser.getIdentifier());
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateStateToEnabled_isChecked() throws Exception {
|
||||
// Put 0 first so we know the value is not originally 1.
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
CROSS_PROFILE_CALENDAR_ENABLED, 0, mManagedUser.getIdentifier());
|
||||
mController.updateState(mPreference);
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
CROSS_PROFILE_CALENDAR_ENABLED, 1, mManagedUser.getIdentifier());
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_noPackageAllowed_shouldBeDisabledForUser() throws Exception {
|
||||
dpm.setProfileOwner(TEST_COMPONENT_NAME);
|
||||
@@ -145,6 +115,28 @@ public class CrossProfileCalendarPreferenceControllerTest {
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateStateToDisabled_isNotChecked() {
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
CROSS_PROFILE_CALENDAR_ENABLED, 0, mManagedUser.getIdentifier());
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateStateToEnabled_isChecked() throws Exception {
|
||||
// Put 0 first so we know the value is not originally 1.
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
CROSS_PROFILE_CALENDAR_ENABLED, 0, mManagedUser.getIdentifier());
|
||||
mController.updateState(mPreference);
|
||||
Settings.Secure.putIntForUser(mContext.getContentResolver(),
|
||||
CROSS_PROFILE_CALENDAR_ENABLED, 1, mManagedUser.getIdentifier());
|
||||
|
||||
mController.updateState(mPreference);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onPreferenceChangeToFalse_shouldUpdateProviderValue() {
|
||||
mController.onPreferenceChange(mPreference, false);
|
||||
|
Reference in New Issue
Block a user