From 50bea9c4405db008630f791eae51f74764054399 Mon Sep 17 00:00:00 2001 From: Joe Bolinger Date: Mon, 24 May 2021 12:22:43 -0700 Subject: [PATCH] Fix biometric tests that relied on a non-zero error reset delay. Swapping the hardcoded value for the injected delay in AuthBiometricView.java broke two tests since the reset callback now executes before the test completes. Fix: 189031816 Test: atest com.android.systemui.biometrics.AuthBiometricViewTest Change-Id: I96ff544a35ebc611259d7dd534530ce35c18ffc7 --- .../systemui/biometrics/AuthBiometricViewTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java index 711f293a0bf1f..65d3293c50d2f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/AuthBiometricViewTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import android.content.Context; +import android.hardware.biometrics.BiometricPrompt; import android.hardware.biometrics.PromptInfo; import android.os.Bundle; import android.test.suitebuilder.annotation.SmallTest; @@ -205,7 +206,7 @@ public class AuthBiometricViewTest extends SysuiTestCase { waitForIdleSync(); verify(mCallback).onAction(AuthBiometricView.Callback.ACTION_ERROR); - assertEquals(AuthBiometricView.STATE_ERROR, mBiometricView.mState); + assertEquals(AuthBiometricView.STATE_IDLE, mBiometricView.mState); } @Test @@ -258,6 +259,12 @@ public class AuthBiometricViewTest extends SysuiTestCase { public TextView getIndicatorView() { return indicatorView; } + + @Override + public int getDelayAfterError() { + // keep a real delay to test saving in the error state + return BiometricPrompt.HIDE_DIALOG_DELAY; + } }); final String failureMessage = "testFailureMessage";