commit 798eebdade56cfcca0901d2cf8b9645d384c095c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 28 21:57:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 28 21:57:29 2022 +0000
tree b5eafaf3a867a8f80c0f42a5cda605448cd8c3a7
parent bb99f69ec6c937973c54d6cd8229022b7f7a080b
parent 1a21b9a9db957aff796cdf7c6ee7abfae1c0865c

Merge "Add support for unknown Network to expectCallback"

staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt

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