Merge ba434ca into 34119ee

veyndan · web-flow · commit 75d9b486908c · 2023-03-02T20:12:17.000-08:00
diff --git a/paging/paging-common/src/test/kotlin/androidx/paging/GarbageCollectionTestHelper.kt b/paging/paging-common/src/test/kotlin/androidx/paging/GarbageCollectionTestHelper.kt
@@ -19,10 +19,10 @@ package androidx.paging
 import com.google.common.truth.Truth.assertWithMessage
 import java.lang.ref.ReferenceQueue
 import java.lang.ref.WeakReference
-import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.concurrent.thread
 import kotlin.reflect.KClass
+import kotlin.time.Duration.Companion.seconds
 
 internal class GarbageCollectionTestHelper {
     private val queue = ReferenceQueue<Any>()
@@ -49,7 +49,7 @@ internal class GarbageCollectionTestHelper {
         var collectedItemCount = 0
         val expectedItemCount = size - expected.sumOf { it.second }
         while (collectedItemCount < expectedItemCount &&
-            queue.remove(TimeUnit.SECONDS.toMillis(10)) != null
+            queue.remove(10.seconds.inWholeMilliseconds) != null
         ) {
             collectedItemCount++
         }
diff --git a/paging/paging-common/src/test/kotlin/androidx/paging/SingleRunnerTest.kt b/paging/paging-common/src/test/kotlin/androidx/paging/SingleRunnerTest.kt
@@ -37,10 +37,10 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import java.util.Collections
 import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.seconds
 
 @OptIn(ExperimentalCoroutinesApi::class)
 @RunWith(JUnit4::class)
@@ -179,7 +179,7 @@ class SingleRunnerTest {
             }
         }
         runBlocking {
-            withTimeout(TimeUnit.SECONDS.toMillis(10)) {
+            withTimeout(10.seconds) {
                 job2.join()
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ import org.junit.runner.RunWith`
`37`	`37`	`import org.junit.runners.JUnit4`
`38`	`38`	`import java.util.Collections`
`39`	`39`	`import java.util.concurrent.CountDownLatch`
`40`		`-import java.util.concurrent.TimeUnit`
`41`	`40`	`import kotlin.test.assertEquals`
`42`	`41`	`import kotlin.test.assertFalse`
`43`	`42`	`import kotlin.test.assertTrue`
	`43`	`+import kotlin.time.Duration.Companion.seconds`
`44`	`44`
`45`	`45`	`@OptIn(ExperimentalCoroutinesApi::class)`
`46`	`46`	`@RunWith(JUnit4::class)`
`@@ -179,7 +179,7 @@ class SingleRunnerTest {`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`runBlocking {`
`182`		`- withTimeout(TimeUnit.SECONDS.toMillis(10)) {`
	`182`	`+ withTimeout(10.seconds) {`
`183`	`183`	`job2.join()`
`184`	`184`	`}`
`185`	`185`	`}`