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

20
staticlibs/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt
View File

@@ -140,20 +140,28 @@ class TestableNetworkCallbackTest {
val meteredNc = NetworkCapabilities() val meteredNc = NetworkCapabilities()
val unmeteredNc = NetworkCapabilities().addCapability(NOT_METERED) val unmeteredNc = NetworkCapabilities().addCapability(NOT_METERED)
// Check that expecting caps (with or without) fails when no callback has been received. // Check that expecting caps (with or without) fails when no callback has been received.
assertFails { mCallback.expectCapabilitiesWith(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } assertFails {
assertFails { mCallback.expectCapabilitiesWithout(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { it.hasCapability(NOT_METERED) }
}
assertFails {
mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { !it.hasCapability(NOT_METERED) }
}
// Add NOT_METERED and check that With succeeds and Without fails. // Add NOT_METERED and check that With succeeds and Without fails.
mCallback.onCapabilitiesChanged(net, unmeteredNc) mCallback.onCapabilitiesChanged(net, unmeteredNc)
mCallback.expectCapabilitiesWith(NOT_METERED, matcher) mCallback.expectCaps(matcher) { it.hasCapability(NOT_METERED) }
mCallback.onCapabilitiesChanged(net, unmeteredNc) mCallback.onCapabilitiesChanged(net, unmeteredNc)
assertFails { mCallback.expectCapabilitiesWithout(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } assertFails {
mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { !it.hasCapability(NOT_METERED) }
}
// Don't add NOT_METERED and check that With fails and Without succeeds. // Don't add NOT_METERED and check that With fails and Without succeeds.
mCallback.onCapabilitiesChanged(net, meteredNc) mCallback.onCapabilitiesChanged(net, meteredNc)
assertFails { mCallback.expectCapabilitiesWith(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } assertFails {
mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { it.hasCapability(NOT_METERED) }
}
mCallback.onCapabilitiesChanged(net, meteredNc) mCallback.onCapabilitiesChanged(net, meteredNc)
mCallback.expectCapabilitiesWithout(NOT_METERED, matcher) mCallback.expectCaps(matcher) { !it.hasCapability(NOT_METERED) }
} }
@Test @Test

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

@@ -592,20 +592,6 @@ open class TestableNetworkCallback private constructor(
valid: (NetworkCapabilities) -> Boolean valid: (NetworkCapabilities) -> Boolean
) = expect<CapabilitiesChanged>(ANY_NETWORK, tmt) { valid(it.caps) }.caps ) = 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) { fun expectBlockedStatusCallback(expectBlocked: Boolean, n: HasNetwork) {
expectBlockedStatusCallback(expectBlocked, n.network, defaultTimeoutMs) expectBlockedStatusCallback(expectBlocked, n.network, defaultTimeoutMs)
} }