From 4316259aa053c5ece4bed34d36da2ecb0cdb44a2 Mon Sep 17 00:00:00 2001 From: Jonathan Scott Date: Fri, 19 Apr 2019 22:19:21 +0100 Subject: [PATCH] Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE This is already covered by getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable and getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable. Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest Fixes: 130896049 Change-Id: I3dbbbde693750c69e042f7c19143730cc8e313ff --- ...ossProfileCalendarPreferenceControllerTest.java | 52 +++++++++------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java index 7c6077440e..b50fa5e22c 100644 --- a/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/CrossProfileCalendarPreferenceControllerTest.java @@ -84,7 +84,7 @@ public class CrossProfileCalendarPreferenceControllerTest { } @Test - public void getAvailabilityStatus_noManagedUser_DISABLED() { + public void getAvailabilityStatus_noManagedUser_shouldBeDisabled() { mController.setManagedUser(null); assertThat(mController.getAvailabilityStatus()) @@ -92,11 +92,27 @@ public class CrossProfileCalendarPreferenceControllerTest { } @Test - @Ignore("b/130896049") - public void getAvailabilityStatus_hasManagedUser_AVAILABLE() { - mController.setManagedUser(mManagedUser); - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(CrossProfileCalendarPreferenceController.AVAILABLE); + public void getAvailabilityStatus_noPackageAllowed_shouldBeDisabledForUser() throws Exception { + dpm.setProfileOwner(TEST_COMPONENT_NAME); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER); + } + + @Test + public void getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable() throws Exception { + dpm.setProfileOwner(TEST_COMPONENT_NAME); + dpm.setCrossProfileCalendarPackages(TEST_COMPONENT_NAME, + Collections.singleton(TEST_PACKAGE_NAME)); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + } + + @Test + public void getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable() throws Exception { + dpm.setProfileOwner(TEST_COMPONENT_NAME); + dpm.setCrossProfileCalendarPackages(TEST_COMPONENT_NAME, null); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } @Test @@ -122,30 +138,6 @@ public class CrossProfileCalendarPreferenceControllerTest { } @Test - public void getAvailabilityStatus_noPackageAllowed_shouldBeDisabledForUser() throws Exception { - dpm.setProfileOwner(TEST_COMPONENT_NAME); - - assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER); - } - - @Test - public void getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable() throws Exception { - dpm.setProfileOwner(TEST_COMPONENT_NAME); - dpm.setCrossProfileCalendarPackages(TEST_COMPONENT_NAME, - Collections.singleton(TEST_PACKAGE_NAME)); - - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); - } - - @Test - public void getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable() throws Exception { - dpm.setProfileOwner(TEST_COMPONENT_NAME); - dpm.setCrossProfileCalendarPackages(TEST_COMPONENT_NAME, null); - - assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); - } - - @Test public void onPreferenceChangeToFalse_shouldUpdateProviderValue() { mController.onPreferenceChange(mPreference, false); assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(), -- 2.11.0