Revert "Allow expect onRequestStatsUpdated with any token"
This reverts commit 6b547a5fce031d25f2640f5da373aac8897634a2.
Reason for revert: DroidMonitor: Potential culprit for Bug 191742804 - verifying through Forrest before revert submission. This is part of the standard investigation process: RESULT: Out of the two CL's pointed at by this bug, this CL appeared to be the cause of the failure; submitting revert.
Change-Id: Ia727b13b11e9b863a702f83f68da12bbff3bcf3f
diff --git a/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/common/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
index d034a7d..d5c3a2a 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.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 @@
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) {
