Merge pull request #1465 from vector-im/feature/bma/codeCoverage

Improve code coverage

appnav/src/test/kotlin/io/element/android/appnav/di/MatrixClientsHolderTest.kt

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appnav.di
+
+import com.bumble.appyx.core.state.MutableSavedStateMapImpl
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class MatrixClientsHolderTest {
+    @Test
+    fun `test getOrNull`() {
+        val fakeAuthenticationService = FakeAuthenticationService()
+        val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isNull()
+    }
+
+    @Test
+    fun `test getOrRestore`() = runTest {
+        val fakeAuthenticationService = FakeAuthenticationService()
+        val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient()
+        fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isNull()
+        assertThat(matrixClientsHolder.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
+        // Do it again to it the cache
+        assertThat(matrixClientsHolder.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isEqualTo(fakeMatrixClient)
+    }
+
+    @Test
+    fun `test remove`() = runTest {
+        val fakeAuthenticationService = FakeAuthenticationService()
+        val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient()
+        fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
+        assertThat(matrixClientsHolder.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isEqualTo(fakeMatrixClient)
+        // Remove
+        matrixClientsHolder.remove(A_SESSION_ID)
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isNull()
+    }
+
+    @Test
+    fun `test remove all`() = runTest {
+        val fakeAuthenticationService = FakeAuthenticationService()
+        val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient()
+        fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
+        assertThat(matrixClientsHolder.getOrRestore(A_SESSION_ID).getOrNull()).isEqualTo(fakeMatrixClient)
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isEqualTo(fakeMatrixClient)
+        // Remove all
+        matrixClientsHolder.removeAll()
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isNull()
+    }
+
+    @Test
+    fun `test save and restore`() = runTest {
+        val fakeAuthenticationService = FakeAuthenticationService()
+        val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
+        val fakeMatrixClient = FakeMatrixClient()
+        fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
+        matrixClientsHolder.getOrRestore(A_SESSION_ID)
+        val savedStateMap = MutableSavedStateMapImpl { true }
+        matrixClientsHolder.saveIntoSavedState(savedStateMap)
+        assertThat(savedStateMap.size).isEqualTo(1)
+        // Test Restore with non-empty map
+        matrixClientsHolder.restoreWithSavedState(savedStateMap)
+        // Empty the map
+        matrixClientsHolder.removeAll()
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isNull()
+        // Restore again
+        matrixClientsHolder.restoreWithSavedState(savedStateMap)
+        assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isEqualTo(fakeMatrixClient)
+    }
+}

build.gradle.kts

@@ -45,7 +45,7 @@ plugins {
 }
 
 tasks.register<Delete>("clean").configure {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
 
 allprojects {
@@ -86,7 +86,7 @@ allprojects {
             reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
         }
         filter {
-            exclude { element -> element.file.path.contains("$buildDir/generated/") }
+            exclude { element -> element.file.path.contains("${layout.buildDirectory.asFile.get()}/generated/") }
         }
     }
     // Dependency check
@@ -176,10 +176,13 @@ koverMerged {
                     "*_ModuleKt",
                     "anvil.hint.binding.io.element.*",
                     "anvil.hint.merge.*",
+                    "anvil.hint.multibinding.io.element.*",
                     "anvil.module.*",
                     "com.airbnb.android.showkase*",
                     "io.element.android.libraries.designsystem.showkase.*",
+                    "io.element.android.x.di.DaggerAppComponent*",
                     "*_Factory",
+                    "*_Factory_Impl",
                     "*_Factory$*",
                     "*_Module",
                     "*_Module$*",
@@ -228,11 +231,11 @@ koverMerged {
             name = "Global minimum code coverage."
             target = kotlinx.kover.api.VerificationTarget.ALL
             bound {
-                minValue = 55
+                minValue = 60
                 // Setting a max value, so that if coverage is bigger, it means that we have to change minValue.
                 // For instance if we have minValue = 20 and maxValue = 30, and current code coverage is now 31.32%, update
                 // minValue to 25 and maxValue to 35.
-                maxValue = 65
+                maxValue = 70
                 counter = kotlinx.kover.api.CounterType.INSTRUCTION
                 valueType = kotlinx.kover.api.VerificationValueType.COVERED_PERCENTAGE
             }
@@ -354,7 +357,7 @@ subprojects {
 subprojects {
     tasks.withType<KspTask>() {
         doLast {
-            fileTree(buildDir).apply { include("**/*ShowkaseExtension*.kt") }.files.forEach { file ->
+            fileTree(layout.buildDirectory).apply { include("**/*ShowkaseExtension*.kt") }.files.forEach { file ->
                 ReplaceRegExp().apply {
                     setMatch("^public fun Showkase.getMetadata")
                     setReplace("@Suppress(\"DEPRECATION\") public fun Showkase.getMetadata")

features/leaveroom/fake/src/main/kotlin/io/element/android/features/leaveroom/fake/LeaveRoomPresenterFakeModule.kt

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2023 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.features.leaveroom.fake
-
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Binds
-import dagger.Module
-import io.element.android.features.leaveroom.api.LeaveRoomPresenter
-import io.element.android.libraries.di.SessionScope
-
-@Module
-@ContributesTo(SessionScope::class)
-interface LeaveRoomPresenterFakeModule {
-    @Binds
-    fun leaveRoomPresenter(leaveRoomPresenter: LeaveRoomPresenterFake): LeaveRoomPresenter
-}

features/leaveroom/test/build.gradle.kts

@@ -16,29 +16,15 @@
 
 plugins {
     id("io.element.android-compose-library")
-    alias(libs.plugins.anvil)
 }
 
 android {
-    namespace = "io.element.android.features.leaveroom.fake"
-}
-
-anvil {
-    generateDaggerFactories.set(true)
+    namespace = "io.element.android.features.leaveroom.test"
 }
 
 dependencies {
-    implementation(projects.anvilannotations)
-    anvil(projects.anvilcodegen)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     api(projects.features.leaveroom.api)
-
-    testImplementation(libs.test.junit)
-    testImplementation(libs.coroutines.test)
-    testImplementation(libs.coroutines.core)
-    testImplementation(libs.molecule.runtime)
-    testImplementation(libs.test.truth)
-    testImplementation(libs.test.turbine)
 }

features/leaveroom/test/src/main/kotlin/io/element/android/features/leaveroom/fake/FakeLeaveRoomPresenter.kt

@@ -20,9 +20,8 @@ import androidx.compose.runtime.Composable
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.leaveroom.api.LeaveRoomState
-import javax.inject.Inject
 
-class LeaveRoomPresenterFake @Inject constructor() : LeaveRoomPresenter {
+class FakeLeaveRoomPresenter: LeaveRoomPresenter {
 
     val events = mutableListOf<LeaveRoomEvent>()
 

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt

@@ -21,6 +21,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import io.element.android.features.login.impl.R
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
@@ -39,3 +41,12 @@ internal fun SlidingSyncNotSupportedDialog(
         content = stringResource(R.string.screen_change_server_error_no_sliding_sync_message),
     )
 }
+
+@PreviewsDayNight
+@Composable
+internal fun SlidingSyncNotSupportedDialogPreview() = ElementPreview {
+    SlidingSyncNotSupportedDialog(
+        onLearnMoreClicked = {},
+        onDismiss = {},
+    )
+}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesStateProvider.kt

@@ -20,8 +20,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
+import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
@@ -29,29 +29,37 @@ open class ForwardMessagesStateProvider : PreviewParameterProvider<ForwardMessag
     override val values: Sequence<ForwardMessagesState>
         get() = sequenceOf(
             aForwardMessagesState(),
-            aForwardMessagesState(query = "Test"),
+            aForwardMessagesState(query = "Test", isSearchActive = true),
             aForwardMessagesState(resultState = SearchBarResultState.Results(aForwardMessagesRoomList())),
-            aForwardMessagesState(resultState = SearchBarResultState.Results(aForwardMessagesRoomList()), query = "Test"),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
+            ),
+            aForwardMessagesState(
+                resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
+                query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain")))
             ),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain"))),
                 isForwarding = true,
             ),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain"))),
                 forwardingSucceeded = persistentListOf(RoomId("!room2:domain")),
             ),
             aForwardMessagesState(
                 resultState = SearchBarResultState.Results(aForwardMessagesRoomList()),
                 query = "Test",
+                isSearchActive = true,
                 selectedRooms = persistentListOf(aRoomDetailsState(roomId = RoomId("!room2:domain"))),
                 error = Throwable("error"),
             ),
@@ -78,7 +86,7 @@ fun aForwardMessagesState(
     eventSink = {}
 )
 
-internal fun aForwardMessagesRoomList() = listOf(
+internal fun aForwardMessagesRoomList() = persistentListOf(
     aRoomDetailsState(),
     aRoomDetailsState(roomId = RoomId("!room2:domain"), canonicalAlias = "#element-x-room:matrix.org"),
 )
@@ -94,13 +102,13 @@ fun aRoomDetailsState(
     unreadNotificationCount: Int = 0,
     inviter: RoomMember? = null,
 ) = RoomSummaryDetails(
-        roomId = roomId,
-        name = name,
-        canonicalAlias = canonicalAlias,
-        isDirect = isDirect,
-        avatarURLString = avatarURLString,
-        lastMessage = lastMessage,
-        lastMessageTimestamp = lastMessageTimestamp,
-        unreadNotificationCount = unreadNotificationCount,
-        inviter = inviter,
-    )
+    roomId = roomId,
+    name = name,
+    canonicalAlias = canonicalAlias,
+    isDirect = isDirect,
+    avatarURLString = avatarURLString,
+    lastMessage = lastMessage,
+    lastMessageTimestamp = lastMessageTimestamp,
+    unreadNotificationCount = unreadNotificationCount,
+    inviter = inviter,
+)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt

@@ -135,7 +135,7 @@ fun ForwardMessagesView(
                 .padding(paddingValues)
                 .consumeWindowInsets(paddingValues)
         ) {
-            SearchBar<ImmutableList<RoomSummaryDetails>>(
+            SearchBar(
                 placeHolderTitle = stringResource(CommonStrings.action_search),
                 query = state.query,
                 onQueryChange = { state.eventSink(ForwardMessagesEvents.UpdateQuery(it)) },

features/roomdetails/impl/build.gradle.kts

@@ -64,7 +64,7 @@ dependencies {
     testImplementation(projects.libraries.usersearch.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.tests.testutils)
-    testImplementation(projects.features.leaveroom.fake)
+    testImplementation(projects.features.leaveroom.test)
 
     ksp(libs.showkase.processor)
 }

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt

@@ -22,7 +22,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomPresenter
-import io.element.android.features.leaveroom.fake.LeaveRoomPresenterFake
+import io.element.android.features.leaveroom.fake.FakeLeaveRoomPresenter
 import io.element.android.features.roomdetails.impl.RoomDetailsEvent
 import io.element.android.features.roomdetails.impl.RoomDetailsPresenter
 import io.element.android.features.roomdetails.impl.RoomDetailsType
@@ -61,7 +61,7 @@ class RoomDetailsPresenterTests {
     val warmUpRule = WarmUpRule()
     private fun aRoomDetailsPresenter(
         room: MatrixRoom,
-        leaveRoomPresenter: LeaveRoomPresenter = LeaveRoomPresenterFake(),
+        leaveRoomPresenter: LeaveRoomPresenter = FakeLeaveRoomPresenter(),
         dispatchers: CoroutineDispatchers,
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService()
     ): RoomDetailsPresenter {
@@ -348,7 +348,7 @@ class RoomDetailsPresenterTests {
 
     @Test
     fun `present - leave room event is passed on to leave room presenter`() = runTest {
-        val leaveRoomPresenter = LeaveRoomPresenterFake()
+        val leaveRoomPresenter = FakeLeaveRoomPresenter()
         val room = aMatrixRoom()
         val presenter = aRoomDetailsPresenter(room, leaveRoomPresenter, testCoroutineDispatchers())
         moleculeFlow(RecompositionMode.Immediate) {
@@ -364,7 +364,7 @@ class RoomDetailsPresenterTests {
 
     @Test
     fun `present - notification mode changes`() = runTest {
-        val leaveRoomPresenter = LeaveRoomPresenterFake()
+        val leaveRoomPresenter = FakeLeaveRoomPresenter()
         val notificationSettingsService = FakeNotificationSettingsService()
         val room = aMatrixRoom(notificationSettingsService = notificationSettingsService)
         val presenter = aRoomDetailsPresenter(room, leaveRoomPresenter, testCoroutineDispatchers(), notificationSettingsService)
@@ -383,7 +383,7 @@ class RoomDetailsPresenterTests {
 
     @Test
     fun `present - mute room notifications`() = runTest {
-        val leaveRoomPresenter = LeaveRoomPresenterFake()
+        val leaveRoomPresenter = FakeLeaveRoomPresenter()
         val notificationSettingsService = FakeNotificationSettingsService(initialRoomMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY)
         val room = aMatrixRoom(notificationSettingsService = notificationSettingsService)
         val presenter = aRoomDetailsPresenter(room, leaveRoomPresenter, testCoroutineDispatchers(), notificationSettingsService)
@@ -401,7 +401,7 @@ class RoomDetailsPresenterTests {
 
     @Test
     fun `present - unmute room notifications`() = runTest {
-        val leaveRoomPresenter = LeaveRoomPresenterFake()
+        val leaveRoomPresenter = FakeLeaveRoomPresenter()
         val notificationSettingsService = FakeNotificationSettingsService(
             initialRoomMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
             initialEncryptedGroupDefaultMode = RoomNotificationMode.ALL_MESSAGES

features/roomlist/impl/build.gradle.kts

@@ -70,5 +70,5 @@ dependencies {
     testImplementation(projects.features.invitelist.test)
     testImplementation(projects.features.networkmonitor.test)
     testImplementation(projects.tests.testutils)
-    testImplementation(projects.features.leaveroom.fake)
+    testImplementation(projects.features.leaveroom.test)
 }

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt

@@ -22,7 +22,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomPresenter
-import io.element.android.features.leaveroom.fake.LeaveRoomPresenterFake
+import io.element.android.features.leaveroom.fake.FakeLeaveRoomPresenter
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
 import io.element.android.features.roomlist.impl.datasource.FakeInviteDataSource
@@ -316,7 +316,7 @@ class RoomListPresenterTests {
 
     @Test
     fun `present - leave room calls into leave room presenter`() = runTest {
-        val leaveRoomPresenter = LeaveRoomPresenterFake()
+        val leaveRoomPresenter = FakeLeaveRoomPresenter()
         val scope = CoroutineScope(coroutineContext + SupervisorJob())
         val presenter = createRoomListPresenter(leaveRoomPresenter = leaveRoomPresenter, coroutineScope = scope)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -364,7 +364,7 @@ class RoomListPresenterTests {
         networkMonitor: NetworkMonitor = FakeNetworkMonitor(),
         snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
         inviteStateDataSource: InviteStateDataSource = FakeInviteDataSource(),
-        leaveRoomPresenter: LeaveRoomPresenter = LeaveRoomPresenterFake(),
+        leaveRoomPresenter: LeaveRoomPresenter = FakeLeaveRoomPresenter(),
         lastMessageTimestampFormatter: LastMessageTimestampFormatter = FakeLastMessageTimestampFormatter().apply {
             givenFormat(A_FORMATTED_DATE)
         },

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt

@@ -36,6 +36,7 @@ class FakeAuthenticationService : MatrixAuthenticationService {
     private var oidcCancelError: Throwable? = null
     private var loginError: Throwable? = null
     private var changeServerError: Throwable? = null
+    private var matrixClient: MatrixClient? = null
 
     override fun isLoggedIn(): Flow<Boolean> {
         return flowOf(false)
@@ -46,7 +47,11 @@ class FakeAuthenticationService : MatrixAuthenticationService {
     }
 
     override suspend fun restoreSession(sessionId: SessionId): Result<MatrixClient> {
-        return Result.failure(IllegalStateException())
+        return if (matrixClient != null) {
+            Result.success(matrixClient!!)
+        } else {
+            Result.failure(IllegalStateException())
+        }
     }
 
     override fun getHomeserverDetails(): StateFlow<MatrixHomeServerDetails?> {
@@ -92,4 +97,8 @@ class FakeAuthenticationService : MatrixAuthenticationService {
     fun givenChangeServerError(throwable: Throwable?) {
         changeServerError = throwable
     }
+
+    fun givenMatrixClient(matrixClient: MatrixClient) {
+        this.matrixClient = matrixClient
+    }
 }