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

resolve merge conflicts of ac0fd76521 to master

Browse Source 
Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.
This commit is contained in:
Rajeev Kumar
2017-10-23 22:35:35 -07:00
parent 43ff3b4202 ac0fd76521
commit 331a4459f0
4 changed files with 2 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/robotests/src/com/android/settings/datausage/DataPlanUsageSummaryTest.java
View File

@@ -33,17 +33,13 @@ import android.net.wifi.WifiManager;
import com.android.settings.R;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
import com.android.settingslib.NetworkPolicyEditor;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
@@ -128,53 +124,6 @@ public class DataPlanUsageSummaryTest {
assertThat(mDataUsageSummary.isMetered(mWifiConfiguration)).isFalse();
}
@Test
@Config(shadows = ShadowDataUsageUtils.class)
public void testNonIndexableKeys_existInXmlLayout() {
final Context context = RuntimeEnvironment.application;
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
final List<String> niks = DataPlanUsageSummary.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_plan_usage_cell_data_preference_screen));
assertThat(keys).containsAllIn(niks);
}
@Test
@Config(shadows = ShadowDataUsageUtils.class)
public void testNonIndexableKeys_hasMobileData_hasWifi_allNonIndexableKeysAdded() {
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = false;
List<String> keys = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
// Mobile data keys
assertThat(keys).contains(DataPlanUsageSummary.KEY_MOBILE_USAGE_TITLE);
assertThat(keys).contains(DataPlanUsageSummary.KEY_MOBILE_DATA_USAGE_TOGGLE);
// Wifi keys
assertThat(keys).contains(DataPlanUsageSummary.KEY_WIFI_DATA_USAGE);
assertThat(keys).contains(DataPlanUsageSummary.KEY_NETWORK_RESTRICTIONS);
assertThat(keys).contains(DataPlanUsageSummary.KEY_WIFI_USAGE_TITLE);
}
@Test
@Config(shadows = ShadowDataUsageUtils.class)
public void testNonIndexableKeys_noMobile_noWifi_limitedNonIndexableKeys() {
ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
ShadowDataUsageUtils.IS_MOBILE_DATA_SUPPORTED = true;
List<String> keys = DataPlanUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
assertThat(keys).containsExactly(DataPlanUsageSummary.KEY_WIFI_USAGE_TITLE);
}
private void initTest() {
mDataUsageSummary = new DataPlanUsageSummary();
mPolicyEditor = mock(NetworkPolicyEditor.class);