Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0c2d574 authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Automerger Merge Worker
Browse files

Merge "Re-enable most tests" into udc-qpr-dev am: a671c301 am: 4fbf549b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806



Change-Id: I354313db70332a413b80431d3337ace97da80514
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6c849e2 4fbf549b

tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import org.robolectric.Shadows; 
import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowDrawable;



@Ignore

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

        SettingsShadowResources.class,
@@ -414,6 +413,7 @@ public class ChooseLockPasswordTest { 
                "Must be at least 6 characters");

    }



    @Ignore

    @Test

    public void processAndValidatePasswordRequirements_autoPinDisabled_defaultPinMinimumLength() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,
@@ -543,6 +543,7 @@ public class ChooseLockPasswordTest { 
        assertThat(pinAutoConfirmOption.isChecked()).isFalse();

    }



    @Ignore

    @Test

    public void autoPinConfirmOption_featureDisabled_shouldRemainInvisibleAndUnchecked() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,