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

Merge "Remove Network Restrictions duplicate from setting search" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-17 17:27:56 +00:00
committed by Android (Google) Code Review
parent 915f0cea5b 8b0ed39c11
commit 09dbc8043f
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,8 @@ import android.net.wifi.WifiManager;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settingslib.NetworkPolicyEditor;
import org.junit.Before;
@@ -160,4 +160,16 @@ public class DataUsageSummaryTest {
assertThat(keys).containsAllIn(niks);
}
@Test
@Config(shadows = ShadowConnectivityManager.class)
public void testNonIndexableKeys_hasMobileData_restrictedAccessesAdded() {
ShadowConnectivityManager.setIsNetworkSupported(true);
List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(mContext);
assertThat(keys).contains(DataUsageSummary.KEY_RESTRICT_BACKGROUND);
assertThat(keys).contains(DataUsageSummary.KEY_NETWORK_RESTRICTIONS);
ShadowConnectivityManager.setIsNetworkSupported(false);
}
}

7
tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
View File

@@ -24,9 +24,14 @@ import org.robolectric.annotation.Implements;
@Implements(ConnectivityManager.class)
public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowConnectivityManager {
private static boolean mIsNetworkSupported;
@Implementation
public boolean isNetworkSupported(int networkType) {
return false;
return mIsNetworkSupported;
}
public static void setIsNetworkSupported(boolean isNetworkSupported) {
mIsNetworkSupported = isNetworkSupported;
}
}