Merge "Remove expectCapabilitiesWith and without"

This commit is contained in:
Jean Chalard
2023-02-09 02:20:20 +00:00
committed by Gerrit Code Review
2 changed files with 14 additions and 20 deletions

View File

@@ -592,20 +592,6 @@ open class TestableNetworkCallback private constructor(
valid: (NetworkCapabilities) -> Boolean
) = expect<CapabilitiesChanged>(ANY_NETWORK, tmt) { valid(it.caps) }.caps
@JvmOverloads
fun expectCapabilitiesWith(
capability: Int,
n: HasNetwork,
timeoutMs: Long = defaultTimeoutMs
) = expectCaps(n, timeoutMs) { it.hasCapability(capability) }
@JvmOverloads
fun expectCapabilitiesWithout(
capability: Int,
n: HasNetwork,
timeoutMs: Long = defaultTimeoutMs
) = expectCaps(n, timeoutMs) { !it.hasCapability(capability) }
fun expectBlockedStatusCallback(expectBlocked: Boolean, n: HasNetwork) {
expectBlockedStatusCallback(expectBlocked, n.network, defaultTimeoutMs)
}