commit 65c85f368e13bec52150f4e49f61a57471cf8e26
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 16 12:55:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 16 12:55:14 2021 +0000
tree 9743620c4ece228fa56de4e76a4e6e779bb2fee5
parent 2efe29e156ce8f0bf9dba45e6a23b61e557f6286
parent 5fa15e609855792f347f1e3c84cf80a3cf02ddd3

Merge "Add assertNoCallbackThat" am: 5d39cb6ea7 am: 302ee01797

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1765527

Change-Id: Ia6dfe0d043a30df97b6bf3ae696503305e5e491f

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

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
index 1b3d0f6..7d851f1 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkCallback.kt
@@ -116,6 +116,7 @@
     val mark get() = history.mark
 
     override fun onAvailable(network: Network) {
+        Log.d(TAG, "onAvailable $network")
         history.add(Available(network))
     }
 
@@ -199,6 +200,15 @@
         if (null != cb) fail("Expected no callback but got $cb")
     }
 
+    fun assertNoCallbackThat(
+        timeoutMs: Long = defaultTimeoutMs,
+        valid: (CallbackEntry) -> Boolean
+    ) {
+        val cb = history.poll(timeoutMs) { valid(it) }.let {
+            if (null != it) fail("Expected no callback but got $it")
+        }
+    }
+
     // Expects a callback of the specified type on the specified network within the timeout.
     // If no callback arrives, or a different callback arrives, fail. Returns the callback.
     inline fun <reified T : CallbackEntry> expectCallback(