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

Merge "Add support for unknown Network to expectCallback"

Browse Source
This commit is contained in:
Treehugger Robot
2022-02-28 21:57:29 +00:00
committed by Gerrit Code Review
parent bb99f69ec6 1a21b9a9db
commit 798eebdade
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
View File

@@ -41,6 +41,7 @@ import kotlin.test.fail
object NULL_NETWORK : Network(-1) object NULL_NETWORK : Network(-1)
object ANY_NETWORK : Network(-2) object ANY_NETWORK : Network(-2)
fun anyNetwork() = ANY_NETWORK
private val Int.capabilityName get() = NetworkCapabilities.capabilityNameOf(this) private val Int.capabilityName get() = NetworkCapabilities.capabilityNameOf(this)
@@ -389,7 +390,7 @@ open class TestableNetworkCallback private constructor(
val network = n ?: NULL_NETWORK val network = n ?: NULL_NETWORK
// TODO : remove this .java access if the tests ever use kotlin-reflect. At the time of // 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. // 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]") "Unexpected callback : $it, expected ${type.java} with Network[$network]")
} as T } as T