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

Merge "Remove ignore annotation @Ignore("b/282413778")" into main

Browse Source
This commit is contained in:
Vincent Wang
2023-07-18 13:52:26 +00:00
committed by Android (Google) Code Review
parent d9203370ff 91d6df7d60
commit 855dc3b606
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/face/FaceUpdater.java
View File

@@ -50,8 +50,9 @@ public class FaceUpdater {
/** Wrapper around the {@link FaceManager#enroll} method. */ /** Wrapper around the {@link FaceManager#enroll} method. */
public void enroll(int userId, byte[] hardwareAuthToken, CancellationSignal cancel, public void enroll(int userId, byte[] hardwareAuthToken, CancellationSignal cancel,
FaceManager.EnrollmentCallback callback, int[] disabledFeatures) { FaceManager.EnrollmentCallback callback, int[] disabledFeatures) {
mFaceManager.enroll(userId, hardwareAuthToken, cancel, this.enroll(userId, hardwareAuthToken, cancel,
new NotifyingEnrollmentCallback(mContext, callback), disabledFeatures); new NotifyingEnrollmentCallback(mContext, callback), disabledFeatures,
null, false);
} }
/** Wrapper around the {@link FaceManager#enroll} method. */ /** Wrapper around the {@link FaceManager#enroll} method. */

18
tests/unit/src/com/android/settings/biometrics/face/FaceUpdaterTest.java
View File

@@ -39,7 +39,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.safetycenter.SafetyCenterManagerWrapper; import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
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.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@@ -100,7 +99,9 @@ public class FaceUpdaterTest {
same(HARDWARE_AUTH_TOKEN), same(HARDWARE_AUTH_TOKEN),
same(CANCELLATION_SIGNAL), same(CANCELLATION_SIGNAL),
callbackCaptor.capture(), callbackCaptor.capture(),
same(DISABLED_FEATURES)); same(DISABLED_FEATURES),
same(null),
eq(false));
FaceManager.EnrollmentCallback callback = callbackCaptor.getValue(); FaceManager.EnrollmentCallback callback = callbackCaptor.getValue();
callback.onEnrollmentError(ERR_MSG_ID, ERR_STRING); callback.onEnrollmentError(ERR_MSG_ID, ERR_STRING);
@@ -126,12 +127,14 @@ public class FaceUpdaterTest {
same(HARDWARE_AUTH_TOKEN), same(HARDWARE_AUTH_TOKEN),
same(CANCELLATION_SIGNAL), same(CANCELLATION_SIGNAL),
callbackCaptor.capture(), callbackCaptor.capture(),
same(DISABLED_FEATURES)); same(DISABLED_FEATURES),
same(null),
eq(false));
FaceManager.EnrollmentCallback callback = callbackCaptor.getValue(); FaceManager.EnrollmentCallback callback = callbackCaptor.getValue();
callback.onEnrollmentProgress(/* remaining= */ 0); callback.onEnrollmentProgress(/* remaining= */ 0);
verify(mSafetyCenterManagerWrapper).isEnabled(mContext); verify(mSafetyCenterManagerWrapper, atLeast(1)).isEnabled(mContext);
} }
@Test @Test
@@ -145,7 +148,9 @@ public class FaceUpdaterTest {
same(HARDWARE_AUTH_TOKEN), same(HARDWARE_AUTH_TOKEN),
same(CANCELLATION_SIGNAL), same(CANCELLATION_SIGNAL),
callbackCaptor.capture(), callbackCaptor.capture(),
same(DISABLED_FEATURES)); same(DISABLED_FEATURES),
same(null),
eq(false));
FaceManager.EnrollmentCallback callback = callbackCaptor.getValue(); FaceManager.EnrollmentCallback callback = callbackCaptor.getValue();
callback.onEnrollmentProgress(/* remaining= */ 1); callback.onEnrollmentProgress(/* remaining= */ 1);
@@ -153,7 +158,6 @@ public class FaceUpdaterTest {
verify(mSafetyCenterManagerWrapper, never()).isEnabled(any()); verify(mSafetyCenterManagerWrapper, never()).isEnabled(any());
} }
@Ignore("b/282413778")
@Test @Test
public void enroll_secondVersion_onEnrollmentCallbacks_triggerGivenCallback() { public void enroll_secondVersion_onEnrollmentCallbacks_triggerGivenCallback() {
ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor = ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor =
@@ -182,7 +186,6 @@ public class FaceUpdaterTest {
.onEnrollmentFrame(HELP_CODE, HELP_MESSAGE, CELL, STAGE, PAN, TILT, DISTANCE); .onEnrollmentFrame(HELP_CODE, HELP_MESSAGE, CELL, STAGE, PAN, TILT, DISTANCE);
} }
@Ignore("b/282413778")
@Test @Test
public void enroll_secondVersion_onEnrollmentSuccess_invokedInteractionWithSafetyCenter() { public void enroll_secondVersion_onEnrollmentSuccess_invokedInteractionWithSafetyCenter() {
ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor = ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor =
@@ -204,7 +207,6 @@ public class FaceUpdaterTest {
verify(mSafetyCenterManagerWrapper).isEnabled(mContext); verify(mSafetyCenterManagerWrapper).isEnabled(mContext);
} }
@Ignore("b/282413778")
@Test @Test
public void enroll_secondVersion_onEnrollmentNotYetFinished_didntInvokeInteractionWithSafetyCenter() { public void enroll_secondVersion_onEnrollmentNotYetFinished_didntInvokeInteractionWithSafetyCenter() {
ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor = ArgumentCaptor<FaceManager.EnrollmentCallback> callbackCaptor =