commit 749459c3bd81d2d516067ad44e11295e9b932371
author Junyu Lai <junyulai@google.com> Fri Oct 01 09:52:36 2021 +0000
committer Junyu Lai <junyulai@google.com> Tue Oct 05 10:14:24 2021 +0000
tree 5f9cf1ce41630cbf8e16fa889842c2f3cd247499
parent 16b160bfcb020d88c2fbfb50f36486d78150ef5f

Add getter for quotaBytes

Since the counter part test is in internal branch only.
Change the member of OnSetLimit makes it fail to build on the
rvc+aosp branch.
Thus, add a getter for backward compatibility since the rvc test
does not recognize limitBytes.

This change also addresses some nullability confusions that are
not going to happen.

Test: m gts && atest \
          GtsNetworkStackHostTestCases:NetworkStatsHostTest#testNetworkStatsProvider
      on R & S codebase.
Bug: 191327585
Change-Id: I91dc8cb2297ca503c49b78bf1102cc5572d16530

staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
index 8477151..be5c9b2 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkStatsProvider.kt
@@ -31,11 +31,15 @@
     sealed class CallbackType {
         data class OnRequestStatsUpdate(val token: Int) : CallbackType()
         data class OnSetWarningAndLimit(
-            val iface: String?,
+            val iface: String,
             val warningBytes: Long,
             val limitBytes: Long
         ) : CallbackType()
-        data class OnSetLimit(val iface: String?, val limitBytes: Long) : CallbackType()
+        data class OnSetLimit(val iface: String, val limitBytes: Long) : CallbackType() {
+            // Add getter for backward compatibility since old tests do not recognize limitBytes.
+            val quotaBytes: Long
+                get() = limitBytes
+        }
         data class OnSetAlert(val quotaBytes: Long) : CallbackType()
     }
 
@@ -68,7 +72,7 @@
         return event.token
     }
 
-    fun expectOnSetLimit(iface: String?, quotaBytes: Long, timeout: Long = defaultTimeoutMs) {
+    fun expectOnSetLimit(iface: String, quotaBytes: Long, timeout: Long = defaultTimeoutMs) {
         assertEquals(CallbackType.OnSetLimit(iface, quotaBytes), history.poll(timeout))
     }