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

Commit 4fbf549b 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 

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



Change-Id: Iea86a42398e88a5ef39fd26c7cac566f78b67017
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7da022c7 a671c301

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

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

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowDrawable;

import org.robolectric.shadows.ShadowDrawable;





@Ignore

@RunWith(RobolectricTestRunner.class)

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

@Config(shadows = {

        SettingsShadowResources.class,

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

                "Must be at least 6 characters");

    }

    }





    @Ignore

    @Test

    @Test

    public void processAndValidatePasswordRequirements_autoPinDisabled_defaultPinMinimumLength() {

    public void processAndValidatePasswordRequirements_autoPinDisabled_defaultPinMinimumLength() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

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

        assertThat(pinAutoConfirmOption.isChecked()).isFalse();

    }

    }





    @Ignore

    @Test

    @Test

    public void autoPinConfirmOption_featureDisabled_shouldRemainInvisibleAndUnchecked() {

    public void autoPinConfirmOption_featureDisabled_shouldRemainInvisibleAndUnchecked() {

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,

        DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION,