summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2023-01-13 21:55:19 +0900
committerChalard Jean <jchalard@google.com>2023-02-09 16:19:09 +0900
commit5387892c250ad1861d692ba99c81eb131d23ef2b (patch)
tree4659dfcfc23604f28344398ff420ded20926da71
parent00df7af4ba707cbfabca493452b8fe7ecdba6652 (diff)
downloadnet-5387892c250ad1861d692ba99c81eb131d23ef2b.tar.gz
Rename BlockedStatusInt.blocked to .reason
It's a reason, so it's a lot clearer this way Bug: 157405399 Test: ConnectivityServiceTest NetworkStaticLibTests Change-Id: Id71d710a33b4df3c211e40141adb2aa0a535f458
-rw-r--r--common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt b/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
index 4f0f1db3..71f40ec6 100644
--- a/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
+++ b/common/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
@@ -83,7 +83,7 @@ open class RecorderCallback private constructor(
) : CallbackEntry()
data class BlockedStatusInt(
override val network: Network,
- val blocked: Int
+ val reason: Int
) : CallbackEntry()
// Convenience constants for expecting a type
companion object {
@@ -448,11 +448,11 @@ open class TestableNetworkCallback private constructor(
net: Network,
suspended: Boolean,
validated: Boolean,
- blockedStatus: Int,
+ blockedReason: Int,
tmt: Long
) {
expectAvailableCallbacksCommon(net, suspended, validated, tmt)
- expect<BlockedStatusInt>(net) { it.blocked == blockedStatus }
+ expect<BlockedStatusInt>(net) { it.reason == blockedReason }
}
private fun expectAvailableCallbacksCommon(
@@ -500,11 +500,11 @@ open class TestableNetworkCallback private constructor(
fun expectAvailableThenValidatedCallbacks(
net: Network,
- blockedStatus: Int,
+ blockedReason: Int,
tmt: Long = defaultTimeoutMs
) {
expectAvailableCallbacks(net, validated = false, suspended = false,
- blockedStatus = blockedStatus, tmt = tmt)
+ blockedReason = blockedReason, tmt = tmt)
expectCaps(net, tmt) { it.hasCapability(NET_CAPABILITY_VALIDATED) }
}