[GH] Remove unncessary delay in test

veyndan · copybara-github · commit 3ef0e0416d9a · 2023-04-20T14:47:44.000-07:00
The referenced reason for including the delay is [marked as fixed](https://issuetracker.google.com/issues/146676984). Test: ./gradlew test connectedCheck Bug: 146676984 This is an imported pull request from #525. Resolves #525 Github-Pr-Head-Sha: 3ec802b GitOrigin-RevId: 81d9dc2 Change-Id: I48cb02461494e9511e27ac1afff141129f4b8d14
diff --git a/paging/paging-common/src/test/kotlin/androidx/paging/CachingTest.kt b/paging/paging-common/src/test/kotlin/androidx/paging/CachingTest.kt
@@ -25,7 +25,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.filterIsInstance
@@ -221,10 +220,7 @@ class CachingTest {
         assertThat(tracker.pageEventFlowCount()).isEqualTo(0)
         assertThat(tracker.pageDataFlowCount()).isEqualTo(0)
         val items = runBlocking {
-            pageFlow.collectItemsUntilSize(9) {
-                // see http://b/146676984
-                delay(10)
-            }
+            pageFlow.collectItemsUntilSize(9)
         }
         val firstList = buildItems(
             version = 0,
@@ -234,10 +230,7 @@ class CachingTest {
         )
         assertThat(tracker.pageDataFlowCount()).isEqualTo(1)
         val items2 = runBlocking {
-            pageFlow.collectItemsUntilSize(21) {
-                // see http://b/146676984
-                delay(10)
-            }
+            pageFlow.collectItemsUntilSize(21)
         }
         assertThat(items2).isEqualTo(
             buildItems(
@@ -401,7 +394,6 @@ class CachingTest {
 
     private suspend fun Flow<PagingData<Item>>.collectItemsUntilSize(
         expectedSize: Int,
-        onEach: (suspend () -> Unit)? = null
     ): List<Item> {
         return this
             .mapLatest { pagingData ->
@@ -411,9 +403,6 @@ class CachingTest {
                 val receiver = pagingData.hintReceiver
                 var loadedPageCount = 0
                 pagingData.flow.filterIsInstance<PageEvent.Insert<Item>>()
-                    .onEach {
-                        onEach?.invoke()
-                    }
                     .onEach {
                         items.addAll(
                             it.pages.flatMap {
