From ef28cf314ecc71ef3241a34a51913d585fb5a0d9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 15 May 2024 11:31:30 +0200
Subject: [PATCH] Move aMatrixRoom to its own file, since it's used by several
 test classes.

---
 .../features/roomdetails/MatrixRoomFixture.kt | 43 +++++++++++++++++++
 .../roomdetails/RoomDetailsPresenterTests.kt  | 22 ----------
 2 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/MatrixRoomFixture.kt

diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/MatrixRoomFixture.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/MatrixRoomFixture.kt
new file mode 100644
index 0000000000..694f41883a
--- /dev/null
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/MatrixRoomFixture.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 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.roomdetails
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
+import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+
+fun aMatrixRoom(
+    roomId: RoomId = A_ROOM_ID,
+    displayName: String = A_ROOM_NAME,
+    topic: String? = "A topic",
+    avatarUrl: String? = "https://matrix.org/avatar.jpg",
+    isEncrypted: Boolean = true,
+    isPublic: Boolean = true,
+    isDirect: Boolean = false,
+    notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService()
+) = FakeMatrixRoom(
+    roomId = roomId,
+    displayName = displayName,
+    topic = topic,
+    avatarUrl = avatarUrl,
+    isEncrypted = isEncrypted,
+    isPublic = isPublic,
+    isDirect = isDirect,
+    notificationSettingsService = notificationSettingsService
+)
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt
index 998193690e..991183b9b3 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt
@@ -37,14 +37,11 @@ import io.element.android.features.roomdetails.impl.members.details.RoomMemberDe
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
-import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.StateEventType
-import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClient
@@ -474,22 +471,3 @@ class RoomDetailsPresenterTests {
     }
 }
 
-fun aMatrixRoom(
-    roomId: RoomId = A_ROOM_ID,
-    displayName: String = A_ROOM_NAME,
-    topic: String? = "A topic",
-    avatarUrl: String? = "https://matrix.org/avatar.jpg",
-    isEncrypted: Boolean = true,
-    isPublic: Boolean = true,
-    isDirect: Boolean = false,
-    notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService()
-) = FakeMatrixRoom(
-    roomId = roomId,
-    displayName = displayName,
-    topic = topic,
-    avatarUrl = avatarUrl,
-    isEncrypted = isEncrypted,
-    isPublic = isPublic,
-    isDirect = isDirect,
-    notificationSettingsService = notificationSettingsService
-)