Fix SetupChooseLockPasswordTest
Test fail is caused by method getVisibleScreenLockTypes() renamed to getVisibleAndEnabledScreenLockTypes() in https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/14269154 Fix: 201021223 Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password.SetupChooseLockPasswordTest" Change-Id: Idcc7a9794217c1ef81ca4a26351e26773b18ccad
This commit is contained in:
@@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user