From b5c17fb3618204f68fa1fdc46c62cc0b21490864 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Sun, 24 Nov 2019 16:31:25 -0800 Subject: [PATCH] Adjust lock screen tests Lock screen dashboard is now always visible, and tests should reflect the new behavior. Fixes: 144899234 Test: treehugger Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockScreenPreferenceControllerTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=LockscreenDashboardFragmentTest Change-Id: Ia1cd79c5d8f6ea74525f6afdea900c230806fd88 --- .../settings/security/LockscreenDashboardFragmentTest.java | 4 ++-- .../screenlock/LockScreenPreferenceControllerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java index 2db36b7320e..8b5c5fea313 100644 --- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java @@ -123,13 +123,13 @@ public class LockscreenDashboardFragmentTest { } @Test - public void isPageSearchable_notLocked_shouldNotBeSearchable() { + public void isPageSearchable_notLocked_shouldBeSearchable() { when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false); when(mLockPatternUtils.isLockScreenDisabled(anyInt())).thenReturn(true); assertThat(LockscreenDashboardFragment.SEARCH_INDEX_DATA_PROVIDER .getNonIndexableKeys(mContext)) - .contains("security_lockscreen_settings_screen"); + .doesNotContain("security_lockscreen_settings_screen"); } public static class TestFragment extends LockscreenDashboardFragment { diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index 45d029589ac..2b8fd4934f6 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -133,7 +133,7 @@ public class LockScreenPreferenceControllerTest { } @Test - public void onResume_unavailable_shouldHide() { + public void onResume_unavailable_shouldShow() { when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true); when(mLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt())) .thenReturn(PASSWORD_QUALITY_UNSPECIFIED); @@ -141,6 +141,6 @@ public class LockScreenPreferenceControllerTest { mController.displayPreference(mScreen); mLifecycle.handleLifecycleEvent(ON_RESUME); - assertThat(mPreference.isVisible()).isFalse(); + assertThat(mPreference.isVisible()).isTrue(); } }