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

Merge "Cleanup some plurals in Settings Change <one> to <1> in string res file, and update related java files. Test: Update, existing test still pass. bug: 199230342"

Browse Source
This commit is contained in:
XingHai Lu
2022-12-23 02:34:31 +00:00
committed by Android (Google) Code Review
parent 5e9e92b10a 897fd74731
commit 7f919a3c1b
31 changed files with 281 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
View File

@@ -33,6 +33,7 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -80,6 +81,8 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase {
}).when(mFeatureFactory.applicationFeatureProvider)
.calculateNumberOfAppsWithAdminGrantedPermissions(eq(mPermissions),
eq(async), any());
when(mContext.getResources().getString(R.string.enterprise_privacy_number_packages_lower_bound))
.thenReturn("Minimum # apps");
}
@Test
@@ -92,8 +95,8 @@ public abstract class AdminGrantedPermissionsPreferenceControllerTestBase {
assertThat(preference.isVisible()).isFalse();
setNumberOfPackagesWithAdminGrantedPermissions(20, true /* async */);
when(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))
when(StringUtil.getIcuPluralsString(mContext, 20,
R.string.enterprise_privacy_number_packages_lower_bound))
.thenReturn("minimum 20 apps");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");

9
tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,6 +31,7 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -59,8 +62,10 @@ public abstract class CaCertsPreferenceControllerTestBase {
public void testUpdateState() {
final Preference preference = new Preference(mContext, null, 0, 0);
when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_ca_certs,
10, 10)).thenReturn("10 certs");
when(mContext.getResources().getString(R.string.enterprise_privacy_number_ca_certs))
.thenReturn("# certs");
when(StringUtil.getIcuPluralsString(mContext, 10,
R.string.enterprise_privacy_number_ca_certs)).thenReturn("10 certs");
mockGetNumberOfCaCerts(10);
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("10 certs");

7
tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
View File

@@ -33,6 +33,7 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -75,6 +76,8 @@ public class EnterpriseInstalledPackagesPreferenceControllerTest {
}
}).when(mFeatureFactory.applicationFeatureProvider)
.calculateNumberOfPolicyInstalledApps(eq(async), any());
when(mContext.getResources().getString(R.string.enterprise_privacy_number_packages_lower_bound))
.thenReturn("Minimum # apps");
}
@Test
@@ -87,8 +90,8 @@ public class EnterpriseInstalledPackagesPreferenceControllerTest {
assertThat(preference.isVisible()).isFalse();
setNumberOfEnterpriseInstalledPackages(20, true /* async */);
when(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_packages_lower_bound, 20, 20))
when(StringUtil.getIcuPluralsString(mContext, 20,
R.string.enterprise_privacy_number_packages_lower_bound))
.thenReturn("minimum 20 apps");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("minimum 20 apps");

2
tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
View File

@@ -93,7 +93,7 @@ public class EnterpriseSetDefaultAppsListPreferenceControllerTest {
when(mContext.getString(R.string.default_browser_title)).thenReturn(BROWSER_TITLE);
Resources resources = spy(mContext.getResources());
when(mContext.getResources()).thenReturn(resources);
when(resources.getQuantityString(R.plurals.default_phone_app_title, 2))
when(resources.getString(R.string.default_phone_app_title))
.thenReturn(PHONE_TITLE);
when(mContext.getString(R.string.app_names_concatenation_template_2))
.thenReturn("%1$s, %2$s");

7
tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
View File

@@ -39,6 +39,7 @@ import com.android.settings.R;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -101,8 +102,10 @@ public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CALENDAR.getIntents(), 16);
setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CONTACTS.getIntents(), 32);
setEnterpriseSetDefaultApps(EnterpriseDefaultApps.PHONE.getIntents(), 64);
when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_packages,
127, 127)).thenReturn("127 apps");
when(mContext.getResources().getString(R.string.enterprise_privacy_number_packages))
.thenReturn("# apps");
when(StringUtil.getIcuPluralsString(mContext, 127,
R.string.enterprise_privacy_number_packages)).thenReturn("127 apps");
// As setEnterpriseSetDefaultApps uses fake Users, we need to list them via UserManager.
configureUsers(64);

7
tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
View File

