chore: lint cleaning.

2023-10-12 20:25:24 +02:00
parent f101d22f54
commit 137580ccf9
59 changed files with 1820 additions and 1376 deletions
--- a/androidApp/src/test/kotlin/DatesTest.kt
+++ b/androidApp/src/test/kotlin/DatesTest.kt
@@ -8,11 +8,10 @@ import kotlinx.datetime.toInstant
 import org.junit.Test

 class DatesTest {
-
-    private val newVersionDateVariant =  "2022-12-24T17:00:08+00"
-    private val newVersionDate =         "2013-04-07T13:43:00+01:00"
-    private val oldVersionDate =         "2013-05-07 13:46:00"
-    private val oldVersionDateVariant =  "2021-03-21 10:32:00.000000"
+    private val newVersionDateVariant = "2022-12-24T17:00:08+00"
+    private val newVersionDate = "2013-04-07T13:43:00+01:00"
+    private val oldVersionDate = "2013-05-07 13:46:00"
+    private val oldVersionDateVariant = "2021-03-21 10:32:00.000000"

    @Test
    fun new_version_date_should_be_parsed() {
@@ -53,5 +52,4 @@ class DatesTest {

        assertEquals(expected, date)
    }
-
 }
--- a/androidApp/src/test/kotlin/RepositoryTest.kt
+++ b/androidApp/src/test/kotlin/RepositoryTest.kt
@@ -42,11 +42,11 @@ class RepositoryTest {
    private val NUMBER_STARRED = 20
    private lateinit var repository: Repository

-
    private fun initializeRepository(
-        isConnectionAvailable: MutableStateFlow<Boolean> = MutableStateFlow(
-            true
-        )
+        isConnectionAvailable: MutableStateFlow<Boolean> =
+            MutableStateFlow(
+                true,
+            ),
    ) {
        repository = Repository(api, appSettingsService, isConnectionAvailable, db)

@@ -64,14 +64,16 @@ class RepositoryTest {
        every { appSettingsService.isItemCachingEnabled() } returns false
        every { appSettingsService.isUpdateSourcesEnabled() } returns false

-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
-        )
-        coEvery { api.stats() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED)
-        )
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
+            )
+        coEvery { api.stats() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED),
+            )

        every { db.itemsQueries.deleteItemsWhereSource(any()) } returns Unit
        every { db.itemsQueries.items().executeAsList() } returns generateTestDBItems()
@@ -101,7 +103,7 @@ class RepositoryTest {
    fun get_api_4_date_with_api_1_version_stored() {
        every { appSettingsService.getApiVersion() } returns 1
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())
        every { appSettingsService.updateApiVersion(any()) } returns Unit

        initializeRepository()
@@ -116,10 +118,11 @@ class RepositoryTest {
    @Test
    fun get_public_access() {
        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
-        )
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
+            )
        every { appSettingsService.getUserName() } returns ""

        initializeRepository()
@@ -131,10 +134,11 @@ class RepositoryTest {
    @Test
    fun get_public_access_username_not_empty() {
        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true))
-        )
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, true)),
+            )
        every { appSettingsService.getUserName() } returns "username"

        initializeRepository()
@@ -146,10 +150,11 @@ class RepositoryTest {
    @Test
    fun get_public_access_no_auth() {
        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false))
-        )
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(true, false)),
+            )
        every { appSettingsService.getUserName() } returns ""

        initializeRepository()
@@ -161,10 +166,11 @@ class RepositoryTest {
    @Test
    fun get_public_access_disabled() {
        every { appSettingsService.updatePublicAccess(any()) } returns Unit
-        coEvery { api.apiInformation() } returns StatusAndData(
-            success = true,
-            data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true))
-        )
+        coEvery { api.apiInformation() } returns
+            StatusAndData(
+                success = true,
+                data = SelfossModel.ApiInformation("2.19-ba1e8e3", "4.0.0", SelfossModel.ApiConfiguration(false, true)),
+            )
        every { appSettingsService.getUserName() } returns ""

        initializeRepository()
