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

Merge "Update ConnectivityDiagnosticsCallback function name." into rvc-dev am: ed28f2db59

Browse Source 
Change-Id: I42c78c2626d1592bd5a0da215579f55bf04dc088
This commit is contained in:
Automerger Merge Worker
2020-03-17 15:48:00 +00:00
parent 98d390c72e ed28f2db59
commit 61886cc166
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java
View File

@@ -304,12 +304,12 @@ public class ConnectivityDiagnosticsManagerTest {
}
@Test
public void testConnectivityDiagnosticsCallbackOnConnectivityReport() {
mBinder.onConnectivityReport(createSampleConnectivityReport());
public void testConnectivityDiagnosticsCallbackOnConnectivityReportAvailable() {
mBinder.onConnectivityReportAvailable(createSampleConnectivityReport());
// The callback will be invoked synchronously by inline executor. Immediately check the
// latch without waiting.
verify(mCb).onConnectivityReport(eq(createSampleConnectivityReport()));
verify(mCb).onConnectivityReportAvailable(eq(createSampleConnectivityReport()));
}
@Test

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

@@ -6910,14 +6910,15 @@ public class ConnectivityServiceTest {
}
@Test
public void testConnectivityDiagnosticsCallbackOnConnectivityReport() throws Exception {
public void testConnectivityDiagnosticsCallbackOnConnectivityReportAvailable()
throws Exception {
setUpConnectivityDiagnosticsCallback();
// Block until all other events are done processing.
HandlerUtilsKt.waitForIdle(mCsHandlerThread, TIMEOUT_MS);
// Verify onConnectivityReport fired
verify(mConnectivityDiagnosticsCallback).onConnectivityReport(
verify(mConnectivityDiagnosticsCallback).onConnectivityReportAvailable(
argThat(report -> {
final NetworkCapabilities nc = report.getNetworkCapabilities();
return nc.getUids() == null