Compare commits
3 Commits
023a30c008
...
d0a982f385
Author | SHA1 | Date | |
---|---|---|---|
d0a982f385 | |||
1d1c121aab | |||
fe12819163 |
@ -71,6 +71,10 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
|
|||||||
displayedItems == ItemType.ALL ||
|
displayedItems == ItemType.ALL ||
|
||||||
(it.unread && displayedItems == ItemType.UNREAD) ||
|
(it.unread && displayedItems == ItemType.UNREAD) ||
|
||||||
(it.starred && displayedItems == ItemType.STARRED)
|
(it.starred && displayedItems == ItemType.STARRED)
|
||||||
|
}.filter {
|
||||||
|
tagFilter == null || it.tags.contains(tagFilter!!.tag)
|
||||||
|
}.filter {
|
||||||
|
sourceFilter == null || it.sourcetitle == sourceFilter!!.title
|
||||||
}.map { it.toView() }
|
}.map { it.toView() }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -65,6 +65,6 @@ fun SelfossModel.Item.toEntity(): ITEM =
|
|||||||
this.thumbnail,
|
this.thumbnail,
|
||||||
this.icon,
|
this.icon,
|
||||||
this.link,
|
this.link,
|
||||||
this.title.getHtmlDecoded(),
|
this.sourcetitle.getHtmlDecoded(),
|
||||||
this.tags.joinToString(",")
|
this.tags.joinToString(",")
|
||||||
)
|
)
|
@ -173,6 +173,60 @@ class RepositoryTest() {
|
|||||||
verify(atLeast = 1) { db.itemsQueries.items().executeAsList()}
|
verify(atLeast = 1) { db.itemsQueries.items().executeAsList()}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `Get newer items without connectivity and tag filter`() {
|
||||||
|
val itemParameter1 = FakeItemParameters()
|
||||||
|
val itemParameter2 = FakeItemParameters()
|
||||||
|
val itemParameter3 = FakeItemParameters()
|
||||||
|
itemParameter2.tags = "Test, Stuff"
|
||||||
|
itemParameter3.tags = "Other, Tag"
|
||||||
|
coEvery { db.itemsQueries.items().executeAsList() } returnsMany listOf(
|
||||||
|
generateTestDBItems(itemParameter1),
|
||||||
|
generateTestDBItems(itemParameter2),
|
||||||
|
generateTestDBItems(itemParameter3)
|
||||||
|
)
|
||||||
|
|
||||||
|
every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
|
||||||
|
every { appSettingsService.isItemCachingEnabled() } returns true
|
||||||
|
|
||||||
|
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
||||||
|
repository.tagFilter = SelfossModel.Tag("Test", "red", 3)
|
||||||
|
runBlocking {
|
||||||
|
repository.getNewerItems()
|
||||||
|
}
|
||||||
|
|
||||||
|
assertSame(repository.items.size, 1)
|
||||||
|
coVerify(exactly = 0) { api.getItems("unread", 0, null, null, null, null, any()) }
|
||||||
|
verify(atLeast = 1) { db.itemsQueries.items().executeAsList()}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `Get newer items without connectivity and source filter`() {
|
||||||
|
val itemParameter1 = FakeItemParameters()
|
||||||
|
val itemParameter2 = FakeItemParameters()
|
||||||
|
val itemParameter3 = FakeItemParameters()
|
||||||
|
itemParameter2.sourcetitle = "Test"
|
||||||
|
itemParameter3.sourcetitle = "Other"
|
||||||
|
coEvery { db.itemsQueries.items().executeAsList() } returnsMany listOf(
|
||||||
|
generateTestDBItems(itemParameter1),
|
||||||
|
generateTestDBItems(itemParameter2),
|
||||||
|
generateTestDBItems(itemParameter3)
|
||||||
|
)
|
||||||
|
|
||||||
|
every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
|
||||||
|
every { appSettingsService.isItemCachingEnabled() } returns true
|
||||||
|
|
||||||
|
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
||||||
|
repository.sourceFilter = SelfossModel.Source(1, "Test", listOf("tags"),"spouts\\rss\\fulltextrss", "", "b3aa8a664d08eb15d6ff1db2fa83e0d9.png")
|
||||||
|
runBlocking {
|
||||||
|
repository.getNewerItems()
|
||||||
|
}
|
||||||
|
|
||||||
|
assertSame(repository.items.size, 1)
|
||||||
|
coVerify(exactly = 0) { api.getItems("unread", 0, null, null, null, null, any()) }
|
||||||
|
verify(atLeast = 1) { db.itemsQueries.items().executeAsList()}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `Get older items`() {
|
fun `Get older items`() {
|
||||||
coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
|
coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
|
||||||
@ -998,6 +1052,6 @@ class FakeItemParameters() {
|
|||||||
val thumbnail = null
|
val thumbnail = null
|
||||||
val icon = "ba79e238383ce83c23a169929c8906ef.png"
|
val icon = "ba79e238383ce83c23a169929c8906ef.png"
|
||||||
val link = "https://ilblogdellasci.wordpress.com/2022/09/09/etica-della-ricerca-sotto-i-riflettori/"
|
val link = "https://ilblogdellasci.wordpress.com/2022/09/09/etica-della-ricerca-sotto-i-riflettori/"
|
||||||
val sourcetitle = "La Chimica e la Società"
|
var sourcetitle = "La Chimica e la Società"
|
||||||
val tags = "Chimica, Testing"
|
var tags = "Chimica, Testing"
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user