commit 8d1aa43cc5d330f9169845fa09afa53475f09550
author Fan Wu <cechkahn@google.com> Mon Mar 25 18:23:10 2024 +0800
committer Fan Wu <cechkahn@google.com> Mon Mar 25 18:23:10 2024 +0800
tree cb41ce95c574ca17748beb36faa95c90fd69e107
parent 8e2324d9e0476453e0f60ce02b0e6483c8284376

Remove LooperMode.Legacy usage from settings/biometrics/

Bug: 330824314

Test: atest
Change-Id: I12e0d807c80469f219eb9c57bed1bbbb5da487b1

tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java

diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index ae580d5..36422e2 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -18,13 +18,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.robolectric.RuntimeEnvironment.application;
-
 import android.content.Intent;
 import android.content.res.Resources.Theme;
 import android.hardware.fingerprint.FingerprintManager;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -37,21 +36,25 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
-import org.robolectric.annotation.LooperMode;
+import org.robolectric.shadows.ShadowLooper;
 
 @RunWith(RobolectricTestRunner.class)
-@LooperMode(LooperMode.Mode.LEGACY)
 @Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class})
 public class SetupFingerprintEnrollFindSensorTest {
+    @Rule
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
-    @Mock private FingerprintManager mFingerprintManager;
+    @Mock
+    private FingerprintManager mFingerprintManager;
 
     private Theme mTheme;
 
@@ -59,7 +62,6 @@
 
     @Before
     public void setUp() {
-        MockitoAnnotations.initMocks(this);
         ShadowUtils.setFingerprintManager(mFingerprintManager);
         FakeFeatureFactory.setupForTest();
 
@@ -83,7 +85,8 @@
                 alertDialog);
         final int titleRes = R.string.setup_fingerprint_enroll_skip_title;
 
-        assertThat(application.getString(titleRes)).isEqualTo(shadowAlertDialog.getTitle());
+        assertThat(ApplicationProvider.getApplicationContext().getString(titleRes)).isEqualTo(
+                shadowAlertDialog.getTitle());
     }
 
     @Test
@@ -105,7 +108,7 @@
     private AlertDialog setupAlertDialog() {
         PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
         layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick();
-
+        ShadowLooper.idleMainLooper();
         final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
         assertThat(alertDialog).isNotNull();