Merge changes If96ac99a,I45ab17cf into udc-qpr-dev
* changes: Remove invalid test Remove invalid test
This commit is contained in:
committed by
Android (Google) Code Review
commit
394baf2919
@@ -65,7 +65,6 @@ import com.google.android.setupdesign.GlifLayout;
|
|||||||
|
|
||||||
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.Robolectric;
|
import org.robolectric.Robolectric;
|
||||||
@@ -395,26 +394,8 @@ 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_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);
|
|
||||||
PasswordPolicy policy = new PasswordPolicy();
|
PasswordPolicy policy = new PasswordPolicy();
|
||||||
policy.quality = PASSWORD_QUALITY_UNSPECIFIED;
|
policy.quality = PASSWORD_QUALITY_UNSPECIFIED;
|
||||||
|
|
||||||
@@ -525,39 +506,6 @@ public class ChooseLockPasswordTest {
|
|||||||
assertThat(pinAutoConfirmOption.isChecked()).isFalse();
|
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() {
|
private ChooseLockPassword setupActivityWithPinTypeAndDefaultPolicy() {
|
||||||
PasswordPolicy policy = new PasswordPolicy();
|
PasswordPolicy policy = new PasswordPolicy();
|
||||||
policy.quality = PASSWORD_QUALITY_UNSPECIFIED;
|
policy.quality = PASSWORD_QUALITY_UNSPECIFIED;
|
||||||
|
Reference in New Issue
Block a user