From 30847e9e1f95e215a520f0448c256c6158a5d90a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 12 Sep 2024 12:09:02 +0200
Subject: [PATCH] Add unit test on toAnalyticsJoinedRoom and fix a mapping
 issue.

---
 .../matrix/impl/analytics/JoinedRoomExt.kt    |  5 +-
 .../impl/analytics/JoinedRoomExtKtTest.kt     | 91 +++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExtKtTest.kt

diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
index a454c1b58f..81ef1672e3 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
@@ -10,9 +10,10 @@ package io.element.android.libraries.matrix.impl.analytics
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 
-private fun Long?.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
+private fun Long.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
     return when (this) {
-        null,
+        0L,
+        1L -> JoinedRoom.RoomSize.One
         2L -> JoinedRoom.RoomSize.Two
         in 3..10 -> JoinedRoom.RoomSize.ThreeToTen
         in 11..100 -> JoinedRoom.RoomSize.ElevenToOneHundred
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExtKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExtKtTest.kt
new file mode 100644
index 0000000000..6140f32b2e
--- /dev/null
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExtKtTest.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.analytics
+
+import com.google.common.truth.Truth.assertThat
+import im.vector.app.features.analytics.plan.JoinedRoom
+import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import org.junit.Test
+
+class JoinedRoomExtKtTest {
+    @Test
+    fun `test room size mapping`() {
+        mapOf(
+            listOf(0L, 1L) to JoinedRoom.RoomSize.One,
+            listOf(2L, 2L) to JoinedRoom.RoomSize.Two,
+            listOf(3L, 10L) to JoinedRoom.RoomSize.ThreeToTen,
+            listOf(11L, 100L) to JoinedRoom.RoomSize.ElevenToOneHundred,
+            listOf(101L, 1000L) to JoinedRoom.RoomSize.OneHundredAndOneToAThousand,
+            listOf(1001L, 2000L) to JoinedRoom.RoomSize.MoreThanAThousand
+        ).forEach { (joinedMemberCounts, expectedRoomSize) ->
+            joinedMemberCounts.forEach { joinedMemberCount ->
+                assertThat(aMatrixRoom(joinedMemberCount = joinedMemberCount).toAnalyticsJoinedRoom(null))
+                    .isEqualTo(
+                        JoinedRoom(
+                            isDM = false,
+                            isSpace = false,
+                            roomSize = expectedRoomSize,
+                            trigger = null
+                        )
+                    )
+            }
+        }
+    }
+
+    @Test
+    fun `test isDirect parameter mapping`() {
+        assertThat(aMatrixRoom(isDirect = true).toAnalyticsJoinedRoom(null))
+            .isEqualTo(
+                JoinedRoom(
+                    isDM = true,
+                    isSpace = false,
+                    roomSize = JoinedRoom.RoomSize.One,
+                    trigger = null
+                )
+            )
+    }
+
+    @Test
+    fun `test isSpace parameter mapping`() {
+        assertThat(aMatrixRoom(isSpace = true).toAnalyticsJoinedRoom(null))
+            .isEqualTo(
+                JoinedRoom(
+                    isDM = false,
+                    isSpace = true,
+                    roomSize = JoinedRoom.RoomSize.One,
+                    trigger = null
+                )
+            )
+    }
+
+    @Test
+    fun `test trigger parameter mapping`() {
+        assertThat(aMatrixRoom().toAnalyticsJoinedRoom(JoinedRoom.Trigger.Invite))
+            .isEqualTo(
+                JoinedRoom(
+                    isDM = false,
+                    isSpace = false,
+                    roomSize = JoinedRoom.RoomSize.One,
+                    trigger = JoinedRoom.Trigger.Invite
+                )
+            )
+    }
+
+    private fun aMatrixRoom(
+        isDirect: Boolean = false,
+        isSpace: Boolean = false,
+        joinedMemberCount: Long = 0
+    ): MatrixRoom {
+        return FakeMatrixRoom(
+            isDirect = isDirect,
+            isSpace = isSpace,
+            joinedMemberCount = joinedMemberCount
+        )
+    }
+}