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

Merge "Add logs to NetworkCallbackTest to diagnose issues"

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-27 10:19:57 +00:00
committed by Gerrit Code Review
parent 609752fca4 796ccadc00
commit 89b5be1e4d
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java
View File

@@ -130,14 +130,11 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa
setLastCallback(CallbackState.CAPABILITIES, network, cap); setLastCallback(CallbackState.CAPABILITIES, network, cap);
} }
public void expectLostCallback(Network expectedNetwork) {
expectCallback(CallbackState.LOST, expectedNetwork, null);
}
public Network expectAvailableCallbackAndGetNetwork() { public Network expectAvailableCallbackAndGetNetwork() {
final CallbackInfo cb = nextCallback(TEST_CALLBACK_TIMEOUT_MS); final CallbackInfo cb = nextCallback(TEST_CALLBACK_TIMEOUT_MS);
if (cb.state != CallbackState.AVAILABLE) { if (cb.state != CallbackState.AVAILABLE) {
fail("Network is not available"); fail("Network is not available. Instead obtained the following callback :"
+ cb);
} }
return cb.network; return cb.network;
} }
@@ -152,7 +149,7 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa
do { do {
final CallbackInfo cb = nextCallback((int) (deadline - System.currentTimeMillis())); final CallbackInfo cb = nextCallback((int) (deadline - System.currentTimeMillis()));
if (cb.state == CallbackState.BLOCKED_STATUS) { if (cb.state == CallbackState.BLOCKED_STATUS) {
assertEquals(expectBlocked, (Boolean) cb.arg); assertEquals(expectBlocked, cb.arg);
return; return;
} }
} while (System.currentTimeMillis() <= deadline); } while (System.currentTimeMillis() <= deadline);
@@ -165,10 +162,10 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa
final NetworkCapabilities cap = (NetworkCapabilities) cb.arg; final NetworkCapabilities cap = (NetworkCapabilities) cb.arg;
assertEquals(expectedNetwork, cb.network); assertEquals(expectedNetwork, cb.network);
assertEquals(CallbackState.CAPABILITIES, cb.state); assertEquals(CallbackState.CAPABILITIES, cb.state);
if (hasCapability) { if (hasCapability != cap.hasCapability(capability)) {
assertTrue(cap.hasCapability(capability)); fail("NetworkCapabilities callback "
} else { + (hasCapability ? "missing expected" : "has unexpected")
assertFalse(cap.hasCapability(capability)); + " capability. " + cb);
} }
} }
} }