Cleanup and centralize test data.

features/login/src/test/kotlin/io/element/android/features/login/changeserver/ChangeServerPresenterTest.kt

@@ -23,7 +23,7 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.Async
-import io.element.android.libraries.matrixtest.auth.A_HOMESERVER
+import io.element.android.libraries.matrixtest.A_HOMESERVER
 import io.element.android.libraries.matrixtest.auth.FakeAuthenticationService
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest

features/login/src/test/kotlin/io/element/android/features/login/root/LoginRootPresenterTest.kt

@@ -23,12 +23,12 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.core.SessionId
-import io.element.android.libraries.matrixtest.auth.A_FAILURE
+import io.element.android.libraries.matrixtest.A_FAILURE
-import io.element.android.libraries.matrixtest.auth.A_HOMESERVER
+import io.element.android.libraries.matrixtest.A_HOMESERVER
-import io.element.android.libraries.matrixtest.auth.A_HOMESERVER_2
+import io.element.android.libraries.matrixtest.A_HOMESERVER_2
-import io.element.android.libraries.matrixtest.auth.A_LOGIN
+import io.element.android.libraries.matrixtest.A_PASSWORD
-import io.element.android.libraries.matrixtest.auth.A_PASSWORD
+import io.element.android.libraries.matrixtest.A_SESSION_ID
-import io.element.android.libraries.matrixtest.auth.A_SESSION_ID
+import io.element.android.libraries.matrixtest.A_USER_NAME
 import io.element.android.libraries.matrixtest.auth.FakeAuthenticationService
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -60,13 +60,13 @@ class LoginRootPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink.invoke(LoginRootEvents.SetLogin(A_LOGIN))
+            initialState.eventSink.invoke(LoginRootEvents.SetLogin(A_USER_NAME))
             val loginState = awaitItem()
-            assertThat(loginState.formState).isEqualTo(LoginFormState(login = A_LOGIN, password = ""))
+            assertThat(loginState.formState).isEqualTo(LoginFormState(login = A_USER_NAME, password = ""))
             assertThat(loginState.submitEnabled).isFalse()
             initialState.eventSink.invoke(LoginRootEvents.SetPassword(A_PASSWORD))
             val loginAndPasswordState = awaitItem()
-            assertThat(loginAndPasswordState.formState).isEqualTo(LoginFormState(login = A_LOGIN, password = A_PASSWORD))
+            assertThat(loginAndPasswordState.formState).isEqualTo(LoginFormState(login = A_USER_NAME, password = A_PASSWORD))
             assertThat(loginAndPasswordState.submitEnabled).isTrue()
         }
     }
@@ -80,7 +80,7 @@ class LoginRootPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink.invoke(LoginRootEvents.SetLogin(A_LOGIN))
+            initialState.eventSink.invoke(LoginRootEvents.SetLogin(A_USER_NAME))
             initialState.eventSink.invoke(LoginRootEvents.SetPassword(A_PASSWORD))
             skipItems(1)
             val loginAndPasswordState = awaitItem()
