joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove expectBlockedStatusCallback

Browse source 
expect() does a better job.

Bug: 157405399
Test: ConnectivityServiceTest NetworkStaticLibTests
Change-Id: I2bc4dc0f175b8d46784dbdb3a4724dea41200dc7
This commit is contained in:
Chalard Jean 2023-01-13 21:47:40 +09:00
commit 12038d2e28
1 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
View file

@ -441,7 +441,7 @@ open class TestableNetworkCallback private constructor(
tmt: Long = defaultTimeoutMs
) {
expectAvailableCallbacksCommon(net, suspended, validated, tmt)
expectBlockedStatusCallback(blocked, net, tmt)
expect<BlockedStatus>(net, tmt) { it.blocked == blocked }
}
fun expectAvailableCallbacks(
@ -452,7 +452,7 @@ open class TestableNetworkCallback private constructor(
tmt: Long
) {
expectAvailableCallbacksCommon(net, suspended, validated, tmt)
expectBlockedStatusCallback(blockedStatus, net)
expect<BlockedStatusInt>(net) { it.blocked == blockedStatus }
}
private fun expectAvailableCallbacksCommon(
@ -479,16 +479,6 @@ open class TestableNetworkCallback private constructor(
tmt: Long = defaultTimeoutMs
) = expectAvailableCallbacks(net, suspended = true, validated = validated, tmt = tmt)
fun expectBlockedStatusCallback(blocked: Boolean, net: Network, tmt: Long = defaultTimeoutMs) =
expect<BlockedStatus>(net, tmt, "Unexpected blocked status") {
it.blocked == blocked
}
fun expectBlockedStatusCallback(blocked: Int, net: Network, tmt: Long = defaultTimeoutMs) =
expect<BlockedStatusInt>(net, tmt, "Unexpected blocked status") {
it.blocked == blocked
}
// Expects the available callbacks (where the onCapabilitiesChanged must contain the
// VALIDATED capability), plus another onCapabilitiesChanged which is identical to the
// one we just sent.
@ -591,8 +581,4 @@ open class TestableNetworkCallback private constructor(
tmt: Long,
valid: (NetworkCapabilities) -> Boolean
) = expect<CapabilitiesChanged>(ANY_NETWORK, tmt) { valid(it.caps) }.caps
fun expectBlockedStatusCallback(expectBlocked: Boolean, n: HasNetwork) {
expectBlockedStatusCallback(expectBlocked, n.network, defaultTimeoutMs)
}
}