@@ -180,10 +186,10 @@ class RepositoryTest {
        val itemParameters = FakeItemParameters()
        itemParameters.datetime = "2021-04-23 11:45:32"
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(
-                    success = true,
-                    data = generateTestApiItem(itemParameters)
-                )
+            StatusAndData(
+                success = true,
+                data = generateTestApiItem(itemParameters),
+            )

        initializeRepository()
        runBlocking {
@@ -196,7 +202,7 @@ class RepositoryTest {
    @Test
    fun get_newer_items() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())

        initializeRepository()
        runBlocking {
@@ -211,7 +217,7 @@ class RepositoryTest {
    @Test
    fun get_all_newer_items() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())

        initializeRepository()
        repository.displayedItems = ItemType.ALL
@@ -227,7 +233,7 @@ class RepositoryTest {
    @Test
    fun get_newer_starred_items() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())

        initializeRepository()
        repository.displayedItems = ItemType.STARRED
@@ -264,10 +270,10 @@ class RepositoryTest {
        itemParameter3.tags = "Other, Tag"
        itemParameter3.id = "3"
        coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1
+            itemParameter1,
        ) +
-                generateTestDBItems(itemParameter2) +
-                generateTestDBItems(itemParameter3)
+            generateTestDBItems(itemParameter2) +
+            generateTestDBItems(itemParameter3)

        every { appSettingsService.isItemCachingEnabled() } returns true

@@ -292,24 +298,26 @@ class RepositoryTest {
        itemParameter3.sourcetitle = "Other"
        itemParameter3.id = "3"
        coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(
-            itemParameter1
+            itemParameter1,
        ) +
-                generateTestDBItems(itemParameter2) +
-                generateTestDBItems(itemParameter3)
+            generateTestDBItems(itemParameter2) +
+            generateTestDBItems(itemParameter3)

        every { appSettingsService.isItemCachingEnabled() } returns true

        initializeRepository(MutableStateFlow(false))
-        repository.setSourceFilter(SelfossModel.SourceDetail(
-            1,
-            "Test",
-            null,
-            listOf("tags"),
-            SPOUT,
-            "",
-            IMAGE_URL,
-            SelfossModel.SourceParams("url")
-        ))
+        repository.setSourceFilter(
+            SelfossModel.SourceDetail(
+                1,
+                "Test",
+                null,
+                listOf("tags"),
+                SPOUT,
+                "",
+                IMAGE_URL,
+                SelfossModel.SourceParams("url"),
+            ),
+        )
        runBlocking {
            repository.getNewerItems()
        }
@@ -322,7 +330,7 @@ class RepositoryTest {
    @Test
    fun get_older_items() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())

        initializeRepository()
        repository.items = ArrayList(generateTestApiItem())
@@ -338,7 +346,7 @@ class RepositoryTest {
    @Test
    fun get_all_older_items() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())

        initializeRepository()
        repository.items = ArrayList(generateTestApiItem())
@@ -355,7 +363,7 @@ class RepositoryTest {
    @Test
    fun get_older_starred_items() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = true, data = generateTestApiItem())
+            StatusAndData(success = true, data = generateTestApiItem())

        initializeRepository()
        repository.displayedItems = ItemType.STARRED
@@ -592,14 +600,16 @@ class RepositoryTest {
    }

    private fun prepareTags(): Pair<List<SelfossModel.Tag>, List<TAG>> {
-        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)
-        )
+        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 StatusAndData(success = true, data = tags)
        coEvery { db.tagsQueries.tags().executeAsList() } returns tagsDB
@@ -621,48 +631,50 @@ class RepositoryTest {
    }

    private fun prepareSources(): Pair<ArrayList<SelfossModel.SourceDetail>, List<SOURCE>> {
-        val sources = arrayListOf(
-            SelfossModel.SourceDetail(
-                1,
-                "First source",
-                null,
-                listOf("Test", "second"),
-                SPOUT,
-                "",
-                IMAGE_URL_2,
-                SelfossModel.SourceParams("url")
-            ),
-            SelfossModel.SourceDetail(
-                2,
-                "Second source",
-                null,
-                listOf("second"),
-                SPOUT,
-                "",
-                IMAGE_URL,
-                SelfossModel.SourceParams("url")
+        val sources =
+            arrayListOf(
+                SelfossModel.SourceDetail(
+                    1,
+                    "First source",
+                    null,
+                    listOf("Test", "second"),
+                    SPOUT,
+                    "",
+                    IMAGE_URL_2,
+                    SelfossModel.SourceParams("url"),
+                ),
+                SelfossModel.SourceDetail(
+                    2,
+                    "Second source",
+                    null,
+                    listOf("second"),
+                    SPOUT,
+                    "",
+                    IMAGE_URL,
+                    SelfossModel.SourceParams("url"),
+                ),
            )
-        )
-        val sourcesDB = listOf(
-            SOURCE(
-                "1",
-                "First DB source",
-                "Test,second",
-                SPOUT,
-                "",
-                IMAGE_URL_2,
-                "url"
-            ),
-            SOURCE(
-                "2",
-                "Second source",
-                "second",
-                SPOUT,
-                "",
-                IMAGE_URL,
-                "url"
+        val sourcesDB =
+            listOf(
+                SOURCE(
+                    "1",
+                    "First DB source",
+                    "Test,second",
+                    SPOUT,
+                    "",
+                    IMAGE_URL_2,
+                    "url",
+                ),
+                SOURCE(
+                    "2",
+                    "Second source",
+                    "second",
+                    SPOUT,
+                    "",
+                    IMAGE_URL,
+                    "url",
+                ),
            )
-        )

        coEvery { api.sourcesDetailed() } returns StatusAndData(success = true, data = sources)
        every { db.sourcesQueries.sources().executeAsList() } returns sourcesDB
@@ -791,17 +803,18 @@ class RepositoryTest {
    @Test
    fun create_source() {
        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
-                SuccessResponse(true)
+            SuccessResponse(true)

        initializeRepository()
        var response: Boolean
        runBlocking {
-            response = repository.createSource(
-                "test",
-                FEED_URL,
-                SPOUT,
-                TAGS,
-            )
+            response =
+                repository.createSource(
+                    "test",
+                    FEED_URL,
+                    SPOUT,
+                    TAGS,
+                )
        }

        coVerify(exactly = 1) {
@@ -818,17 +831,18 @@ class RepositoryTest {
    @Test
    fun create_source_but_response_fails() {
        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
-                SuccessResponse(false)
+            SuccessResponse(false)

        initializeRepository()
        var response: Boolean
        runBlocking {
-            response = repository.createSource(
-                "test",
-                FEED_URL,
-                SPOUT,
-                TAGS
-            )
+            response =
+                repository.createSource(
+                    "test",
+                    FEED_URL,
+                    SPOUT,
+                    TAGS,
+                )
        }

        coVerify(exactly = 1) {
@@ -836,7 +850,7 @@ class RepositoryTest {
                any(),
                any(),
                any(),
-                any()
+                any(),
            )
        }
        assertSame(false, response)
@@ -845,17 +859,18 @@ class RepositoryTest {
    @Test
    fun create_source_without_connection() {
        coEvery { api.createSourceForVersion(any(), any(), any(), any()) } returns
-                SuccessResponse(true)
+            SuccessResponse(true)

        initializeRepository(MutableStateFlow(false))
        var response: Boolean
        runBlocking {
-            response = repository.createSource(
-                "test",
-                FEED_URL,
-                SPOUT,
-                TAGS
-            )
+            response =
+                repository.createSource(
+                    "test",
+                    FEED_URL,
+                    SPOUT,
+                    TAGS,
+                )
        }

        coVerify(exactly = 0) {
@@ -916,10 +931,11 @@ class RepositoryTest {

    @Test
    fun update_remote() {
-        coEvery { api.update() } returns StatusAndData(
-            success = true,
-            data = "finished"
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = true,
+                data = "finished",
+            )

        initializeRepository()
        var response: Boolean
@@ -933,10 +949,11 @@ class RepositoryTest {

    @Test
    fun update_remote_but_response_fails() {
-        coEvery { api.update() } returns StatusAndData(
-            success = false,
-            data = "unallowed access"
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = false,
+                data = "unallowed access",
+            )

        initializeRepository()
        var response: Boolean
@@ -950,10 +967,11 @@ class RepositoryTest {

    @Test
    fun update_remote_with_unallowed_access() {
-        coEvery { api.update() } returns StatusAndData(
-            success = true,
-            data = "unallowed access"
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = true,
+                data = "unallowed access",
+            )

        initializeRepository()
        var response: Boolean
@@ -967,10 +985,11 @@ class RepositoryTest {

    @Test
    fun update_remote_without_connection() {
-        coEvery { api.update() } returns StatusAndData(
-            success = true,
-            data = "undocumented..."
-        )
+        coEvery { api.update() } returns
+            StatusAndData(
+                success = true,
+                data = "undocumented...",
+            )

        initializeRepository(MutableStateFlow(false))
        var response: Boolean
@@ -1037,7 +1056,7 @@ class RepositoryTest {
            appSettingsService.refreshLoginInformation(
                BASE_URL,
                "login",
-                "password"
+                "password",
            )
        }
    }
@@ -1057,13 +1076,14 @@ class RepositoryTest {
                any(),
                any(),
                any(),
-                any()
+                any(),
+            )
+        } returnsMany
+            listOf(
+                StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
+                StatusAndData(success = true, data = generateTestApiItem(itemParameter2)),
+                StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
            )
-        } returnsMany listOf(
-            StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
-            StatusAndData(success = true, data = generateTestApiItem(itemParameter2)),
-            StatusAndData(success = true, data = generateTestApiItem(itemParameter1)),
-        )

        initializeRepository()
        prepareSearch()
@@ -1077,7 +1097,7 @@ class RepositoryTest {
    @Test
    fun cache_items_but_response_fails() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = false, data = generateTestApiItem())
+            StatusAndData(success = false, data = generateTestApiItem())

        initializeRepository()
        prepareSearch()
@@ -1091,7 +1111,7 @@ class RepositoryTest {
    @Test
    fun cache_items_without_connection() {
        coEvery { api.getItems(any(), any(), any(), any(), any(), any(), any()) } returns
-                StatusAndData(success = false, data = generateTestApiItem())
+            StatusAndData(success = false, data = generateTestApiItem())

        initializeRepository(MutableStateFlow(false))
        prepareSearch()
@@ -1113,9 +1133,9 @@ class RepositoryTest {
                SPOUT,
                "",
                IMAGE_URL_2,
-                SelfossModel.SourceParams("url")
-            )
+                SelfossModel.SourceParams("url"),
+            ),
        )
        repository.searchFilter = "search"
    }
-}
+}
--- a/androidApp/src/test/kotlin/TestUtils.kt
+++ b/androidApp/src/test/kotlin/TestUtils.kt
@@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.repository
 import bou.amine.apps.readerforselfossv2.dao.ITEM
 import bou.amine.apps.readerforselfossv2.model.SelfossModel

-
 fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<ITEM> {
    return listOf(
        ITEM(
@@ -18,8 +17,8 @@ fun generateTestDBItems(item: FakeItemParameters = FakeItemParameters()): List<I
            link = item.link,
            sourcetitle = item.sourcetitle,
            tags = item.tags,
-            author = item.author
-        )
+            author = item.author,
+        ),
    )
 }

@@ -37,8 +36,8 @@ fun generateTestApiItem(item: FakeItemParameters = FakeItemParameters()): List<S
            link = item.link,
            sourcetitle = item.sourcetitle,
            tags = item.tags.split(','),
-            author = item.author
-        )
+            author = item.author,
+        ),
    )
 }

@@ -57,4 +56,4 @@ class FakeItemParameters {
    var sourcetitle = "La Chimica e la Società"
    var tags = "Chimica, Testing"
    var author = "Someone important"
-}
+}