Merge pull request #850 from vector-im/feature/bma/fixTests

Ensure CI run all the tests.

.github/workflows/nightlyReports.yml

@@ -26,6 +26,9 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'
 
+      - name: ⚙️ Run unit & screenshot tests, debug and release
+        run: ./gradlew test $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+
       - name: ⚙️ Run unit & screenshot tests, generate kover report
         run: ./gradlew koverMergedReport $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
 

.github/workflows/tests.yml

@@ -37,6 +37,9 @@ jobs:
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
 
+      - name: ⚙️ Run unit & screenshot tests, debug and release
+        run: ./gradlew test $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
+
       - name: ⚙️ Run unit & screenshot tests, generate kover report
         run: ./gradlew koverMergedReport $CI_GRADLE_ARG_PROPERTIES -Pci-build=true
 

features/messages/impl/src/test/kotlin/io/element/android/features/messages/forward/ForwardMessagesPresenterTests.kt

@@ -65,7 +65,6 @@ class ForwardMessagesPresenterTests {
         }.test {
             val initialState = awaitItem()
             skipItems(1)
-            val summary = aRoomSummaryDetail()
 
             initialState.eventSink(ForwardMessagesEvents.ToggleSearchActive)
             assertThat(awaitItem().isSearchActive).isTrue()

libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt

@@ -64,7 +64,7 @@ fun String?.insertBeforeLast(insert: String, delimiter: String = "."): String {
  * Throws if length is < 1.
  */
 fun String.ellipsize(length: Int): String {
-    require(length > 1)
+    require(length >= 1)
 
     if (this.length <= length) {
         return this

libraries/deeplink/src/main/kotlin/io/element/android/libraries/deeplink/DeeplinkParser.kt

@@ -18,7 +18,6 @@ package io.element.android.libraries.deeplink
 
 import android.content.Intent
 import android.net.Uri
-import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
@@ -37,21 +36,15 @@ class DeeplinkParser @Inject constructor() {
         if (host != HOST) return null
         val pathBits = path.orEmpty().split("/").drop(1)
         val sessionId = pathBits.elementAtOrNull(0)?.let(::SessionId) ?: return null
-        val screenPathComponent = pathBits.elementAtOrNull(1)
-        val roomId = tryOrNull { screenPathComponent?.let(::RoomId) }
 
-        return when {
+        return when (val screenPathComponent = pathBits.elementAtOrNull(1)) {
-            roomId != null -> {
+            null -> DeeplinkData.Root(sessionId)
+            DeepLinkPaths.INVITE_LIST -> DeeplinkData.InviteList(sessionId)
+            else -> {
+                val roomId = screenPathComponent.let(::RoomId)
                 val threadId = pathBits.elementAtOrNull(2)?.let(::ThreadId)
                 DeeplinkData.Room(sessionId, roomId, threadId)
             }
-            screenPathComponent == DeepLinkPaths.INVITE_LIST -> {
-                DeeplinkData.InviteList(sessionId)
-            }
-            screenPathComponent == null -> {
-                DeeplinkData.Root(sessionId)
-            }
-            else -> null
         }
     }
 }

libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt

@@ -34,7 +34,7 @@ class RoomMembershipContentFormatter @Inject constructor(
     ): CharSequence? {
         val userId = membershipContent.userId
         val memberIsYou = matrixClient.isMe(userId)
-        return when (val change = membershipContent.change) {
+        return when (membershipContent.change) {
             MembershipChange.JOINED -> if (memberIsYou) {
                 sp.getString(R.string.state_event_room_join_by_you)
             } else {

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt

@@ -86,7 +86,7 @@ interface MatrixRoom : Closeable {
 
     suspend fun toggleReaction(emoji: String, eventId: EventId): Result<Unit>
 
-    suspend fun forwardEvent(eventId: EventId, rooms: List<RoomId>): Result<Unit>
+    suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit>
 
     suspend fun retrySendMessage(transactionId: String): Result<Unit>
 

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

@@ -239,7 +239,7 @@ class FakeMatrixRoom(
 
     override suspend fun sendFile(file: File, fileInfo: FileInfo, progressCallback: ProgressCallback?): Result<Unit> = fakeSendMedia(progressCallback)
 
-    override suspend fun forwardEvent(eventId: EventId, rooms: List<RoomId>): Result<Unit> = simulateLongTask {
+    override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit> = simulateLongTask {
         forwardEventResult
     }
 

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationFactory.kt

@@ -123,7 +123,7 @@ class NotificationFactory @Inject constructor(
         val roomMeta = roomNotifications.filterIsInstance<RoomNotification.Message>().map { it.meta }
         val invitationMeta = invitationNotifications.filterIsInstance<OneShotNotification.Append>().map { it.meta }
         val simpleMeta = simpleNotifications.filterIsInstance<OneShotNotification.Append>().map { it.meta }
-        val fallbackMeta = simpleNotifications.filterIsInstance<OneShotNotification.Append>().map { it.meta }
+        val fallbackMeta = fallbackNotifications.filterIsInstance<OneShotNotification.Append>().map { it.meta }
         return when {
             roomMeta.isEmpty() && invitationMeta.isEmpty() && simpleMeta.isEmpty() -> SummaryNotification.Removed
             else -> SummaryNotification.Update(