FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests and CI

Browse Source
This commit is contained in:
Shinokuni 2024-07-03 11:24:34 +02:00
parent 476ce8a7dc
commit a0bed539a6
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
appcompose/src/androidTest/java/com/readrops/app/compose/LocalRSSRepositoryTest.kt
View File

@ -12,6 +12,7 @@ import com.readrops.db.entities.Feed
import com.readrops.db.entities.account.Account import com.readrops.db.entities.account.Account
import com.readrops.db.entities.account.AccountType import com.readrops.db.entities.account.AccountType
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.test.runTest
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer import okhttp3.mockwebserver.MockWebServer
@ -37,7 +38,7 @@ class LocalRSSRepositoryTest : KoinTest {
private lateinit var feeds: List<Feed> private lateinit var feeds: List<Feed>
@Before @Before
fun before() { fun before() = runTest {
val context = ApplicationProvider.getApplicationContext<Context>() val context = ApplicationProvider.getApplicationContext<Context>()
database = Room.inMemoryDatabaseBuilder(context, Database::class.java).build() database = Room.inMemoryDatabaseBuilder(context, Database::class.java).build()
@ -57,7 +58,7 @@ class LocalRSSRepositoryTest : KoinTest {
mockServer.start() mockServer.start()
val url = mockServer.url("/rss") val url = mockServer.url("/rss")
account.id = database.accountDao().compatInsert(account).toInt() account.id = database.newAccountDao().insert(account).toInt()
feeds = listOf( feeds = listOf(
Feed( Feed(
name = "feedTest", name = "feedTest",
@ -66,17 +67,15 @@ class LocalRSSRepositoryTest : KoinTest {
), ),
) )
runBlocking { database.newFeedDao().insert(feeds).apply {
database.newFeedDao().insert(feeds).run { feeds.first().id = first().toInt()
feeds.first().id = first().toInt()
}
} }
repository = LocalRSSRepository(get(), database, account) repository = LocalRSSRepository(get(), database, account)
} }
@Test @Test
fun synchronizeTest() = runBlocking { fun synchronizeTest() = runTest {
val stream = TestUtils.loadResource("rss_feed.xml") val stream = TestUtils.loadResource("rss_feed.xml")
mockServer.enqueue( mockServer.enqueue(
@ -90,7 +89,9 @@ class LocalRSSRepositoryTest : KoinTest {
} }
assertTrue { result.first.items.isNotEmpty() } assertTrue { result.first.items.isNotEmpty() }
assertTrue { database.itemDao().itemExists(result.first.items.first().guid!!, account.id) } assertTrue {
database.newItemDao().itemExists(result.first.items.first().guid!!, account.id)
}
} }
@Test @Test
@ -108,6 +109,8 @@ class LocalRSSRepositoryTest : KoinTest {
} }
assertTrue { result.first.items.isNotEmpty() } assertTrue { result.first.items.isNotEmpty() }
assertTrue { database.itemDao().itemExists(result.first.items.first().guid!!, account.id) } assertTrue {
database.newItemDao().itemExists(result.first.items.first().guid!!, account.id)
}
} }
} }

4
appcompose/src/androidTest/java/com/readrops/app/compose/SyncResultAnalyserTest.kt
View File

@ -66,7 +66,7 @@ class SyncAnalyzerTest {
isNotificationEnabled = i % 2 == 0 isNotificationEnabled = i % 2 == 0
} }
database.feedDao().insert(feed).subscribe() database.newFeedDao().insert(feed)
} }
} }
@ -92,7 +92,7 @@ class SyncAnalyzerTest {
assertEquals("caseOneElementEveryWhere", notificationContent.content) assertEquals("caseOneElementEveryWhere", notificationContent.content)
assertEquals("feed 1", notificationContent.title) assertEquals("feed 1", notificationContent.title)
assertTrue(notificationContent.largeIcon != null) assertTrue(notificationContent.largeIcon != null)
assertTrue(notificationContent.accountId!! > 0) assertTrue(notificationContent.accountId > 0)
database.newItemDao().delete(item) database.newItemDao().delete(item)
} }