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

Merge "Modified fingerprint enroll test" into udc-dev am: c75baeb774

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21676287

Change-Id: I038f596beeeae897ddfea95cea5039c4925d3055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joshua Mccloskey
2023-03-01 22:17:52 +00:00
committed by Automerger Merge Worker
parent b6a93a192b c75baeb774
commit 11bc7f02bb
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.widget.RingProgressBar; import com.android.settings.widget.RingProgressBar;
import com.airbnb.lottie.LottieAnimationView; import com.airbnb.lottie.LottieAnimationView;
import com.airbnb.lottie.LottieTask;
import com.google.android.setupdesign.GlifLayout; import com.google.android.setupdesign.GlifLayout;
import org.junit.Before; import org.junit.Before;
@@ -175,6 +176,7 @@ public class FingerprintEnrollEnrollingTest {
@Test @Test
public void fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly() { public void fingerprintUdfpsOverlayEnrollment_PlaysAllAnimationsAssetsCorrectly() {
initializeActivityFor(TYPE_UDFPS_OPTICAL); initializeActivityFor(TYPE_UDFPS_OPTICAL);
LottieTask.EXECUTOR = mContext.getMainExecutor();
int initStageSteps = -1, initStageRemaining = 0; int initStageSteps = -1, initStageRemaining = 0;
final int totalStages = mUdfpsStageThresholds.length; final int totalStages = mUdfpsStageThresholds.length;
@@ -191,17 +193,8 @@ public class FingerprintEnrollEnrollingTest {
mActivity.onEnrollmentProgressChange(TOTAL_ENROLL_STEPS, remaining); mActivity.onEnrollmentProgressChange(TOTAL_ENROLL_STEPS, remaining);
} }
List<Integer> expectedLottieAssetOrder = List.of(
R.raw.udfps_center_hint_lottie,
R.raw.udfps_tip_hint_lottie,
R.raw.udfps_left_edge_hint_lottie,
R.raw.udfps_right_edge_hint_lottie
);
ArgumentCaptor<Integer> lottieAssetCaptor = ArgumentCaptor.forClass(Integer.class); verify(mIllustrationLottie, times(totalStages)).setComposition(any());
verify(mIllustrationLottie, times(totalStages)).setAnimation(lottieAssetCaptor.capture());
List<Integer> observedLottieAssetOrder = lottieAssetCaptor.getAllValues();
assertThat(observedLottieAssetOrder).isEqualTo(expectedLottieAssetOrder);
} }
@Test @Test
@@ -328,8 +321,9 @@ public class FingerprintEnrollEnrollingTest {
} }
@Test @Test
public void fingerprintSfpsEnroll_PlaysAllAnimationsAssetsCorrectly() { public void fingerprintSfpsEnroll_PlaysAnimations() {
initializeActivityFor(TYPE_POWER_BUTTON); initializeActivityFor(TYPE_POWER_BUTTON);
LottieTask.EXECUTOR = mContext.getMainExecutor();
int initStageSteps = -1, initStageRemaining = 0; int initStageSteps = -1, initStageRemaining = 0;
@@ -345,18 +339,8 @@ public class FingerprintEnrollEnrollingTest {
mActivity.onEnrollmentProgressChange(TOTAL_ENROLL_STEPS, remaining); mActivity.onEnrollmentProgressChange(TOTAL_ENROLL_STEPS, remaining);
} }
List<Integer> expectedLottieAssetOrder = List.of(
R.raw.sfps_lottie_no_animation,
R.raw.sfps_lottie_pad_center,
R.raw.sfps_lottie_tip,
R.raw.sfps_lottie_left_edge,
R.raw.sfps_lottie_right_edge
);
ArgumentCaptor<Integer> lottieAssetCaptor = ArgumentCaptor.forClass(Integer.class); verify(mIllustrationLottie, times(5)).setComposition(any());
verify(mIllustrationLottie, times(5)).setAnimation(lottieAssetCaptor.capture());
List<Integer> observedLottieAssetOrder = lottieAssetCaptor.getAllValues();
assertThat(observedLottieAssetOrder).isEqualTo(expectedLottieAssetOrder);
} }
@Test @Test