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

Remove expectCapabilitiesWith and without

Browse Source 
This is not clearer than using the base method.

Test: ConnectivityServiceTest NetworkStaticLibTests
Bug: 157405399
Change-Id: Iac9aeffb563d0a1cb6c1287b46b9bbfffc0c75ca
This commit is contained in:
Chalard Jean
2023-01-13 20:32:54 +09:00
parent c0ba521f79
commit ab521cf49d
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
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)
}