| commit | cbfdf2f5b8f4ff05ec76335a958308f4fe6dbae9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Feb 28 22:15:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 22:15:59 2022 +0000 |
| tree | b5eafaf3a867a8f80c0f42a5cda605448cd8c3a7 | |
| parent | 6c9057525ffdc2571bd8971d1e39326a45f45d42 [diff] | |
| parent | 798eebdade56cfcca0901d2cf8b9645d384c095c [diff] |
Merge "Add support for unknown Network to expectCallback" am: 7583caa837 Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1974279 Change-Id: I612bce75778cac7211dd925cd835e70ab831c03b
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt index acbb227..dffdbe8 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
@@ -41,6 +41,7 @@ object NULL_NETWORK : Network(-1) object ANY_NETWORK : Network(-2) +fun anyNetwork() = ANY_NETWORK private val Int.capabilityName get() = NetworkCapabilities.capabilityNameOf(this) @@ -389,7 +390,7 @@ val network = n ?: NULL_NETWORK // TODO : remove this .java access if the tests ever use kotlin-reflect. At the time of // this writing this would be the only use of this library in the tests. - assertTrue(type.java.isInstance(it) && it.network == network, + assertTrue(type.java.isInstance(it) && (ANY_NETWORK === n || it.network == network), "Unexpected callback : $it, expected ${type.java} with Network[$network]") } as T