PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flaky fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-01 13:08:05 +00:00
committed by Android (Google) Code Review
parent aa9e26b73c b19aeb63b6
commit 2e671a0247
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
View File

@@ -91,7 +91,10 @@ public class FingerprintEnrollEnrollingTest {
private Resources.Theme mTheme; private Resources.Theme mTheme;
private static final int TOTAL_ENROLL_STEPS = 25;
private final int[] mSfpsStageThresholds = new int[]{0, 9, 13, 19, 25}; private final int[] mSfpsStageThresholds = new int[]{0, 9, 13, 19, 25};
private final int[] mUdfpsStageThresholds = new int[]{0, 13, 17, 22};
private FingerprintEnrollEnrolling mActivity; private FingerprintEnrollEnrolling mActivity;
private Context mContext; private Context mContext;
@@ -190,19 +193,19 @@ public class FingerprintEnrollEnrollingTest {
public void fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly() { public void fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly() {
initializeActivityFor(TYPE_UDFPS_OPTICAL); initializeActivityFor(TYPE_UDFPS_OPTICAL);
int totalEnrollSteps = 25;
int initStageSteps = -1, initStageRemaining = 0; int initStageSteps = -1, initStageRemaining = 0;
final int totalStages = mUdfpsStageThresholds.length;
when(mSidecar.getEnrollmentSteps()).thenReturn(initStageSteps); when(mSidecar.getEnrollmentSteps()).thenReturn(initStageSteps);
when(mSidecar.getEnrollmentRemaining()).thenReturn(initStageRemaining); when(mSidecar.getEnrollmentRemaining()).thenReturn(initStageRemaining);
mActivity.onEnrollmentProgressChange(initStageSteps, initStageRemaining); mActivity.onEnrollmentProgressChange(initStageSteps, initStageRemaining);
when(mSidecar.getEnrollmentSteps()).thenReturn(totalEnrollSteps); when(mSidecar.getEnrollmentSteps()).thenReturn(TOTAL_ENROLL_STEPS);
for (int remaining = totalEnrollSteps; remaining > 0; remaining--) { for (int remaining = TOTAL_ENROLL_STEPS; remaining > 0; remaining--) {
when(mSidecar.getEnrollmentRemaining()).thenReturn(remaining); when(mSidecar.getEnrollmentRemaining()).thenReturn(remaining);
mActivity.onEnrollmentProgressChange(totalEnrollSteps, remaining); mActivity.onEnrollmentProgressChange(TOTAL_ENROLL_STEPS, remaining);
} }
List<Integer> expectedLottieAssetOrder = List.of( List<Integer> expectedLottieAssetOrder = List.of(
@@ -213,7 +216,7 @@ public class FingerprintEnrollEnrollingTest {
); );
ArgumentCaptor<Integer> lottieAssetCaptor = ArgumentCaptor.forClass(Integer.class); ArgumentCaptor<Integer> lottieAssetCaptor = ArgumentCaptor.forClass(Integer.class);
verify(mIllustrationLottie, times(4)).setAnimation(lottieAssetCaptor.capture()); verify(mIllustrationLottie, times(totalStages)).setAnimation(lottieAssetCaptor.capture());
List<Integer> observedLottieAssetOrder = lottieAssetCaptor.getAllValues(); List<Integer> observedLottieAssetOrder = lottieAssetCaptor.getAllValues();
assertThat(observedLottieAssetOrder).isEqualTo(expectedLottieAssetOrder); assertThat(observedLottieAssetOrder).isEqualTo(expectedLottieAssetOrder);
} }
@@ -222,7 +225,6 @@ public class FingerprintEnrollEnrollingTest {
public void fingerprintSfpsEnroll_PlaysAllAnimationsAssetsCorrectly() { public void fingerprintSfpsEnroll_PlaysAllAnimationsAssetsCorrectly() {
initializeActivityFor(TYPE_POWER_BUTTON); initializeActivityFor(TYPE_POWER_BUTTON);
int totalEnrollSteps = 25;
int initStageSteps = -1, initStageRemaining = 0; int initStageSteps = -1, initStageRemaining = 0;
when(mSidecar.getEnrollmentSteps()).thenReturn(initStageSteps); when(mSidecar.getEnrollmentSteps()).thenReturn(initStageSteps);
@@ -230,11 +232,11 @@ public class FingerprintEnrollEnrollingTest {
mActivity.onEnrollmentProgressChange(initStageSteps, initStageRemaining); mActivity.onEnrollmentProgressChange(initStageSteps, initStageRemaining);
when(mSidecar.getEnrollmentSteps()).thenReturn(totalEnrollSteps); when(mSidecar.getEnrollmentSteps()).thenReturn(TOTAL_ENROLL_STEPS);
for (int remaining = totalEnrollSteps; remaining > 0; remaining--) { for (int remaining = TOTAL_ENROLL_STEPS; remaining > 0; remaining--) {
when(mSidecar.getEnrollmentRemaining()).thenReturn(remaining); when(mSidecar.getEnrollmentRemaining()).thenReturn(remaining);
mActivity.onEnrollmentProgressChange(totalEnrollSteps, remaining); mActivity.onEnrollmentProgressChange(TOTAL_ENROLL_STEPS, remaining);
} }
List<Integer> expectedLottieAssetOrder = List.of( List<Integer> expectedLottieAssetOrder = List.of(
@@ -360,6 +362,16 @@ public class FingerprintEnrollEnrollingTest {
doReturn(true).when(mSidecar).isEnrolling(); doReturn(true).when(mSidecar).isEnrolling();
} }
if (sensorType == TYPE_UDFPS_OPTICAL) {
// UDFPS : STAGE_CENTER = 0, ... , STAGE_RIGHT_EDGE = 3
final int totalStages = mUdfpsStageThresholds.length - 1;
for (int stage = 0; stage <= totalStages; stage++) {
doReturn(mUdfpsStageThresholds[stage]).when(mActivity).getStageThresholdSteps(
stage);
}
doReturn(true).when(mSidecar).isEnrolling();
}
ActivityController.of(mActivity).create(savedInstanceState); ActivityController.of(mActivity).create(savedInstanceState);
mTheme = mActivity.getTheme(); mTheme = mActivity.getTheme();
} }