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

Remove FingerprintManagerWrapper

Browse Source 
No longer needed after robolectric migration

Bug: 76167422
Test: robotests
Change-Id: I922cde8ac3667081a512cf899af86f68b24485a6
This commit is contained in:
Fan Zhang
2018-03-30 16:30:31 -07:00
parent e645558049
commit 1b9b1a2311
9 changed files with 28 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
View File

@@ -17,8 +17,10 @@
package com.android.settings.password;
import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS;
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
.HIDE_DISABLED_PREFS;
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
.MINIMUM_QUALITY_KEY;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
@@ -34,10 +36,10 @@ import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.FingerprintManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -53,18 +55,18 @@ public final class SetNewPasswordControllerTest {
private static final long FINGERPRINT_CHALLENGE = -9876512313131L;
@Mock
PackageManager mPackageManager;
private PackageManager mPackageManager;
@Mock
FingerprintManagerWrapper mFingerprintManager;
private FingerprintManager mFingerprintManager;
@Mock
DevicePolicyManager mDevicePolicyManager;
private DevicePolicyManager mDevicePolicyManager;
@Mock
private SetNewPasswordController.Ui mUi;
private SetNewPasswordController mSetNewPasswordController;
@Before
public void setUp() {
public void setUp() {
MockitoAnnotations.initMocks(this);
mSetNewPasswordController = new SetNewPasswordController(
CURRENT_USER_ID, mPackageManager, mFingerprintManager, mDevicePolicyManager, mUi);