Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add test for updateMobileRequiresDun()"

Browse Source
This commit is contained in:
Treehugger Robot
2017-01-23 10:44:19 +00:00
committed by Gerrit Code Review
parent 1b2a1b911d 973c7df054
commit 7f018500dc
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/net/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitorTest.java
View File

@@ -117,10 +117,7 @@ public class UpstreamNetworkMonitorTest {
mUNM.registerMobileNetworkRequest(); mUNM.registerMobileNetworkRequest();
assertTrue(mUNM.mobileNetworkRequested()); assertTrue(mUNM.mobileNetworkRequested());
assertEquals(1, mCM.requested.size()); assertUpstreamTypeRequested(TYPE_MOBILE_HIPRI);
assertEquals(1, mCM.legacyTypeMap.size());
assertEquals(Integer.valueOf(TYPE_MOBILE_HIPRI),
mCM.legacyTypeMap.values().iterator().next());
assertFalse(mCM.isDunRequested()); assertFalse(mCM.isDunRequested());
mUNM.stop(); mUNM.stop();
@@ -143,10 +140,7 @@ public class UpstreamNetworkMonitorTest {
mUNM.registerMobileNetworkRequest(); mUNM.registerMobileNetworkRequest();
assertTrue(mUNM.mobileNetworkRequested()); assertTrue(mUNM.mobileNetworkRequested());
assertEquals(1, mCM.requested.size()); assertUpstreamTypeRequested(TYPE_MOBILE_DUN);
assertEquals(1, mCM.legacyTypeMap.size());
assertEquals(Integer.valueOf(TYPE_MOBILE_DUN),
mCM.legacyTypeMap.values().iterator().next());
assertTrue(mCM.isDunRequested()); assertTrue(mCM.isDunRequested());
mUNM.stop(); mUNM.stop();
@@ -154,6 +148,38 @@ public class UpstreamNetworkMonitorTest {
assertTrue(mCM.hasNoCallbacks()); assertTrue(mCM.hasNoCallbacks());
} }
@Test
public void testUpdateMobileRequiredDun() throws Exception {
mUNM.start();
// Test going from no-DUN to DUN correctly re-registers callbacks.
mUNM.updateMobileRequiresDun(false);
mUNM.registerMobileNetworkRequest();
assertTrue(mUNM.mobileNetworkRequested());
assertUpstreamTypeRequested(TYPE_MOBILE_HIPRI);
assertFalse(mCM.isDunRequested());
mUNM.updateMobileRequiresDun(true);
assertTrue(mUNM.mobileNetworkRequested());
assertUpstreamTypeRequested(TYPE_MOBILE_DUN);
assertTrue(mCM.isDunRequested());
// Test going from DUN to no-DUN correctly re-registers callbacks.
mUNM.updateMobileRequiresDun(false);
assertTrue(mUNM.mobileNetworkRequested());
assertUpstreamTypeRequested(TYPE_MOBILE_HIPRI);
assertFalse(mCM.isDunRequested());
mUNM.stop();
assertFalse(mUNM.mobileNetworkRequested());
}
private void assertUpstreamTypeRequested(int upstreamType) throws Exception {
assertEquals(1, mCM.requested.size());
assertEquals(1, mCM.legacyTypeMap.size());
assertEquals(Integer.valueOf(upstreamType),
mCM.legacyTypeMap.values().iterator().next());
}
private static class TestConnectivityManager extends ConnectivityManager { private static class TestConnectivityManager extends ConnectivityManager {
public Set<NetworkCallback> trackingDefault = new HashSet<>(); public Set<NetworkCallback> trackingDefault = new HashSet<>();
public Map<NetworkCallback, NetworkRequest> listening = new HashMap<>(); public Map<NetworkCallback, NetworkRequest> listening = new HashMap<>();