diff options
| author | Roy Want <roywant@google.com> | 2021-06-22 22:39:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 22:39:38 +0000 |
| commit | 76567a8d0703bd1c3eb024b7201b19dd0c859e66 (patch) | |
| tree | be3af854a24339c0ea467e394df60d15bf9c9ec3 | |
| parent | 682f69146a17c3d1fab968ec2e739ff0d0ff0758 (diff) | |
| parent | 5ab3d55f616b3c207636b449379d2f380a43a526 (diff) | |
| download | net-76567a8d0703bd1c3eb024b7201b19dd0c859e66.tar.gz | |
Merge "Revert "Allow expect onRequestStatsUpdated with any token"" am: 5ab3d55f61
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1743120
Change-Id: I861e2fb6961b73dbbf0818d919dd90130596e018
| -rw-r--r-- | common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt index d034a7d5..d5c3a2a0 100644 --- a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt +++ b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt @@ -23,7 +23,6 @@ import kotlin.test.assertTrue import kotlin.test.fail private const val DEFAULT_TIMEOUT_MS = 200L -const val TOKEN_ANY = -1 open class TestableNetworkStatsProvider( val defaultTimeoutMs: Long = DEFAULT_TIMEOUT_MS @@ -50,13 +49,8 @@ open class TestableNetworkStatsProvider( history.add(CallbackType.OnSetAlert(quotaBytes)) } - fun expectOnRequestStatsUpdate(token: Int, timeout: Long = defaultTimeoutMs): Int { - val event = history.poll(timeout) - assertTrue(event is CallbackType.OnRequestStatsUpdate) - if (token != TOKEN_ANY) { - assertEquals(token, event.token) - } - return token + fun expectOnRequestStatsUpdate(token: Int, timeout: Long = defaultTimeoutMs) { + assertEquals(CallbackType.OnRequestStatsUpdate(token), history.poll(timeout)) } fun expectOnSetLimit(iface: String?, quotaBytes: Long, timeout: Long = defaultTimeoutMs) { |