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

Use ListFormatter to join strings for network dashboard

Browse Source 
Test: robotests
Change-Id: Ie15512acb35c185f9a59bf268303b7993cc40947
This commit is contained in:
Fan Zhang
2018-04-18 17:39:48 -07:00
parent d19398abae
commit 4db6aac464
2 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -23,6 +23,7 @@ import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.Fragment; import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.icu.text.ListFormatter;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.text.BidiFormatter; import android.text.BidiFormatter;
@@ -175,25 +176,22 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override @Override
public void setListening(boolean listening) { public void setListening(boolean listening) {
if (listening) { if (listening) {
String summary = BidiFormatter.getInstance() final List<String> summaries = new ArrayList<>();
.unicodeWrap(mContext.getString(R.string.wifi_settings_title));
summaries.add(BidiFormatter.getInstance()
.unicodeWrap(mContext.getString(R.string.wifi_settings_title)));
if (mMobileNetworkPreferenceController.isAvailable()) { if (mMobileNetworkPreferenceController.isAvailable()) {
final String mobileSettingSummary = mContext.getString( summaries.add(mContext.getString(
R.string.network_dashboard_summary_mobile); R.string.network_dashboard_summary_mobile));
summary = mContext.getString(R.string.join_many_items_middle, summary,
mobileSettingSummary);
} }
final String dataUsageSettingSummary = mContext.getString( final String dataUsageSettingSummary = mContext.getString(
R.string.network_dashboard_summary_data_usage); R.string.network_dashboard_summary_data_usage);
summary = mContext.getString(R.string.join_many_items_middle, summary, summaries.add(dataUsageSettingSummary);
dataUsageSettingSummary);
if (mTetherPreferenceController.isAvailable()) { if (mTetherPreferenceController.isAvailable()) {
final String hotspotSettingSummary = mContext.getString( summaries.add(mContext.getString(
R.string.network_dashboard_summary_hotspot); R.string.network_dashboard_summary_hotspot));
summary = mContext.getString(R.string.join_many_items_middle, summary,
hotspotSettingSummary);
} }
mSummaryLoader.setSummary(this, summary); mSummaryLoader.setSummary(this, ListFormatter.getInstance().format(summaries));
} }
} }
} }

34
tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
View File

@@ -16,18 +16,14 @@
package com.android.settings.network; package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.view.Menu;
import com.android.settings.R;
import com.android.settings.dashboard.SummaryLoader; import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.CategoryKey;
@@ -35,45 +31,41 @@ import com.android.settingslib.drawer.CategoryKey;
import org.junit.Before; import org.junit.Before;
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.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
import java.util.List; import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
public class NetworkDashboardFragmentTest { public class NetworkDashboardFragmentTest {
@Mock
private Context mContext; private Context mContext;
private NetworkDashboardFragment mFragment; private NetworkDashboardFragment mFragment;
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application;
mFragment = new NetworkDashboardFragment(); mFragment = new NetworkDashboardFragment();
} }
@Test @Test
public void testCategory_isNetwork() { public void getCategoryKey_isNetwork() {
assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NETWORK); assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NETWORK);
} }
@Test @Test
public void testSearchIndexProvider_shouldIndexResource() { public void getXmlResourcesToIndex_shouldIncludeFragmentXml() {
final List<SearchIndexableResource> indexRes = final List<SearchIndexableResource> indexRes =
NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex( NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
RuntimeEnvironment.application, mContext,
true /* enabled */); true /* enabled */);
assertThat(indexRes).isNotNull(); assertThat(indexRes).hasSize(1);
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId()); assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
} }
@Test @Test
public void testSummaryProvider_hasMobileAndHotspot_shouldReturnMobileSummary() { public void summaryProviderSetListening_hasMobileAndHotspot_shouldReturnMobileSummary() {
final MobileNetworkPreferenceController mobileNetworkPreferenceController = final MobileNetworkPreferenceController mobileNetworkPreferenceController =
mock(MobileNetworkPreferenceController.class); mock(MobileNetworkPreferenceController.class);
final TetherPreferenceController tetherPreferenceController = final TetherPreferenceController tetherPreferenceController =
@@ -93,15 +85,11 @@ public class NetworkDashboardFragmentTest {
provider.setListening(true); provider.setListening(true);
verify(mContext).getString(R.string.wifi_settings_title); verify(summaryLoader).setSummary(provider, "Wi\u2011Fi, mobile, data usage, and hotspot");
verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
verify(mContext).getString(R.string.network_dashboard_summary_hotspot);
verify(mContext).getString(R.string.network_dashboard_summary_mobile);
verify(mContext, times(3)).getString(R.string.join_many_items_middle, null, null);
} }
@Test @Test
public void testSummaryProvider_noMobileOrHotspot_shouldReturnSimpleSummary() { public void summaryProviderSetListening_noMobileOrHotspot_shouldReturnSimpleSummary() {
final MobileNetworkPreferenceController mobileNetworkPreferenceController = final MobileNetworkPreferenceController mobileNetworkPreferenceController =
mock(MobileNetworkPreferenceController.class); mock(MobileNetworkPreferenceController.class);
final TetherPreferenceController tetherPreferenceController = final TetherPreferenceController tetherPreferenceController =
@@ -121,8 +109,6 @@ public class NetworkDashboardFragmentTest {
provider.setListening(true); provider.setListening(true);
verify(mContext).getString(R.string.wifi_settings_title); verify(summaryLoader).setSummary(provider, "Wi\u2011Fi and data usage");
verify(mContext).getString(R.string.network_dashboard_summary_data_usage);
verify(mContext).getString(R.string.join_many_items_middle, null, null);
} }
} }