@@ -29,6 +29,7 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -68,8 +69,10 @@ public abstract class FailedPasswordWipePreferenceControllerTestBase {
final Preference preference = new Preference(mContext, null, 0, 0);
setMaximumFailedPasswordsBeforeWipe(10);
when(mContext.getResources().getQuantityString(
R.plurals.enterprise_privacy_number_failed_password_wipe, 10, 10))
when(mContext.getResources().getString(
R.string.enterprise_privacy_number_failed_password_wipe)).thenReturn("# attempts");
when(StringUtil.getIcuPluralsString(mContext, 10,
R.string.enterprise_privacy_number_failed_password_wipe))
.thenReturn("10 attempts");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("10 attempts");

4
tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
View File

@@ -28,6 +28,7 @@ import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -70,7 +71,8 @@ public class ManageDeviceAdminPreferenceControllerTest {
when(mFeatureFactory.enterprisePrivacyFeatureProvider
.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile()).thenReturn(5);
when(mResources.getQuantityString(R.plurals.number_of_device_admins, 5, 5))
when(mResources.getString(R.string.number_of_device_admins)).thenReturn("# active apps");
when(StringUtil.getIcuPluralsString(mContext, 5, R.string.number_of_device_admins))
.thenReturn("5 active apps");
mController.updateState(preference);
assertThat(preference.getSummary()).isEqualTo("5 active apps");

18
tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
View File

@@ -13,6 +13,7 @@ import androidx.lifecycle.LifecycleOwner;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -22,6 +23,9 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import java.util.HashMap;
import java.util.Map;
@RunWith(RobolectricTestRunner.class)
public class AppLocationPermissionPreferenceControllerTest {
@@ -86,8 +90,11 @@ public class AppLocationPermissionPreferenceControllerTest {
mController.mNumHasLocation = 1;
mController.mNumTotal = 1;
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getQuantityString(
R.plurals.location_app_permission_summary_location_on, 1, 1, 1));
Map<String, Object> arguments = new HashMap<>();
arguments.put("count", 1);
arguments.put("total", 1);
assertThat(mController.getSummary()).isEqualTo(StringUtil.getIcuPluralsString(mContext,
arguments, R.string.location_app_permission_summary_location_on));
}
@Test
@@ -96,7 +103,10 @@ public class AppLocationPermissionPreferenceControllerTest {
mController.mNumHasLocation = 5;
mController.mNumTotal = 10;
assertThat(mController.getSummary()).isEqualTo(mContext.getResources().getQuantityString(
R.plurals.location_app_permission_summary_location_on, 5, 5, 10));
Map<String, Object> arguments = new HashMap<>();
arguments.put("count", 5);
arguments.put("total", 10);
assertThat(mController.getSummary()).isEqualTo(StringUtil.getIcuPluralsString(mContext,
arguments, R.string.location_app_permission_summary_location_on));
}
}

16
tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
View File

@@ -75,6 +75,7 @@ import com.android.settings.wifi.ConnectedWifiEntryPreference;
import com.android.settings.wifi.LongPressWifiEntryPreference;
import com.android.settings.wifi.WifiConfigController2;
import com.android.settings.wifi.WifiDialog2;
import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.LayoutPreference;
import com.android.wifitrackerlib.WifiEntry;
@@ -206,9 +207,8 @@ public class NetworkProviderSettingsTest {
assertThat(mNetworkProviderSettings.mSavedNetworksPreference.isVisible()).isTrue();
assertThat(mNetworkProviderSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.wifi_saved_access_points_summary,
NUM_NETWORKS, NUM_NETWORKS));
StringUtil.getIcuPluralsString(mContext, NUM_NETWORKS,
R.string.wifi_saved_access_points_summary));
}
@Test
@@ -220,9 +220,8 @@ public class NetworkProviderSettingsTest {
assertThat(mNetworkProviderSettings.mSavedNetworksPreference.isVisible()).isTrue();
assertThat(mNetworkProviderSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.wifi_saved_passpoint_access_points_summary,
NUM_NETWORKS, NUM_NETWORKS));
StringUtil.getIcuPluralsString(mContext, NUM_NETWORKS,
R.string.wifi_saved_passpoint_access_points_summary));
}
@Test
@@ -234,9 +233,8 @@ public class NetworkProviderSettingsTest {
assertThat(mNetworkProviderSettings.mSavedNetworksPreference.isVisible()).isTrue();
assertThat(mNetworkProviderSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.wifi_saved_all_access_points_summary,
NUM_NETWORKS * 2, NUM_NETWORKS * 2));
StringUtil.getIcuPluralsString(mContext, NUM_NETWORKS * 2,
R.string.wifi_saved_all_access_points_summary));
}
@Test

5
tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
View File

@@ -29,6 +29,7 @@ import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.utils.StringUtil;
import org.junit.Before;
import org.junit.Test;
@@ -114,8 +115,8 @@ public class ManageTrustAgentsPreferenceControllerTest {
assertThat(mPreference.isEnabled()).isTrue();
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getResources().getQuantityString(
R.plurals.manage_trust_agents_summary_on, 1, 1));
.isEqualTo(StringUtil.getIcuPluralsString(mContext, 1,
R.string.manage_trust_agents_summary_on));
}
@Test

16
tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
View File

@@ -56,6 +56,7 @@ import com.android.settings.R;
import com.android.settings.datausage.DataUsagePreference;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settingslib.utils.StringUtil;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiPickerTracker;
@@ -130,9 +131,8 @@ public class WifiSettingsTest {
assertThat(mWifiSettings.mSavedNetworksPreference.isVisible()).isTrue();
assertThat(mWifiSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.wifi_saved_access_points_summary,
NUM_NETWORKS, NUM_NETWORKS));
StringUtil.getIcuPluralsString(mContext, NUM_NETWORKS,
R.string.wifi_saved_access_points_summary));
}
@Test
@@ -144,9 +144,8 @@ public class WifiSettingsTest {
assertThat(mWifiSettings.mSavedNetworksPreference.isVisible()).isTrue();
assertThat(mWifiSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.wifi_saved_passpoint_access_points_summary,
NUM_NETWORKS, NUM_NETWORKS));
StringUtil.getIcuPluralsString(mContext, NUM_NETWORKS,
R.string.wifi_saved_passpoint_access_points_summary));
}
@Test
@@ -158,9 +157,8 @@ public class WifiSettingsTest {
assertThat(mWifiSettings.mSavedNetworksPreference.isVisible()).isTrue();
assertThat(mWifiSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
mContext.getResources().getQuantityString(
R.plurals.wifi_saved_all_access_points_summary,
NUM_NETWORKS*2, NUM_NETWORKS*2));
StringUtil.getIcuPluralsString(mContext, NUM_NETWORKS * 2,
R.string.wifi_saved_all_access_points_summary));
}
@Test