Replace usage of DirectDispatcher with EmptyCoroutineContext in testutils-paging

veyndan · veyndan · commit 4593813469f7 · 2023-03-17T18:56:00.000+01:00
diff --git a/paging/paging-common/src/test/kotlin/androidx/paging/PagingDataDifferTest.kt b/paging/paging-common/src/test/kotlin/androidx/paging/PagingDataDifferTest.kt
@@ -2054,7 +2054,7 @@ class PagingDataDifferTest(
                 pagingSourceFactory = {
                     TestPagingSource(
                         loadDelay = 0,
-                        loadDispatcher = loadDispatcher,
+                        loadContext = loadDispatcher,
                     ).also { pagingSources.add(it) }
                 }
             ),
diff --git a/testutils/testutils-paging/build.gradle b/testutils/testutils-paging/build.gradle
@@ -25,7 +25,6 @@ plugins {
 dependencies {
     api(libs.kotlinStdlib)
     implementation(project(":paging:paging-common"))
-    implementation(project(":internal-testutils-ktx"))
     implementation(libs.kotlinTest)
 }
 
diff --git a/testutils/testutils-paging/src/main/java/androidx/paging/TestPagingSource.kt b/testutils/testutils-paging/src/main/java/androidx/paging/TestPagingSource.kt
@@ -16,8 +16,8 @@
 
 package androidx.paging
 
-import androidx.testutils.DirectDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.EmptyCoroutineContext
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
 
@@ -33,7 +33,7 @@ class TestPagingSource(
     override val jumpingSupported: Boolean = true,
     val items: List<Int> = ITEMS,
     private val loadDelay: Long = 1000,
-    private val loadDispatcher: CoroutineDispatcher = DirectDispatcher,
+    private val loadContext: CoroutineContext = EmptyCoroutineContext,
     private val placeholdersEnabled: Boolean = true,
 ) : PagingSource<Int, Int>() {
     var errorNextLoad = false
@@ -60,7 +60,7 @@ class TestPagingSource(
         // execution of events.
         delay(loadDelay)
 
-        return withContext(loadDispatcher) { getLoadResult(params) }
+        return withContext(loadContext) { getLoadResult(params) }
     }
 
     private fun getLoadResult(params: LoadParams<Int>): LoadResult<Int, Int> {

Original file line number	Diff line number	Diff line change
`@@ -2054,7 +2054,7 @@ class PagingDataDifferTest(`
`2054`	`2054`	`pagingSourceFactory = {`
`2055`	`2055`	`TestPagingSource(`
`2056`	`2056`	`loadDelay = 0,`
`2057`		`- loadDispatcher = loadDispatcher,`
	`2057`	`+ loadContext = loadDispatcher,`
`2058`	`2058`	`).also { pagingSources.add(it) }`
`2059`	`2059`	`}`
`2060`	`2060`	`),`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ plugins {`
`25`	`25`	`dependencies {`
`26`	`26`	`api(libs.kotlinStdlib)`
`27`	`27`	`implementation(project(":paging:paging-common"))`
`28`		`- implementation(project(":internal-testutils-ktx"))`
`29`	`28`	`implementation(libs.kotlinTest)`
`30`	`29`	`}`
`31`	`30`