From e167286a37dca5cc008ee5fb7660b2b581a11c38 Mon Sep 17 00:00:00 2001 From: Milton Wu Date: Mon, 29 Aug 2022 06:44:32 +0000 Subject: [PATCH] Use Mockito 4.6.1 FingerprintEnrollFindSensorTest Due to java import has been changed in downstream, update import part to use Mockito 4.6.1 inside FingerprintEnrollFindSensorTest to prevent downstream merge conflict. Bug: 243701933 Test: roboTests FingerprintEnrollFindSensorTest Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b Change-Id: Idbf7852d95b248293909f73a0cce69de166931c9 --- .../fingerprint/FingerprintEnrollFindSensorTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 55f0210dad4..ec17a8602c0 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -19,9 +19,9 @@ package com.android.settings.biometrics.fingerprint; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.eq; import static org.mockito.Mockito.verify; import static org.robolectric.RuntimeEnvironment.application;