commit d0adace2e6141cf7887e5cc24f1119c02f9702d9
author Chiachang Wang <chiachangwang@google.com> Fri Sep 18 08:47:22 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 18 08:47:22 2020 +0000
tree 015e0dbd72df0208020a1e177e5d7a1e6f92a992
parent 4a0b6afcdba5212d044ce5dda5a3b938754fc304
parent dea21b79a38d34722fda114e341c680692755a62

Merge "Add eventuallyExpect overload"

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

diff --git a/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt b/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
index 3c038fa..7cd5419 100644
--- a/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
+++ b/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
@@ -203,6 +203,14 @@
         assertNotNull(it, "Callback ${T::class} not received within ${timeoutMs}ms")
     } as T
 
+    fun <T : CallbackEntry> eventuallyExpect(
+        type: KClass<T>,
+        timeoutMs: Long = defaultTimeoutMs,
+        predicate: (T: CallbackEntry) -> Boolean = { true }
+    ) = history.poll(timeoutMs) { type.java.isInstance(it) && predicate(it) }.also {
+        assertNotNull(it, "Callback ${type.java} not received within ${timeoutMs}ms")
+    } as T
+
     // TODO (b/157405399) straighten and unify the method names
     inline fun <reified T : CallbackEntry> eventuallyExpectOrNull(
         timeoutMs: Long = defaultTimeoutMs,