Compare commits
3 Commits
41c951b659
...
c8759cc035
Author | SHA1 | Date | |
---|---|---|---|
c8759cc035 | |||
cb4f2f02ef | |||
7517626ab7 |
@ -143,13 +143,13 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
|
|||||||
return success
|
return success
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun getTags(): List<SelfossModel.Tag>? {
|
suspend fun getTags(): List<SelfossModel.Tag> {
|
||||||
return if (isNetworkAvailable()) {
|
return if (isNetworkAvailable()) {
|
||||||
val apiTags = api.tags()
|
val apiTags = api.tags()
|
||||||
if (apiTags.success && apiTags.data != null && (appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled())) {
|
if (apiTags.success && apiTags.data != null && (appSettingsService.isItemCachingEnabled() || !appSettingsService.isUpdateSourcesEnabled())) {
|
||||||
resetDBTagsWithData(apiTags.data)
|
resetDBTagsWithData(apiTags.data)
|
||||||
}
|
}
|
||||||
apiTags.data
|
apiTags.data ?: emptyList()
|
||||||
} else {
|
} else {
|
||||||
getDBTags().map { it.toView() }
|
getDBTags().map { it.toView() }
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
|||||||
import bou.amine.apps.readerforselfossv2.rest.SelfossApi
|
import bou.amine.apps.readerforselfossv2.rest.SelfossApi
|
||||||
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
import bou.amine.apps.readerforselfossv2.service.AppSettingsService
|
||||||
import bou.amine.apps.readerforselfossv2.utils.ItemType
|
import bou.amine.apps.readerforselfossv2.utils.ItemType
|
||||||
|
import bou.amine.apps.readerforselfossv2.utils.toView
|
||||||
import com.github.ln_12.library.ConnectivityStatus
|
import com.github.ln_12.library.ConnectivityStatus
|
||||||
import io.mockk.*
|
import io.mockk.*
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
@ -269,6 +270,7 @@ class RepositoryTest() {
|
|||||||
fun `Reload badges with items caching`() {
|
fun `Reload badges with items caching`() {
|
||||||
every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
|
every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
|
||||||
every { appSettingsService.isItemCachingEnabled() } returns true
|
every { appSettingsService.isItemCachingEnabled() } returns true
|
||||||
|
every { db.itemsQueries.items().executeAsList() } returns generateTestDBItems()
|
||||||
|
|
||||||
val itemParameter = FakeItemParameters()
|
val itemParameter = FakeItemParameters()
|
||||||
itemParameter.starred = true
|
itemParameter.starred = true
|
||||||
@ -284,7 +286,7 @@ class RepositoryTest() {
|
|||||||
|
|
||||||
assertSame(true, success)
|
assertSame(true, success)
|
||||||
assertSame(1, repository.badgeAll)
|
assertSame(1, repository.badgeAll)
|
||||||
assertSame(0, repository.badgeUnread)
|
assertSame(1, repository.badgeUnread)
|
||||||
assertSame(1, repository.badgeStarred)
|
assertSame(1, repository.badgeStarred)
|
||||||
coVerify(exactly = 0) { api.stats() }
|
coVerify(exactly = 0) { api.stats() }
|
||||||
verify(atLeast = 1) { db.itemsQueries.items().executeAsList()}
|
verify(atLeast = 1) { db.itemsQueries.items().executeAsList()}
|
||||||
@ -344,19 +346,20 @@ class RepositoryTest() {
|
|||||||
every { appSettingsService.isUpdateSourcesEnabled() } returns false
|
every { appSettingsService.isUpdateSourcesEnabled() } returns false
|
||||||
|
|
||||||
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
||||||
var testTags: List<SelfossModel.Tag>? = null
|
var testTags: List<SelfossModel.Tag> = emptyList()
|
||||||
runBlocking {
|
runBlocking {
|
||||||
testTags = repository.getTags()
|
testTags = repository.getTags()
|
||||||
|
testTags = repository.getTags()
|
||||||
}
|
}
|
||||||
|
|
||||||
assertNotSame(tags, testTags)
|
assertNotSame(tags, testTags)
|
||||||
assertSame(tagsDB.first().name, testTags?.first()?.tag)
|
assertContentEquals(tagsDB.map { it.toView() }, testTags)
|
||||||
coVerify(exactly = 0) { api.tags() }
|
coVerify(exactly = 1) { api.tags() }
|
||||||
verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
|
verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `Get tags with sources update and db disabled`() {
|
fun `Get tags with sources update and items caching disabled`() {
|
||||||
val tags = listOf(SelfossModel.Tag("test", "red", 6),
|
val tags = listOf(SelfossModel.Tag("test", "red", 6),
|
||||||
SelfossModel.Tag("second", "yellow", 0))
|
SelfossModel.Tag("second", "yellow", 0))
|
||||||
val tagsDB = listOf(TAG("test_DB", "red", 6),
|
val tagsDB = listOf(TAG("test_DB", "red", 6),
|
||||||
@ -368,12 +371,12 @@ class RepositoryTest() {
|
|||||||
every { appSettingsService.isItemCachingEnabled() } returns false
|
every { appSettingsService.isItemCachingEnabled() } returns false
|
||||||
|
|
||||||
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
||||||
var testTags: List<SelfossModel.Tag>? = null
|
var testTags: List<SelfossModel.Tag> = emptyList()
|
||||||
runBlocking {
|
runBlocking {
|
||||||
testTags = repository.getTags()
|
testTags = repository.getTags()
|
||||||
}
|
}
|
||||||
|
|
||||||
assertSame(null, testTags)
|
assertSame(emptyList(), testTags)
|
||||||
coVerify(exactly = 0) { api.tags() }
|
coVerify(exactly = 0) { api.tags() }
|
||||||
verify(exactly = 0) { db.tagsQueries.tags().executeAsList() }
|
verify(exactly = 0) { db.tagsQueries.tags().executeAsList() }
|
||||||
}
|
}
|
||||||
@ -390,13 +393,13 @@ class RepositoryTest() {
|
|||||||
every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
|
every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
|
||||||
|
|
||||||
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
||||||
var testTags: List<SelfossModel.Tag>? = null
|
var testTags: List<SelfossModel.Tag> = emptyList()
|
||||||
runBlocking {
|
runBlocking {
|
||||||
testTags = repository.getTags()
|
testTags = repository.getTags()
|
||||||
}
|
}
|
||||||
|
|
||||||
assertNotSame(tags, testTags)
|
assertNotSame(tags, testTags)
|
||||||
assertSame(tagsDB.first().name, testTags?.first()?.tag)
|
assertSame(tagsDB.first().name, testTags.first().tag)
|
||||||
coVerify(exactly = 0) { api.tags() }
|
coVerify(exactly = 0) { api.tags() }
|
||||||
verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
|
verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
|
||||||
}
|
}
|
||||||
@ -414,14 +417,38 @@ class RepositoryTest() {
|
|||||||
every { appSettingsService.isItemCachingEnabled() } returns false
|
every { appSettingsService.isItemCachingEnabled() } returns false
|
||||||
|
|
||||||
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
||||||
var testTags: List<SelfossModel.Tag>? = null
|
var testTags: List<SelfossModel.Tag> = emptyList()
|
||||||
runBlocking {
|
runBlocking {
|
||||||
testTags = repository.getTags()
|
testTags = repository.getTags()
|
||||||
}
|
}
|
||||||
|
|
||||||
assertSame(null, testTags)
|
assertContentEquals(tagsDB.map { it.toView() }, testTags)
|
||||||
coVerify(exactly = 0) { api.tags() }
|
coVerify(exactly = 0) { api.tags() }
|
||||||
verify(exactly = 0) { db.tagsQueries.tags().executeAsList() }
|
verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun `Get tags without connection and sources update disabled`() {
|
||||||
|
val tags = listOf(SelfossModel.Tag("test", "red", 6),
|
||||||
|
SelfossModel.Tag("second", "yellow", 0))
|
||||||
|
val tagsDB = listOf(TAG("test_DB", "red", 6),
|
||||||
|
TAG("second_DB", "yellow", 0))
|
||||||
|
|
||||||
|
coEvery { api.tags() } returns SelfossModel.StatusAndData(success = true, data = tags)
|
||||||
|
coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
|
||||||
|
every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
|
||||||
|
every { appSettingsService.isUpdateSourcesEnabled() } returns false
|
||||||
|
|
||||||
|
val repository = Repository(api, appSettingsService, connectivityStatus, db)
|
||||||
|
var testTags: List<SelfossModel.Tag> = emptyList()
|
||||||
|
runBlocking {
|
||||||
|
testTags = repository.getTags()
|
||||||
|
}
|
||||||
|
|
||||||
|
assertNotSame(tags, testTags)
|
||||||
|
assertContentEquals(tagsDB.map { it.toView() }, testTags)
|
||||||
|
coVerify(exactly = 0) { api.tags() }
|
||||||
|
verify(atLeast = 1) { db.tagsQueries.tags().executeAsList() }
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user