From d72b22e1e1b541f06504db2caf34d993eee43287 Mon Sep 17 00:00:00 2001 From: Chun-Wei Wang Date: Fri, 14 Jul 2023 00:15:08 +0000 Subject: [PATCH 1/2] Remove invalid test The auto pin confirm feature is now always available (ag/23288037). The test is no longer valid. Bug: 291146670 Test: atest ChooseLockPasswordTest Change-Id: I45ab17cf3833e0fc8cad5679d6ef19957a2f60b7 --- .../password/ChooseLockPasswordTest.java | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index c6a0c0a8134..3e64fd5c4c9 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -525,39 +525,6 @@ 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, - /* value= */ "false", /* makeDefault= */ false); - ChooseLockPassword passwordActivity = setupActivityWithPinTypeAndDefaultPolicy(); - - ChooseLockPasswordFragment fragment = getChooseLockPasswordFragment(passwordActivity); - ScrollToParentEditText passwordEntry = passwordActivity.findViewById(R.id.password_entry); - CheckBox pinAutoConfirmOption = passwordActivity - .findViewById(R.id.auto_pin_confirm_enabler); - TextView securityMessage = - passwordActivity.findViewById(R.id.auto_pin_confirm_security_message); - - passwordEntry.setText("1234"); - fragment.updateUi(); - assertThat(pinAutoConfirmOption.getVisibility()).isEqualTo(View.GONE); - assertThat(securityMessage.getVisibility()).isEqualTo(View.GONE); - assertThat(pinAutoConfirmOption.isChecked()).isFalse(); - - passwordEntry.setText("123456"); - fragment.updateUi(); - assertThat(pinAutoConfirmOption.getVisibility()).isEqualTo(View.GONE); - assertThat(securityMessage.getVisibility()).isEqualTo(View.GONE); - assertThat(pinAutoConfirmOption.isChecked()).isFalse(); - - passwordEntry.setText("12345678"); - fragment.updateUi(); - assertThat(pinAutoConfirmOption.getVisibility()).isEqualTo(View.GONE); - assertThat(securityMessage.getVisibility()).isEqualTo(View.GONE); - assertThat(pinAutoConfirmOption.isChecked()).isFalse(); - } - private ChooseLockPassword setupActivityWithPinTypeAndDefaultPolicy() { PasswordPolicy policy = new PasswordPolicy(); policy.quality = PASSWORD_QUALITY_UNSPECIFIED; From d155195c6beb47d358633acbd4d5a07f17703e57 Mon Sep 17 00:00:00 2001 From: Chun-Wei Wang Date: Fri, 14 Jul 2023 01:17:49 +0000 Subject: [PATCH 2/2] Remove invalid test 1. Remove the invalid test Per ag/23288037, the feature is now always available 2. Rename processAndValidatePasswordRequirements_autoPinEnabled_defaultPinMinimumLength Bug: 291146670 Test: atest ChooseLockPasswordTest Change-Id: If96ac99aa1a98636a14017c880892436767c4a41 --- .../password/ChooseLockPasswordTest.java | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index 3e64fd5c4c9..09914f1022a 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -65,7 +65,6 @@ import com.google.android.setupdesign.GlifLayout; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; @@ -395,26 +394,8 @@ 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, - /* value= */ "false", /* makeDefault= */ false); - PasswordPolicy policy = new PasswordPolicy(); - policy.quality = PASSWORD_QUALITY_UNSPECIFIED; - - assertPasswordValidationResult( - /* minMetrics */ policy.getMinMetrics(), - /* minComplexity= */ PASSWORD_COMPLEXITY_NONE, - /* passwordType= */ PASSWORD_QUALITY_NUMERIC, - /* userEnteredPassword= */ LockscreenCredential.createPassword("11"), - "PIN must be at least 4 digits"); - } - - @Test - public void processAndValidatePasswordRequirements_autoPinEnabled_defaultPinMinimumLength() { - DeviceConfig.setProperty(NAMESPACE_AUTO_PIN_CONFIRMATION, FLAG_ENABLE_AUTO_PIN_CONFIRMATION, - /* value= */ "true", /* makeDefault= */ false); + public void processAndValidatePasswordRequirements_defaultPinMinimumLength() { PasswordPolicy policy = new PasswordPolicy(); policy.quality = PASSWORD_QUALITY_UNSPECIFIED;