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

Merge "Remove expectLinkPropertiesThat"

Browse Source
This commit is contained in:
Jean Chalard
2023-02-11 02:09:38 +00:00
committed by Gerrit Code Review
parent c67deee923 36e8ff3f87
commit 35f954324f
2 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,13 +414,6 @@ open class TestableNetworkCallback private constructor(
crossinline predicate: (T) -> Boolean = { true }
) = history.poll(timeoutMs, from) { it is T && predicate(it) } as T?
inline fun expectLinkPropertiesThat(
net: Network,
tmt: Long = defaultTimeoutMs,
valid: (LinkProperties) -> Boolean
): LinkPropertiesChanged =
expect(net, tmt, "LinkProperties don't match expectations") { valid(it.lp) }
// Expects onAvailable and the callbacks that follow it. These are:
// - onSuspended, iff the network was suspended when the callbacks fire.
// - onCapabilitiesChanged.
@@ -551,13 +544,6 @@ open class TestableNetworkCallback private constructor(
expectAvailableThenValidatedCallbacks(n.network, defaultTimeoutMs)
}
@JvmOverloads
fun expectLinkPropertiesThat(
n: HasNetwork,
tmt: Long = defaultTimeoutMs,
valid: (LinkProperties) -> Boolean
) = expectLinkPropertiesThat(n.network, tmt, valid)
@JvmOverloads
fun expectCaps(
n: HasNetwork,