@@ -102,7 +102,7 @@ class LoginRootPresenterTest {
             presenter.present()
         }.test {
             val initialState = awaitItem()
-            initialState.eventSink.invoke(LoginRootEvents.SetLogin(A_LOGIN))
+            initialState.eventSink.invoke(LoginRootEvents.SetLogin(A_USER_NAME))
             initialState.eventSink.invoke(LoginRootEvents.SetPassword(A_PASSWORD))
             skipItems(1)
             val loginAndPasswordState = awaitItem()

features/logout/src/test/kotlin/io/element/android/features/logout/LogoutPreferencePresenterTest.kt

@@ -24,8 +24,8 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.core.SessionId
+import io.element.android.libraries.matrixtest.A_FAILURE
 import io.element.android.libraries.matrixtest.FakeMatrixClient
-import io.element.android.libraries.matrixtest.auth.A_FAILURE
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Test

features/messages/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt

@@ -33,13 +33,13 @@ import io.element.android.features.messages.timeline.model.content.TimelineItemT
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.room.MatrixRoom
+import io.element.android.libraries.matrixtest.AN_EVENT_ID
+import io.element.android.libraries.matrixtest.A_MESSAGE
+import io.element.android.libraries.matrixtest.A_ROOM_ID
+import io.element.android.libraries.matrixtest.A_USER_ID
+import io.element.android.libraries.matrixtest.A_USER_NAME
 import io.element.android.libraries.matrixtest.FakeMatrixClient
-import io.element.android.libraries.matrixtest.core.A_ROOM_ID
-import io.element.android.libraries.matrixtest.room.A_MESSAGE
 import io.element.android.libraries.matrixtest.room.FakeMatrixRoom
-import io.element.android.libraries.matrixtest.timeline.AN_EVENT_ID
-import io.element.android.libraries.matrixtest.timeline.A_SENDER_ID
-import io.element.android.libraries.matrixtest.timeline.A_SENDER_NAME
 import io.element.android.libraries.textcomposer.MessageComposerMode
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -119,7 +119,7 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle action redact`() = runTest {
-        val matrixRoom = FakeMatrixRoom(A_ROOM_ID)
+        val matrixRoom = FakeMatrixRoom()
         val presenter = createMessagePresenter(matrixRoom)
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -132,7 +132,7 @@ class MessagesPresenterTest {
     }
 
     private fun TestScope.createMessagePresenter(
-        matrixRoom: MatrixRoom = FakeMatrixRoom(A_ROOM_ID)
+        matrixRoom: MatrixRoom = FakeMatrixRoom()
     ): MessagesPresenter {
         val matrixClient = FakeMatrixClient()
         val messageComposerPresenter = MessageComposerPresenter(
@@ -168,8 +168,8 @@ private fun aMessageEvent(
     content: TimelineItemContent = TimelineItemTextContent(body = A_MESSAGE, htmlDocument = null),
 ) = TimelineItem.MessageEvent(
     id = AN_EVENT_ID,
-    senderId = A_SENDER_ID,
+    senderId = A_USER_ID.value,
-    senderDisplayName = A_SENDER_NAME,
+    senderDisplayName = A_USER_NAME,
     senderAvatar = AvatarData(),
     content = content,
     sentTime = "",

features/messages/src/test/kotlin/io/element/android/features/messages/actionlist/ActionListPresenterTest.kt

@@ -29,10 +29,10 @@ import io.element.android.features.messages.timeline.model.content.TimelineItemC
 import io.element.android.features.messages.timeline.model.content.TimelineItemRedactedContent
 import io.element.android.features.messages.timeline.model.content.TimelineItemTextContent
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
-import io.element.android.libraries.matrixtest.room.A_MESSAGE
+import io.element.android.libraries.matrixtest.AN_EVENT_ID
-import io.element.android.libraries.matrixtest.timeline.AN_EVENT_ID
+import io.element.android.libraries.matrixtest.A_MESSAGE
-import io.element.android.libraries.matrixtest.timeline.A_SENDER_ID
+import io.element.android.libraries.matrixtest.A_USER_ID
-import io.element.android.libraries.matrixtest.timeline.A_SENDER_NAME
+import io.element.android.libraries.matrixtest.A_USER_NAME
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -166,8 +166,8 @@ private fun aMessageEvent(
     content: TimelineItemContent,
 ) = TimelineItem.MessageEvent(
     id = AN_EVENT_ID,
-    senderId = A_SENDER_ID,
+    senderId = A_USER_ID.value,
-    senderDisplayName = A_SENDER_NAME,
+    senderDisplayName = A_USER_NAME,
     senderAvatar = AvatarData(),
     content = content,
     sentTime = "",

features/messages/src/test/kotlin/io/element/android/features/messages/textcomposer/MessageComposerPresenterTest.kt

@@ -24,13 +24,12 @@ import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.core.data.StableCharSequence
-import io.element.android.libraries.matrixtest.core.A_ROOM_ID
+import io.element.android.libraries.matrixtest.ANOTHER_MESSAGE
-import io.element.android.libraries.matrixtest.room.ANOTHER_MESSAGE
+import io.element.android.libraries.matrixtest.AN_EVENT_ID
-import io.element.android.libraries.matrixtest.room.A_MESSAGE
+import io.element.android.libraries.matrixtest.A_MESSAGE
-import io.element.android.libraries.matrixtest.room.A_REPLY
+import io.element.android.libraries.matrixtest.A_REPLY
+import io.element.android.libraries.matrixtest.A_USER_NAME
 import io.element.android.libraries.matrixtest.room.FakeMatrixRoom
-import io.element.android.libraries.matrixtest.timeline.AN_EVENT_ID
-import io.element.android.libraries.matrixtest.timeline.A_SENDER_NAME
 import io.element.android.libraries.textcomposer.MessageComposerMode
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -41,7 +40,7 @@ class MessageComposerPresenterTest {
     fun `present - initial state`() = runTest {
         val presenter = MessageComposerPresenter(
             this,
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -58,7 +57,7 @@ class MessageComposerPresenterTest {
     fun `present - toggle fullscreen`() = runTest {
         val presenter = MessageComposerPresenter(
             this,
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -77,7 +76,7 @@ class MessageComposerPresenterTest {
     fun `present - change message`() = runTest {
         val presenter = MessageComposerPresenter(
             this,
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -98,7 +97,7 @@ class MessageComposerPresenterTest {
     fun `present - change mode to edit`() = runTest {
         val presenter = MessageComposerPresenter(
             this,
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -128,7 +127,7 @@ class MessageComposerPresenterTest {
     fun `present - change mode to reply`() = runTest {
         val presenter = MessageComposerPresenter(
             this,
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -148,7 +147,7 @@ class MessageComposerPresenterTest {
     fun `present - change mode to quote`() = runTest {
         val presenter = MessageComposerPresenter(
             this,
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -168,7 +167,7 @@ class MessageComposerPresenterTest {
     fun `present - send message`() = runTest {
         val presenter = MessageComposerPresenter(
             this,
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -187,7 +186,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - edit message`() = runTest {
-        val fakeMatrixRoom = FakeMatrixRoom(A_ROOM_ID)
+        val fakeMatrixRoom = FakeMatrixRoom()
         val presenter = MessageComposerPresenter(
             this,
             fakeMatrixRoom
@@ -218,7 +217,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - reply message`() = runTest {
-        val fakeMatrixRoom = FakeMatrixRoom(A_ROOM_ID)
+        val fakeMatrixRoom = FakeMatrixRoom()
         val presenter = MessageComposerPresenter(
             this,
             fakeMatrixRoom
@@ -230,7 +229,7 @@ class MessageComposerPresenterTest {
             assertThat(initialState.text).isEqualTo(StableCharSequence(""))
             val mode = aReplyMode()
             initialState.eventSink.invoke(MessageComposerEvents.SetMode(mode))
-            var state = awaitItem()
+            val state = awaitItem()
             assertThat(state.mode).isEqualTo(mode)
             assertThat(state.text).isEqualTo(StableCharSequence(""))
             assertThat(state.isSendButtonVisible).isFalse()
@@ -249,5 +248,5 @@ class MessageComposerPresenterTest {
 }
 
 fun anEditMode() = MessageComposerMode.Edit(AN_EVENT_ID, A_MESSAGE)
-fun aReplyMode() = MessageComposerMode.Reply(A_SENDER_NAME, AN_EVENT_ID, A_MESSAGE)
+fun aReplyMode() = MessageComposerMode.Reply(A_USER_NAME, AN_EVENT_ID, A_MESSAGE)
 fun aQuoteMode() = MessageComposerMode.Quote(AN_EVENT_ID, A_MESSAGE)

features/messages/src/test/kotlin/io/element/android/features/messages/timeline/TimelinePresenterTest.kt

@@ -24,10 +24,9 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.timeline.model.TimelineItem
 import io.element.android.libraries.matrix.timeline.MatrixTimelineItem
+import io.element.android.libraries.matrixtest.AN_EVENT_ID
 import io.element.android.libraries.matrixtest.FakeMatrixClient
-import io.element.android.libraries.matrixtest.core.A_ROOM_ID
 import io.element.android.libraries.matrixtest.room.FakeMatrixRoom
-import io.element.android.libraries.matrixtest.timeline.AN_EVENT_ID
 import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -39,7 +38,7 @@ class TimelinePresenterTest {
         val presenter = TimelinePresenter(
             testCoroutineDispatchers(),
             FakeMatrixClient(),
-            FakeMatrixRoom(A_ROOM_ID)
+            FakeMatrixRoom()
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -52,7 +51,7 @@ class TimelinePresenterTest {
     @Test
     fun `present - load more`() = runTest {
         val matrixTimeline = FakeMatrixTimeline()
-        val matrixRoom = FakeMatrixRoom(A_ROOM_ID, matrixTimeline = matrixTimeline)
+        val matrixRoom = FakeMatrixRoom(matrixTimeline = matrixTimeline)
         val presenter = TimelinePresenter(
             testCoroutineDispatchers(),
             FakeMatrixClient(),
@@ -73,7 +72,7 @@ class TimelinePresenterTest {
     @Test
     fun `present - set highlighted event`() = runTest {
         val matrixTimeline = FakeMatrixTimeline()
-        val matrixRoom = FakeMatrixRoom(A_ROOM_ID, matrixTimeline = matrixTimeline)
+        val matrixRoom = FakeMatrixRoom(matrixTimeline = matrixTimeline)
         val presenter = TimelinePresenter(
             testCoroutineDispatchers(),
             FakeMatrixClient(),
@@ -96,7 +95,7 @@ class TimelinePresenterTest {
     @Test
     fun `present - test callback`() = runTest {
         val matrixTimeline = FakeMatrixTimeline()
-        val matrixRoom = FakeMatrixRoom(A_ROOM_ID, matrixTimeline = matrixTimeline)
+        val matrixRoom = FakeMatrixRoom(matrixTimeline = matrixTimeline)
         val presenter = TimelinePresenter(
             testCoroutineDispatchers(),
             FakeMatrixClient(),

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

@@ -27,11 +27,13 @@ import io.element.android.features.roomlist.model.RoomListRoomSummary
 import io.element.android.libraries.dateformatter.LastMessageFormatter
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.core.SessionId
+import io.element.android.libraries.matrixtest.AN_AVATAR_URL
+import io.element.android.libraries.matrixtest.A_MESSAGE
+import io.element.android.libraries.matrixtest.A_ROOM_ID
+import io.element.android.libraries.matrixtest.A_ROOM_NAME
+import io.element.android.libraries.matrixtest.A_USER_ID
+import io.element.android.libraries.matrixtest.A_USER_NAME
 import io.element.android.libraries.matrixtest.FakeMatrixClient
-import io.element.android.libraries.matrixtest.core.A_ROOM_ID
-import io.element.android.libraries.matrixtest.core.A_ROOM_ID_VALUE
-import io.element.android.libraries.matrixtest.room.A_MESSAGE
-import io.element.android.libraries.matrixtest.room.A_ROOM_NAME
 import io.element.android.libraries.matrixtest.room.FakeRoomSummaryDataSource
 import io.element.android.libraries.matrixtest.room.aRoomSummaryFilled
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -55,6 +57,32 @@ class RoomListPresenterTests {
             assertThat(initialState.matrixUser).isNull()
             val withUserState = awaitItem()
             assertThat(withUserState.matrixUser).isNotNull()
+            assertThat(withUserState.matrixUser!!.id).isEqualTo(A_USER_ID)
+            assertThat(withUserState.matrixUser!!.username).isEqualTo(A_USER_NAME)
+            assertThat(withUserState.matrixUser!!.avatarData.name).isEqualTo(A_USER_NAME)
+            assertThat(withUserState.matrixUser!!.avatarData.url).isEqualTo(AN_AVATAR_URL)
+        }
+    }
+
+    @Test
+    fun `present - should start with no user and then load user with error`() = runTest {
+        val presenter = RoomListPresenter(
+            FakeMatrixClient(
+                SessionId("sessionId"),
+                userDisplayName = Result.failure(Exception("Error")),
+                userAvatarURLString = Result.failure(Exception("Error")),
+            ),
+            createDateFormatter()
+        )
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            assertThat(initialState.matrixUser).isNull()
+            val withUserState = awaitItem()
+            assertThat(withUserState.matrixUser).isNotNull()
+            // username fallback to user id value
+            assertThat(withUserState.matrixUser!!.username).isEqualTo(A_USER_ID.value)
         }
     }
 
@@ -182,7 +210,7 @@ class RoomListPresenterTests {
 private const val A_FORMATTED_DATE = "formatted_date"
 
 private val aRoomListRoomSummary = RoomListRoomSummary(
-    id = A_ROOM_ID_VALUE,
+    id = A_ROOM_ID.value,
     roomId = A_ROOM_ID,
     name = A_ROOM_NAME,
     hasUnread = true,

libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/FakeMatrixClient.kt

@@ -23,7 +23,6 @@ import io.element.android.libraries.matrix.core.UserId
 import io.element.android.libraries.matrix.media.MediaResolver
 import io.element.android.libraries.matrix.room.MatrixRoom
 import io.element.android.libraries.matrix.room.RoomSummaryDataSource
-import io.element.android.libraries.matrixtest.auth.A_SESSION_ID
 import io.element.android.libraries.matrixtest.media.FakeMediaResolver
 import io.element.android.libraries.matrixtest.room.FakeMatrixRoom
 import io.element.android.libraries.matrixtest.room.FakeRoomSummaryDataSource
@@ -32,6 +31,8 @@ import org.matrix.rustcomponents.sdk.MediaSource
 
 class FakeMatrixClient(
     override val sessionId: SessionId = SessionId(A_SESSION_ID),
+    private val userDisplayName: Result<String> = Result.success(A_USER_NAME),
+    private val userAvatarURLString: Result<String> = Result.success(AN_AVATAR_URL),
     val roomSummaryDataSource: RoomSummaryDataSource = FakeRoomSummaryDataSource()
 ) : MatrixClient {
 
@@ -62,14 +63,14 @@ class FakeMatrixClient(
         logoutFailure?.let { throw it }
     }
 
-    override fun userId(): UserId = UserId("")
+    override fun userId(): UserId = A_USER_ID
 
     override suspend fun loadUserDisplayName(): Result<String> {
-        return Result.success("")
+        return userDisplayName
     }
 
     override suspend fun loadUserAvatarURLString(): Result<String> {
-        return Result.success("")
+        return userAvatarURLString
     }
 
     override suspend fun loadMediaContentForSource(source: MediaSource): Result<ByteArray> {

libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/TestData.kt

@@ -0,0 +1,41 @@
+/*
+ * 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.libraries.matrixtest
+
+import io.element.android.libraries.matrix.core.EventId
+import io.element.android.libraries.matrix.core.RoomId
+import io.element.android.libraries.matrix.core.UserId
+
+const val A_USER_NAME = "alice"
+const val A_PASSWORD = "password"
+
+val A_USER_ID = UserId("@alice:server.org")
+val A_ROOM_ID = RoomId("!aRoomId")
+val AN_EVENT_ID = EventId("\$anEventId")
+
+const val A_ROOM_NAME = "A room name"
+const val A_MESSAGE = "Hello world!"
+const val A_REPLY = "OK, I'll be there!"
+const val ANOTHER_MESSAGE = "Hello universe!"
+
+const val A_HOMESERVER = "matrix.org"
+const val A_HOMESERVER_2 = "matrix-client.org"
+const val A_SESSION_ID = "sessionId"
+
+const val AN_AVATAR_URL = "mxc://data"
+
+val A_FAILURE = Throwable("error")

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

@@ -19,17 +19,12 @@ package io.element.android.libraries.matrixtest.auth
 import io.element.android.libraries.matrix.MatrixClient
 import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.core.SessionId
+import io.element.android.libraries.matrixtest.A_HOMESERVER
+import io.element.android.libraries.matrixtest.A_SESSION_ID
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
-const val A_HOMESERVER = "matrix.org"
-const val A_HOMESERVER_2 = "matrix-client.org"
-const val A_SESSION_ID = "sessionId"
-const val A_LOGIN = "login"
-const val A_PASSWORD = "password"
-val A_FAILURE = Throwable("error")
-
 class FakeAuthenticationService : MatrixAuthenticationService {
     private var homeserver: String = A_HOMESERVER
     private var loginError: Throwable? = null

libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/core/RoomIdFixture.kt

@@ -1,22 +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.libraries.matrixtest.core
-
-import io.element.android.libraries.matrix.core.RoomId
-
-const val A_ROOM_ID_VALUE = "!aRoomId"
-val A_ROOM_ID = RoomId(A_ROOM_ID_VALUE)

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

@@ -20,13 +20,14 @@ import io.element.android.libraries.matrix.core.EventId
 import io.element.android.libraries.matrix.core.RoomId
 import io.element.android.libraries.matrix.room.MatrixRoom
 import io.element.android.libraries.matrix.timeline.MatrixTimeline
+import io.element.android.libraries.matrixtest.A_ROOM_ID
 import io.element.android.libraries.matrixtest.timeline.FakeMatrixTimeline
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 
 class FakeMatrixRoom(
-    override val roomId: RoomId,
+    override val roomId: RoomId = A_ROOM_ID,
     override val name: String? = null,
     override val bestName: String = "",
     override val displayName: String = "",

libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/room/RoomSummaryFixture.kt

@@ -19,12 +19,9 @@ package io.element.android.libraries.matrixtest.room
 import io.element.android.libraries.matrix.core.RoomId
 import io.element.android.libraries.matrix.room.RoomSummary
 import io.element.android.libraries.matrix.room.RoomSummaryDetails
-import io.element.android.libraries.matrixtest.core.A_ROOM_ID
+import io.element.android.libraries.matrixtest.A_MESSAGE
-
+import io.element.android.libraries.matrixtest.A_ROOM_ID
-const val A_ROOM_NAME = "aRoomName"
+import io.element.android.libraries.matrixtest.A_ROOM_NAME
-const val A_MESSAGE = "Hello world!"
-const val A_REPLY = "OK, I'll be there!"
-const val ANOTHER_MESSAGE = "Hello universe!"
 
 fun aRoomSummaryFilled(
     roomId: RoomId = A_ROOM_ID,

libraries/matrixtest/src/main/kotlin/io/element/android/libraries/matrixtest/timeline/FakeMatrixTimeline.kt

@@ -24,11 +24,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import org.matrix.rustcomponents.sdk.TimelineListener
 
-const val A_SENDER_NAME = "Alice"
-const val A_SENDER_ID = "@alice:server.org"
-const val AN_EVENT_ID_VALUE = "!anEventId"
-val AN_EVENT_ID = EventId(AN_EVENT_ID_VALUE)
-
 class FakeMatrixTimeline : MatrixTimeline {
     override var callback: MatrixTimeline.Callback? = null