LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[LT1] Add a test for release request while lingering

Browse Source 
Test: runtest framework-net
Change-Id: Ic635f97bf3dad8b695b3b8cc32c1a8b891166f9f
This commit is contained in:
Chalard Jean
2018-02-16 16:07:53 +09:00
parent 91d3912eab
commit a7c93b0b5b
1 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1438,9 +1438,9 @@ public class ConnectivityServiceTest {
expectCallback(CallbackState.SUSPENDED, agent, timeoutMs); expectCallback(CallbackState.SUSPENDED, agent, timeoutMs);
} }
if (expectValidated) { if (expectValidated) {
expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, agent); expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, agent, timeoutMs);
} else { } else {
expectCapabilitiesWithout(NET_CAPABILITY_VALIDATED, agent); expectCapabilitiesWithout(NET_CAPABILITY_VALIDATED, agent, timeoutMs);
} }
expectCallback(CallbackState.LINK_PROPERTIES, agent, timeoutMs); expectCallback(CallbackState.LINK_PROPERTIES, agent, timeoutMs);
} }
@@ -1479,14 +1479,24 @@ public class ConnectivityServiceTest {
} }
NetworkCapabilities expectCapabilitiesWith(int capability, MockNetworkAgent agent) { NetworkCapabilities expectCapabilitiesWith(int capability, MockNetworkAgent agent) {
CallbackInfo cbi = expectCallback(CallbackState.NETWORK_CAPABILITIES, agent); return expectCapabilitiesWith(capability, agent, TIMEOUT_MS);
}
NetworkCapabilities expectCapabilitiesWith(int capability, MockNetworkAgent agent,
int timeoutMs) {
CallbackInfo cbi = expectCallback(CallbackState.NETWORK_CAPABILITIES, agent, timeoutMs);
NetworkCapabilities nc = (NetworkCapabilities) cbi.arg; NetworkCapabilities nc = (NetworkCapabilities) cbi.arg;
assertTrue(nc.hasCapability(capability)); assertTrue(nc.hasCapability(capability));
return nc; return nc;
} }
NetworkCapabilities expectCapabilitiesWithout(int capability, MockNetworkAgent agent) { NetworkCapabilities expectCapabilitiesWithout(int capability, MockNetworkAgent agent) {
CallbackInfo cbi = expectCallback(CallbackState.NETWORK_CAPABILITIES, agent); return expectCapabilitiesWithout(capability, agent, TIMEOUT_MS);
}
NetworkCapabilities expectCapabilitiesWithout(int capability, MockNetworkAgent agent,
int timeoutMs) {
CallbackInfo cbi = expectCallback(CallbackState.NETWORK_CAPABILITIES, agent, timeoutMs);
NetworkCapabilities nc = (NetworkCapabilities) cbi.arg; NetworkCapabilities nc = (NetworkCapabilities) cbi.arg;
assertFalse(nc.hasCapability(capability)); assertFalse(nc.hasCapability(capability));
return nc; return nc;
@@ -1830,6 +1840,52 @@ public class ConnectivityServiceTest {
mCm.unregisterNetworkCallback(trackDefaultCallback); mCm.unregisterNetworkCallback(trackDefaultCallback);
} }
@Test
public void testNetworkGoesIntoBackgroundAfterLinger() {
setMobileDataAlwaysOn(true);
NetworkRequest request = new NetworkRequest.Builder()
.clearCapabilities()
.build();
TestNetworkCallback callback = new TestNetworkCallback();
mCm.registerNetworkCallback(request, callback);
TestNetworkCallback defaultCallback = new TestNetworkCallback();
mCm.registerDefaultNetworkCallback(defaultCallback);
mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR);
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
mCellNetworkAgent.connect(true);
callback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
defaultCallback.expectAvailableThenValidatedCallbacks(mCellNetworkAgent);
// Wifi comes up and cell lingers.
mWiFiNetworkAgent.connect(true);
defaultCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent);
callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent);
callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
callback.expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, mWiFiNetworkAgent);
// File a request for cellular, then release it.
NetworkRequest cellRequest = new NetworkRequest.Builder()
.addTransportType(TRANSPORT_CELLULAR).build();
NetworkCallback noopCallback = new NetworkCallback();
mCm.requestNetwork(cellRequest, noopCallback);
mCm.unregisterNetworkCallback(noopCallback);
callback.expectCallback(CallbackState.LOSING, mCellNetworkAgent);
// Let linger run its course.
// TODO : the callback should be delayed by the linger delay. Fix this.
// callback.assertNoCallback();
final int lingerTimeoutMs = TEST_LINGER_DELAY_MS + TEST_LINGER_DELAY_MS / 4;
callback.expectCapabilitiesWithout(NET_CAPABILITY_FOREGROUND, mCellNetworkAgent,
lingerTimeoutMs);
// Clean up.
mCm.unregisterNetworkCallback(defaultCallback);
mCm.unregisterNetworkCallback(callback);
}
@Test @Test
public void testExplicitlySelected() { public void testExplicitlySelected() {
NetworkRequest request = new NetworkRequest.Builder() NetworkRequest request = new NetworkRequest.Builder()