Fix tests

TeamNewPipe · Jun 22, 2024 · 5887438 · 5887438
1 parent 8ecd6e6
commit 5887438
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt b/app/src/androidTest/java/org/schabi/newpipe/database/FeedDAOTest.kt
@@ -3,7 +3,7 @@ package org.schabi.newpipe.database
 import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
-import io.reactivex.rxjava3.core.Single
+import kotlinx.coroutines.runBlocking
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -22,7 +22,6 @@ import org.schabi.newpipe.extractor.channel.ChannelInfo
 import org.schabi.newpipe.extractor.stream.StreamType
 import java.io.IOException
 import java.time.OffsetDateTime
-import kotlin.streams.toList
 
 class FeedDAOTest {
     private lateinit var db: AppDatabase
@@ -94,17 +93,13 @@ class FeedDAOTest {
         )
     }
 
-    private fun setupUnlinkDelete(time: String) {
+    private fun setupUnlinkDelete(time: String) = runBlocking {
         clearAndFillTables()
-        Single.fromCallable {
-            feedDAO.unlinkStreamsOlderThan(OffsetDateTime.parse(time))
-        }.blockingSubscribe()
-        Single.fromCallable {
-            streamDAO.deleteOrphans()
-        }.blockingSubscribe()
+        feedDAO.unlinkStreamsOlderThan(OffsetDateTime.parse(time))
+        streamDAO.deleteOrphans()
     }
 
-    private fun clearAndFillTables() {
+    private suspend fun clearAndFillTables() {
         db.clearAllTables()
         streamDAO.insertAll(allStreams)
         subscriptionDAO.insertAll(