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

Remove LooperMode.Legacy usage from settings/biometrics/

Browse Source 
Bug: 330824314

Test: atest
Change-Id: I12e0d807c80469f219eb9c57bed1bbbb5da487b1
This commit is contained in:
Fan Wu
2024-03-25 18:23:10 +08:00
parent 8e2324d9e0
commit 8d1aa43cc5
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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