Add some tests on RoomFlowNode

services/appnavstate/impl/build.gradle.kts

@@ -47,4 +47,5 @@ dependencies {
     testImplementation(libs.coroutines.test)
     testImplementation(libs.test.truth)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.services.appnavstate.test)
 }

services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateServiceTest.kt

@@ -24,37 +24,35 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_SPACE_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.services.appnavstate.api.AppNavigationState
+import io.element.android.services.appnavstate.test.A_ROOM_OWNER
+import io.element.android.services.appnavstate.test.A_SESSION_OWNER
+import io.element.android.services.appnavstate.test.A_SPACE_OWNER
+import io.element.android.services.appnavstate.test.A_THREAD_OWNER
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertThrows
 import org.junit.Test
-
-private const val aSessionOwner = "aSessionOwner"
-private const val aSpaceOwner = "aSpaceOwner"
-private const val aRoomOwner = "aRoomOwner"
-private const val aThreadOwner = "aThreadOwner"
-
 class DefaultAppNavigationStateServiceTest {
 
     @Test
     fun testNavigation() = runTest {
         val service = DefaultAppNavigationStateService()
-        service.onNavigateToSession(aSessionOwner, A_SESSION_ID)
-        service.onNavigateToSpace(aSpaceOwner, A_SPACE_ID)
-        service.onNavigateToRoom(aRoomOwner, A_ROOM_ID)
-        service.onNavigateToThread(aThreadOwner, A_THREAD_ID)
+        service.onNavigateToSession(A_SESSION_OWNER, A_SESSION_ID)
+        service.onNavigateToSpace(A_SPACE_OWNER, A_SPACE_ID)
+        service.onNavigateToRoom(A_ROOM_OWNER, A_ROOM_ID)
+        service.onNavigateToThread(A_THREAD_OWNER, A_THREAD_ID)
         assertThat(service.appNavigationStateFlow.first()).isEqualTo(
             AppNavigationState.Thread(
-                aThreadOwner, A_THREAD_ID,
+                A_THREAD_OWNER, A_THREAD_ID,
                 AppNavigationState.Room(
-                    aRoomOwner,
+                    A_ROOM_OWNER,
                     A_ROOM_ID,
                     AppNavigationState.Space(
-                        aSpaceOwner,
+                        A_SPACE_OWNER,
                         A_SPACE_ID,
                         AppNavigationState.Session(
-                            aSessionOwner,
+                            A_SESSION_OWNER,
                             A_SESSION_ID
                         )
                     )
@@ -66,6 +64,6 @@ class DefaultAppNavigationStateServiceTest {
     @Test
     fun testFailure() = runTest {
         val service = DefaultAppNavigationStateService()
-        assertThrows(IllegalStateException::class.java) { service.onNavigateToSpace(aSpaceOwner, A_SPACE_ID) }
+        assertThrows(IllegalStateException::class.java) { service.onNavigateToSpace(A_SPACE_OWNER, A_SPACE_ID) }
     }
 }

services/appnavstate/test/build.gradle.kts

@@ -27,4 +27,5 @@ android {
 dependencies {
     api(projects.libraries.matrix.api)
     api(projects.services.appnavstate.api)
+    implementation(libs.coroutines.core)
 }

services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/AppNavStateFixture.kt

@@ -23,27 +23,31 @@ import io.element.android.libraries.matrix.api.core.SpaceId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.services.appnavstate.api.AppNavigationState
 
+const val A_SESSION_OWNER = "aSessionOwner"
+const val A_SPACE_OWNER = "aSpaceOwner"
+const val A_ROOM_OWNER = "aRoomOwner"
+const val A_THREAD_OWNER = "aThreadOwner"
+
 fun anAppNavigationState(
     sessionId: SessionId? = null,
     spaceId: SpaceId? = MAIN_SPACE,
     roomId: RoomId? = null,
     threadId: ThreadId? = null,
-    owner: String = "a-owner",
 ): AppNavigationState {
     if (sessionId == null) {
         return AppNavigationState.Root
     }
-    val session = AppNavigationState.Session(owner, sessionId)
+    val session = AppNavigationState.Session(A_SESSION_OWNER, sessionId)
     if (spaceId == null) {
         return session
     }
-    val space = AppNavigationState.Space(owner, spaceId, session)
+    val space = AppNavigationState.Space(A_SPACE_OWNER, spaceId, session)
     if (roomId == null) {
         return space
     }
-    val room = AppNavigationState.Room(owner, roomId, space)
+    val room = AppNavigationState.Room(A_ROOM_OWNER, roomId, space)
     if (threadId == null) {
         return room
     }
-    return AppNavigationState.Thread(owner, threadId, room)
+    return AppNavigationState.Thread(A_THREAD_OWNER, threadId, room)
 }

services/appnavstate/test/src/main/kotlin/io/element/android/services/appnavstate/test/NoopAppNavigationStateService.kt

@@ -0,0 +1,48 @@
+/*
+ * 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.services.appnavstate.test
+
+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.SpaceId
+import io.element.android.libraries.matrix.api.core.ThreadId
+import io.element.android.services.appnavstate.api.AppNavigationState
+import io.element.android.services.appnavstate.api.AppNavigationStateService
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+
+class NoopAppNavigationStateService : AppNavigationStateService {
+
+    private val currentAppNavigationState: MutableStateFlow<AppNavigationState> =
+        MutableStateFlow(AppNavigationState.Root)
+    override val appNavigationStateFlow: StateFlow<AppNavigationState> = currentAppNavigationState
+
+    override fun onNavigateToSession(owner: String, sessionId: SessionId) = Unit
+    override fun onLeavingSession(owner: String) = Unit
+
+    override fun onNavigateToSpace(owner: String, spaceId: SpaceId) = Unit
+
+    override fun onLeavingSpace(owner: String) = Unit
+
+    override fun onNavigateToRoom(owner: String, roomId: RoomId) = Unit
+
+    override fun onLeavingRoom(owner: String) = Unit
+
+    override fun onNavigateToThread(owner: String, threadId: ThreadId) = Unit
+
+    override fun onLeavingThread(owner: String) = Unit
+}