diff options
author | Junyu Lai <junyulai@google.com> | 2021-06-22 01:21:24 +0000 |
---|---|---|
committer | Junyu Lai <junyulai@google.com> | 2021-06-22 08:25:06 +0000 |
commit | e3b729e5a2f78a5e6658b2190dfa1a982c7b2597 (patch) | |
tree | 3f5b54103e01f91652c826cc46c9be999459efce | |
parent | 994231a768545a76dc3afbfdf8dcbc28657796dc (diff) | |
download | net-e3b729e5a2f78a5e6658b2190dfa1a982c7b2597.tar.gz |
Add OnSetWarningAndLimit into TestableNetworkStatsProvider
This change also address left comments at ag/15010113.
Ignore-AOSP-First: Counter part CL is not in aosp.
Test: m gts && atest \
GtsNetworkStackHostTestCases:NetworkStatsHostTest#testNetworkStatsProvider
Bug: 191327585
Change-Id: I100668cc6d4cecbaff29d027d37d313dd48854f3
-rw-r--r-- | common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt index d034a7d5..8477151b 100644 --- a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt +++ b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt @@ -30,7 +30,12 @@ open class TestableNetworkStatsProvider( ) : NetworkStatsProvider() { sealed class CallbackType { data class OnRequestStatsUpdate(val token: Int) : CallbackType() - data class OnSetLimit(val iface: String?, val quotaBytes: Long) : CallbackType() + data class OnSetWarningAndLimit( + val iface: String?, + val warningBytes: Long, + val limitBytes: Long + ) : CallbackType() + data class OnSetLimit(val iface: String?, val limitBytes: Long) : CallbackType() data class OnSetAlert(val quotaBytes: Long) : CallbackType() } @@ -42,6 +47,10 @@ open class TestableNetworkStatsProvider( history.add(CallbackType.OnRequestStatsUpdate(token)) } + override fun onSetWarningAndLimit(iface: String, warningBytes: Long, limitBytes: Long) { + history.add(CallbackType.OnSetWarningAndLimit(iface, warningBytes, limitBytes)) + } + override fun onSetLimit(iface: String, quotaBytes: Long) { history.add(CallbackType.OnSetLimit(iface, quotaBytes)) } @@ -56,7 +65,7 @@ open class TestableNetworkStatsProvider( if (token != TOKEN_ANY) { assertEquals(token, event.token) } - return token + return event.token } fun expectOnSetLimit(iface: String?, quotaBytes: Long, timeout: Long = defaultTimeoutMs) { |