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

Update summary text for Trust agent.

Browse Source 
Update the summary text to show the number of active trust agent.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
This commit is contained in:
Doris Ling
2017-04-06 14:22:18 -07:00
parent 4bbfdb13e7
commit 2db8c867d1
3 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/robotests/src/com/android/settings/SecuritySettingsTest.java
View File

@@ -16,13 +16,17 @@
package com.android.settings;
import android.app.Activity;
import android.content.Context;
import android.content.IContentProvider;
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
import android.os.Bundle;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
@@ -39,13 +43,17 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
import java.util.Map;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -121,7 +129,6 @@ public class SecuritySettingsTest {
verify(mContext).getString(R.string.security_dashboard_summary);
}
@Test
public void testGetPackageVerifierSummary_nullInput() {
assertThat(mSummaryProvider.getPackageVerifierSummary(null)).isNull();
@@ -155,4 +162,28 @@ public class SecuritySettingsTest {
assertThat(mSummaryProvider.getPackageVerifierSummary(mDashboardCategory))
.isEqualTo(MOCK_SUMMARY);
}
@Test
public void testInitTrustAgentPreference_secure_shouldSetSummaryToNumberOfTrustAgent() {
final Preference preference = mock(Preference.class);
final PreferenceScreen screen = mock(PreferenceScreen.class);
when(screen.findPreference(SecuritySettings.KEY_MANAGE_TRUST_AGENTS))
.thenReturn(preference);
final LockPatternUtils utils = mock(LockPatternUtils.class);
when(utils.isSecure(anyInt())).thenReturn(true);
final Context context = ShadowApplication.getInstance().getApplicationContext();
final Activity activity = mock(Activity.class);
when(activity.getResources()).thenReturn(context.getResources());
final SecuritySettings securitySettings = spy(new SecuritySettings());
when(securitySettings.getActivity()).thenReturn(activity);
ReflectionHelpers.setField(securitySettings, "mLockPatternUtils", utils);
securitySettings.initTrustAgentPreference(screen, 0);
verify(preference).setSummary(R.string.manage_trust_agents_summary);
securitySettings.initTrustAgentPreference(screen, 2);
verify(preference).setSummary(context.getResources().getQuantityString(
R.plurals.manage_trust_agents_summary_on, 2, 2));
}
}