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

Fix DataUsageSummary non-indexable keys

Browse Source 
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.

Change-Id: I2097a3ac4ffd714b60299c07b29c81f246e414eb
Merged-In: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests
This commit is contained in:
Matthew Fritze
2017-07-31 09:44:57 -07:00
parent b79d38f2f3
commit 5c6af383af
3 changed files with 83 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
View File

@@ -27,6 +27,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowDataUsageSummary;
import com.android.settingslib.NetworkPolicyEditor;
import org.junit.Before;
@@ -149,27 +150,50 @@ public class DataUsageSummaryTest {
}
@Test
@Config(shadows = ShadowDataUsageSummary.class)
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
ShadowDataUsageSummary.IS_WIFI_SUPPORTED = true;
ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = true;
final List<String> niks = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context);
final List<String> keys = new ArrayList<>();
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_wifi));
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage));
keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_cellular));
assertThat(keys).containsAllIn(niks);
}
@Test
@Config(shadows = ShadowConnectivityManager.class)
public void testNonIndexableKeys_hasMobileData_restrictedAccessesAdded() {
ShadowConnectivityManager.setIsNetworkSupported(true);
@Config(shadows = ShadowDataUsageSummary.class)
public void testNonIndexableKeys_hasMobileData_hasWifi_allNonIndexableKeysAdded() {
ShadowDataUsageSummary.IS_WIFI_SUPPORTED = false;
ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = false;
List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
assertThat(keys).contains(DataUsageSummary.KEY_RESTRICT_BACKGROUND);
// Mobile data keys
assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_CATEGORY);
assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_DATA_USAGE_TOGGLE);
assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_DATA_USAGE);
assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_BILLING_CYCLE);
// Wifi keys
assertThat(keys).contains(DataUsageSummary.KEY_WIFI_DATA_USAGE);
assertThat(keys).contains(DataUsageSummary.KEY_NETWORK_RESTRICTIONS);
ShadowConnectivityManager.setIsNetworkSupported(false);
assertThat(keys).contains(DataUsageSummary.KEY_WIFI_USAGE_TITLE);
}
@Test
@Config(shadows = ShadowDataUsageSummary.class)
public void testNonIndexableKeys_noMobile_noWifi_limitedNonIndexableKeys() {
ShadowDataUsageSummary.IS_WIFI_SUPPORTED = true;
ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = true;
List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
assertThat(keys).containsExactly(DataUsageSummary.KEY_WIFI_USAGE_TITLE);
}
}

24
tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageSummary.java Normal file
View File

@@ -0,0 +1,24 @@
package com.android.settings.testutils.shadow;
import android.content.Context;
import com.android.settings.datausage.DataUsageSummary;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@Implements(DataUsageSummary.class)
public class ShadowDataUsageSummary {
public static boolean IS_MOBILE_DATA_SUPPORTED = true;
public static boolean IS_WIFI_SUPPORTED = true;
@Implementation
public static boolean hasMobileData(Context context) {
return IS_MOBILE_DATA_SUPPORTED;
}
@Implementation
public static boolean hasWifiRadio(Context context) {
return IS_WIFI_SUPPORTED;
}
}