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

Merge "Fix SetupChooseLockPasswordTest" into tm-dev

Browse Source
This commit is contained in:
Chaohui Wang
2022-03-23 13:09:19 +00:00
committed by Android (Google) Code Review
parent a12da0a8e8 1933ffacab
commit 8ba7ed6451
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
View File

@@ -46,7 +46,6 @@ import com.google.android.setupcompat.template.FooterBarMixin;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -106,7 +105,6 @@ public class SetupChooseLockPasswordTest {
@Test @Test
@Config(shadows = ShadowChooseLockGenericController.class) @Config(shadows = ShadowChooseLockGenericController.class)
@Ignore
public void createActivity_withShowOptionsButtonExtra_buttonNotVisibleIfNoVisibleLockTypes() { public void createActivity_withShowOptionsButtonExtra_buttonNotVisibleIfNoVisibleLockTypes() {
SetupChooseLockPassword activity = createSetupChooseLockPassword(); SetupChooseLockPassword activity = createSetupChooseLockPassword();
Button optionsButton = activity.findViewById(R.id.screen_lock_options); Button optionsButton = activity.findViewById(R.id.screen_lock_options);
@@ -206,7 +204,7 @@ public class SetupChooseLockPasswordTest {
@Implements(ChooseLockGenericController.class) @Implements(ChooseLockGenericController.class)
public static class ShadowChooseLockGenericController { public static class ShadowChooseLockGenericController {
@Implementation @Implementation
protected List<ScreenLockType> getVisibleScreenLockTypes() { protected List<ScreenLockType> getVisibleAndEnabledScreenLockTypes() {
return Collections.emptyList(); return Collections.emptyList();
} }
} }