Merge "Re-enable most tests" into udc-qpr-dev am: a671c3014e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24059806 Change-Id: Iea86a42398e88a5ef39fd26c7cac566f78b67017 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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,
|
||||||
|
Reference in New Issue
Block a user