Merge "Added basic SecuritySettingsPref test" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
b87ada7c93
@@ -16,26 +16,42 @@
|
|||||||
|
|
||||||
package com.android.settings.security;
|
package com.android.settings.security;
|
||||||
|
|
||||||
|
import static android.content.Context.FACE_SERVICE;
|
||||||
|
import static android.content.Context.FINGERPRINT_SERVICE;
|
||||||
|
import static android.content.pm.PackageManager.FEATURE_FACE;
|
||||||
|
import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
|
||||||
|
|
||||||
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
|
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
|
||||||
import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_INCLUDE_PREF_SCREEN;
|
import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_INCLUDE_PREF_SCREEN;
|
||||||
import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_KEY;
|
import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_KEY;
|
||||||
|
|
||||||
import static com.google.common.truth.Truth.assertThat;
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
import android.annotation.XmlRes;
|
import android.annotation.XmlRes;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.hardware.face.FaceManager;
|
||||||
|
import android.hardware.fingerprint.FingerprintManager;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.os.Looper;
|
||||||
import android.provider.SearchIndexableResource;
|
import android.provider.SearchIndexableResource;
|
||||||
|
|
||||||
|
import androidx.test.annotation.UiThreadTest;
|
||||||
import androidx.test.core.app.ApplicationProvider;
|
import androidx.test.core.app.ApplicationProvider;
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import com.android.settings.biometrics.combination.CombinedBiometricStatusPreferenceController;
|
||||||
|
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
|
||||||
|
import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
|
||||||
import com.android.settings.core.PreferenceXmlParserUtils;
|
import com.android.settings.core.PreferenceXmlParserUtils;
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settings.security.trustagent.TrustAgentManager;
|
import com.android.settings.security.trustagent.TrustAgentManager;
|
||||||
import com.android.settings.testutils.FakeFeatureFactory;
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
@@ -52,26 +68,44 @@ public class SecuritySettingsTest {
|
|||||||
|
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider;
|
private SecuritySettingsFeatureProvider mSecuritySettingsFeatureProvider;
|
||||||
|
private SecuritySettings mSecuritySettings;
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private TrustAgentManager mTrustAgentManager;
|
private TrustAgentManager mTrustAgentManager;
|
||||||
|
@Mock
|
||||||
|
private FaceManager mFaceManager;
|
||||||
|
@Mock
|
||||||
|
private FingerprintManager mFingerprintManager;
|
||||||
|
@Mock
|
||||||
|
private PackageManager mPackageManager;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
|
@UiThreadTest
|
||||||
public void setup() {
|
public void setup() {
|
||||||
|
if (Looper.myLooper() == null) {
|
||||||
|
Looper.prepare();
|
||||||
|
}
|
||||||
|
|
||||||
MockitoAnnotations.initMocks(this);
|
MockitoAnnotations.initMocks(this);
|
||||||
mContext = ApplicationProvider.getApplicationContext();
|
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||||
|
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
||||||
|
when(mPackageManager.hasSystemFeature(FEATURE_FACE)).thenReturn(true);
|
||||||
|
when(mPackageManager.hasSystemFeature(FEATURE_FINGERPRINT)).thenReturn(true);
|
||||||
|
doReturn(mFaceManager).when(mContext).getSystemService(FACE_SERVICE);
|
||||||
|
doReturn(mFingerprintManager).when(mContext).getSystemService(FINGERPRINT_SERVICE);
|
||||||
FakeFeatureFactory mFeatureFactory = FakeFeatureFactory.setupForTest();
|
FakeFeatureFactory mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||||
mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider();
|
|
||||||
SecurityFeatureProvider mSecurityFeatureProvider =
|
SecurityFeatureProvider mSecurityFeatureProvider =
|
||||||
mFeatureFactory.getSecurityFeatureProvider();
|
mFeatureFactory.getSecurityFeatureProvider();
|
||||||
|
|
||||||
when(mSecurityFeatureProvider.getTrustAgentManager()).thenReturn(mTrustAgentManager);
|
when(mSecurityFeatureProvider.getTrustAgentManager()).thenReturn(mTrustAgentManager);
|
||||||
|
mSecuritySettingsFeatureProvider = mFeatureFactory.getSecuritySettingsFeatureProvider();
|
||||||
|
mSecuritySettings = new SecuritySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void noAlternativeFragmentAvailable_pageIndexIncluded() throws Exception {
|
public void noAlternativeFragmentAvailable_pageIndexIncluded() throws Exception {
|
||||||
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment())
|
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()).thenReturn(
|
||||||
.thenReturn(false);
|
false);
|
||||||
BaseSearchIndexProvider indexProvider = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER;
|
BaseSearchIndexProvider indexProvider = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER;
|
||||||
|
|
||||||
List<String> allXmlKeys = getAllXmlKeys(indexProvider);
|
List<String> allXmlKeys = getAllXmlKeys(indexProvider);
|
||||||
@@ -83,8 +117,8 @@ public class SecuritySettingsTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void alternativeFragmentAvailable_pageIndexExcluded() throws Exception {
|
public void alternativeFragmentAvailable_pageIndexExcluded() throws Exception {
|
||||||
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment())
|
when(mSecuritySettingsFeatureProvider.hasAlternativeSecuritySettingsFragment()).thenReturn(
|
||||||
.thenReturn(true);
|
true);
|
||||||
BaseSearchIndexProvider indexProvider = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER;
|
BaseSearchIndexProvider indexProvider = SecuritySettings.SEARCH_INDEX_DATA_PROVIDER;
|
||||||
|
|
||||||
List<String> allXmlKeys = getAllXmlKeys(indexProvider);
|
List<String> allXmlKeys = getAllXmlKeys(indexProvider);
|
||||||
@@ -94,6 +128,45 @@ public class SecuritySettingsTest {
|
|||||||
assertThat(allXmlKeys).isEmpty();
|
assertThat(allXmlKeys).isEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@UiThreadTest
|
||||||
|
public void preferenceController_containsFaceWhenAvailable() {
|
||||||
|
when(mFaceManager.isHardwareDetected()).thenReturn(true);
|
||||||
|
when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
|
||||||
|
final List<AbstractPreferenceController> controllers =
|
||||||
|
mSecuritySettings.createPreferenceControllers(mContext);
|
||||||
|
|
||||||
|
assertThat(isFacePrefAvailable(controllers)).isTrue();
|
||||||
|
assertThat(isFingerprintPrefAvailable(controllers)).isFalse();
|
||||||
|
assertThat(isCombinedPrefAvailable(controllers)).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@UiThreadTest
|
||||||
|
public void preferenceController_containsFingerprintWhenAvailable() {
|
||||||
|
when(mFaceManager.isHardwareDetected()).thenReturn(false);
|
||||||
|
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
|
||||||
|
final List<AbstractPreferenceController> controllers =
|
||||||
|
mSecuritySettings.createPreferenceControllers(mContext);
|
||||||
|
|
||||||
|
assertThat(isFacePrefAvailable(controllers)).isFalse();
|
||||||
|
assertThat(isFingerprintPrefAvailable(controllers)).isTrue();
|
||||||
|
assertThat(isCombinedPrefAvailable(controllers)).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@UiThreadTest
|
||||||
|
public void preferenceController_containsCombinedBiometricWhenAvailable() {
|
||||||
|
when(mFaceManager.isHardwareDetected()).thenReturn(true);
|
||||||
|
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
|
||||||
|
final List<AbstractPreferenceController> controllers =
|
||||||
|
mSecuritySettings.createPreferenceControllers(mContext);
|
||||||
|
|
||||||
|
assertThat(isFacePrefAvailable(controllers)).isFalse();
|
||||||
|
assertThat(isFingerprintPrefAvailable(controllers)).isFalse();
|
||||||
|
assertThat(isCombinedPrefAvailable(controllers)).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
private List<String> getAllXmlKeys(BaseSearchIndexProvider indexProvider) throws Exception {
|
private List<String> getAllXmlKeys(BaseSearchIndexProvider indexProvider) throws Exception {
|
||||||
final List<SearchIndexableResource> resources = indexProvider.getXmlResourcesToIndex(
|
final List<SearchIndexableResource> resources = indexProvider.getXmlResourcesToIndex(
|
||||||
mContext, true /* not used*/);
|
mContext, true /* not used*/);
|
||||||
@@ -109,11 +182,29 @@ public class SecuritySettingsTest {
|
|||||||
|
|
||||||
private List<String> getKeysFromXml(@XmlRes int xmlResId) throws Exception {
|
private List<String> getKeysFromXml(@XmlRes int xmlResId) throws Exception {
|
||||||
final List<String> keys = new ArrayList<>();
|
final List<String> keys = new ArrayList<>();
|
||||||
final List<Bundle> metadata = PreferenceXmlParserUtils
|
final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext, xmlResId,
|
||||||
.extractMetadata(mContext, xmlResId, FLAG_NEED_KEY | FLAG_INCLUDE_PREF_SCREEN);
|
FLAG_NEED_KEY | FLAG_INCLUDE_PREF_SCREEN);
|
||||||
for (Bundle bundle : metadata) {
|
for (Bundle bundle : metadata) {
|
||||||
keys.add(bundle.getString(METADATA_KEY));
|
keys.add(bundle.getString(METADATA_KEY));
|
||||||
}
|
}
|
||||||
return keys;
|
return keys;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boolean isFacePrefAvailable(List<AbstractPreferenceController> controllers) {
|
||||||
|
return controllers.stream().filter(
|
||||||
|
controller -> controller instanceof FaceStatusPreferenceController
|
||||||
|
&& controller.isAvailable()).count() == 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean isFingerprintPrefAvailable(List<AbstractPreferenceController> controllers) {
|
||||||
|
return controllers.stream().filter(
|
||||||
|
controller -> controller instanceof FingerprintStatusPreferenceController
|
||||||
|
&& controller.isAvailable()).count() == 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean isCombinedPrefAvailable(List<AbstractPreferenceController> controllers) {
|
||||||
|
return controllers.stream().filter(
|
||||||
|
controller -> controller instanceof CombinedBiometricStatusPreferenceController
|
||||||
|
&& controller.isAvailable()).count() == 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user