ganfra
1 year ago
committed by
GitHub
28 changed files with 361 additions and 218 deletions
@ -1,46 +0,0 @@
@@ -1,46 +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.appnav |
||||
|
||||
import androidx.compose.runtime.Composable |
||||
import androidx.compose.runtime.LaunchedEffect |
||||
import io.element.android.libraries.architecture.Presenter |
||||
import io.element.android.libraries.matrix.api.room.MatrixRoom |
||||
import timber.log.Timber |
||||
|
||||
class RoomFlowPresenter( |
||||
private val room: MatrixRoom, |
||||
) : Presenter<RoomFlowState> { |
||||
|
||||
@Composable |
||||
override fun present(): RoomFlowState { |
||||
// Preload room members so we can quickly detect if the room is a DM room |
||||
LaunchedEffect(Unit) { |
||||
room.fetchMembers() |
||||
.onFailure { |
||||
Timber.e(it, "Fail to fetch members for room ${room.roomId}") |
||||
}.onSuccess { |
||||
Timber.v("Success fetching members for room ${room.roomId}") |
||||
} |
||||
} |
||||
|
||||
return RoomFlowState |
||||
} |
||||
} |
||||
|
||||
// At first the return type was Unit, but detekt complained about it |
||||
object RoomFlowState |
||||
@ -0,0 +1,130 @@
@@ -0,0 +1,130 @@
|
||||
/* |
||||
* 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.appnav |
||||
|
||||
import androidx.arch.core.executor.testing.InstantTaskExecutorRule |
||||
import androidx.lifecycle.Lifecycle |
||||
import com.bumble.appyx.core.modality.BuildContext |
||||
import com.bumble.appyx.core.node.Node |
||||
import com.bumble.appyx.core.node.node |
||||
import com.bumble.appyx.core.plugin.Plugin |
||||
import com.bumble.appyx.navmodel.backstack.activeElement |
||||
import com.bumble.appyx.testing.junit4.util.MainDispatcherRule |
||||
import com.bumble.appyx.testing.unit.common.helper.nodeTestHelper |
||||
import com.bumble.appyx.testing.unit.common.helper.parentNodeTestHelper |
||||
import com.google.common.truth.Truth |
||||
import io.element.android.features.messages.api.MessagesEntryPoint |
||||
import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint |
||||
import io.element.android.libraries.architecture.childNode |
||||
import io.element.android.libraries.matrix.api.room.RoomMembershipObserver |
||||
import io.element.android.libraries.matrix.test.room.FakeMatrixRoom |
||||
import io.element.android.services.appnavstate.test.NoopAppNavigationStateService |
||||
import org.junit.Rule |
||||
import org.junit.Test |
||||
|
||||
class RoomFlowNodeTest { |
||||
|
||||
@get:Rule |
||||
val instantTaskExecutorRule = InstantTaskExecutorRule() |
||||
|
||||
@get:Rule |
||||
val mainDispatcherRule = MainDispatcherRule() |
||||
|
||||
private class FakeMessagesEntryPoint : MessagesEntryPoint { |
||||
|
||||
var nodeId: String? = null |
||||
var callback: MessagesEntryPoint.Callback? = null |
||||
|
||||
override fun createNode(parentNode: Node, buildContext: BuildContext, callback: MessagesEntryPoint.Callback): Node { |
||||
return node(buildContext) {}.also { |
||||
nodeId = it.id |
||||
this.callback = callback |
||||
} |
||||
} |
||||
} |
||||
|
||||
private class FakeRoomDetailsEntryPoint : RoomDetailsEntryPoint { |
||||
|
||||
var nodeId: String? = null |
||||
|
||||
override fun createNode(parentNode: Node, buildContext: BuildContext, plugins: List<Plugin>): Node { |
||||
return node(buildContext) {}.also { |
||||
nodeId = it.id |
||||
} |
||||
} |
||||
} |
||||
|
||||
private fun aRoomFlowNode( |
||||
plugins: List<Plugin>, |
||||
messagesEntryPoint: MessagesEntryPoint = FakeMessagesEntryPoint(), |
||||
roomDetailsEntryPoint: RoomDetailsEntryPoint = FakeRoomDetailsEntryPoint(), |
||||
) = RoomFlowNode( |
||||
buildContext = BuildContext.root(savedStateMap = null), |
||||
plugins = plugins, |
||||
messagesEntryPoint = messagesEntryPoint, |
||||
roomDetailsEntryPoint = roomDetailsEntryPoint, |
||||
appNavigationStateService = NoopAppNavigationStateService(), |
||||
roomMembershipObserver = RoomMembershipObserver() |
||||
) |
||||
|
||||
@Test |
||||
fun `given a room flow node when initialized then it fetches room members`() { |
||||
// GIVEN |
||||
val room = FakeMatrixRoom() |
||||
val inputs = RoomFlowNode.Inputs(room) |
||||
val roomFlowNode = aRoomFlowNode(listOf(inputs)) |
||||
Truth.assertThat(room.areMembersFetched).isFalse() |
||||
// WHEN |
||||
roomFlowNode.nodeTestHelper() |
||||
// THEN |
||||
Truth.assertThat(room.areMembersFetched).isTrue() |
||||
} |
||||
|
||||
@Test |
||||
fun `given a room flow node when initialized then it loads messages entry point`() { |
||||
// GIVEN |
||||
val room = FakeMatrixRoom() |
||||
val fakeMessagesEntryPoint = FakeMessagesEntryPoint() |
||||
val inputs = RoomFlowNode.Inputs(room) |
||||
val roomFlowNode = aRoomFlowNode(listOf(inputs), fakeMessagesEntryPoint) |
||||
// WHEN |
||||
val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper() |
||||
|
||||
// THEN |
||||
Truth.assertThat(roomFlowNode.backstack.activeElement).isEqualTo(RoomFlowNode.NavTarget.Messages) |
||||
roomFlowNodeTestHelper.assertChildHasLifecycle(RoomFlowNode.NavTarget.Messages, Lifecycle.State.CREATED) |
||||
val messagesNode = roomFlowNode.childNode(RoomFlowNode.NavTarget.Messages)!! |
||||
Truth.assertThat(messagesNode.id).isEqualTo(fakeMessagesEntryPoint.nodeId) |
||||
} |
||||
|
||||
@Test |
||||
fun `given a room flow node when callback on room details is triggered then it loads room details entry point`() { |
||||
// GIVEN |
||||
val room = FakeMatrixRoom() |
||||
val fakeMessagesEntryPoint = FakeMessagesEntryPoint() |
||||
val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint() |
||||
val inputs = RoomFlowNode.Inputs(room) |
||||
val roomFlowNode = aRoomFlowNode(listOf(inputs), fakeMessagesEntryPoint, fakeRoomDetailsEntryPoint) |
||||
val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper() |
||||
// WHEN |
||||
fakeMessagesEntryPoint.callback?.onRoomDetailsClicked() |
||||
// THEN |
||||
roomFlowNodeTestHelper.assertChildHasLifecycle(RoomFlowNode.NavTarget.RoomDetails, Lifecycle.State.CREATED) |
||||
val roomDetailsNode = roomFlowNode.childNode(RoomFlowNode.NavTarget.RoomDetails)!! |
||||
Truth.assertThat(roomDetailsNode.id).isEqualTo(fakeRoomDetailsEntryPoint.nodeId) |
||||
} |
||||
} |
||||
@ -1,62 +0,0 @@
@@ -1,62 +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.appnav |
||||
|
||||
import app.cash.molecule.RecompositionClock |
||||
import app.cash.molecule.moleculeFlow |
||||
import app.cash.turbine.test |
||||
import com.google.common.truth.Truth |
||||
import io.element.android.libraries.matrix.test.room.FakeMatrixRoom |
||||
import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline |
||||
import kotlinx.coroutines.test.runTest |
||||
import org.junit.Test |
||||
import java.lang.IllegalStateException |
||||
|
||||
class RoomFlowPresenterTest { |
||||
|
||||
@Test |
||||
fun `present - fetches room members`() = runTest { |
||||
val fakeTimeline = FakeMatrixTimeline() |
||||
val room = FakeMatrixRoom(matrixTimeline = fakeTimeline) |
||||
val presenter = RoomFlowPresenter(room) |
||||
|
||||
Truth.assertThat(room.areMembersFetched).isFalse() |
||||
moleculeFlow(RecompositionClock.Immediate) { |
||||
presenter.present() |
||||
}.test { |
||||
Truth.assertThat(room.areMembersFetched).isTrue() |
||||
cancelAndIgnoreRemainingEvents() |
||||
} |
||||
} |
||||
|
||||
@Test |
||||
fun `present - recovers from error while fetching room members`() = runTest { |
||||
val fakeTimeline = FakeMatrixTimeline() |
||||
val room = FakeMatrixRoom(matrixTimeline = fakeTimeline).apply { |
||||
givenFetchMemberResult(Result.failure(IllegalStateException("Some error"))) |
||||
} |
||||
val presenter = RoomFlowPresenter(room) |
||||
|
||||
Truth.assertThat(room.areMembersFetched).isFalse() |
||||
moleculeFlow(RecompositionClock.Immediate) { |
||||
presenter.present() |
||||
}.test { |
||||
Truth.assertThat(room.areMembersFetched).isFalse() |
||||
cancelAndIgnoreRemainingEvents() |
||||
} |
||||
} |
||||
} |
||||
@ -0,0 +1,27 @@
@@ -0,0 +1,27 @@
|
||||
/* |
||||
* 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.architecture |
||||
|
||||
import com.bumble.appyx.core.children.nodeOrNull |
||||
import com.bumble.appyx.core.node.Node |
||||
import com.bumble.appyx.core.node.ParentNode |
||||
|
||||
fun <NavTarget : Any> ParentNode<NavTarget>.childNode(navTarget: NavTarget): Node? { |
||||
val childMap = children.value |
||||
val key = childMap.keys.find { it.navTarget == navTarget } |
||||
return childMap[key]?.nodeOrNull |
||||
} |
||||
@ -0,0 +1,48 @@
@@ -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 |
||||
} |
||||
Loading…
Reference in new issue