Skip to content

Commit aeea991

Browse files
committed
Send failure verified user : fix tests.
1 parent 16bf8f0 commit aeea991

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,7 @@ class MessagesPresenterTest {
10361036
sessionPreferencesStore = sessionPreferencesStore,
10371037
timelineItemIndexer = TimelineItemIndexer(),
10381038
timelineController = TimelineController(matrixRoom),
1039+
resolveVerifiedUserSendFailurePresenter = { aResolveVerifiedUserSendFailureState() },
10391040
)
10401041
val timelinePresenterFactory = object : TimelinePresenter.Factory {
10411042
override fun create(navigator: MessagesNavigator): TimelinePresenter {
@@ -1063,7 +1064,6 @@ class MessagesPresenterTest {
10631064
reactionSummaryPresenter = reactionSummaryPresenter,
10641065
readReceiptBottomSheetPresenter = readReceiptBottomSheetPresenter,
10651066
pinnedMessagesBannerPresenter = { aLoadedPinnedMessagesBannerState() },
1066-
resolveVerifiedUserSendFailurePresenter = { aResolveVerifiedUserSendFailureState() },
10671067
networkMonitor = FakeNetworkMonitor(),
10681068
snackbarDispatcher = SnackbarDispatcher(),
10691069
navigator = navigator,

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ import io.element.android.features.messages.impl.actionlist.anActionListState
3535
import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
3636
import io.element.android.features.messages.impl.attachments.Attachment
3737
import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUserSendFailure
38-
import io.element.android.features.messages.impl.crypto.sendfailure.resolve.ResolveVerifiedUserSendFailureEvents
3938
import io.element.android.features.messages.impl.crypto.sendfailure.resolve.aChangedIdentitySendFailure
40-
import io.element.android.features.messages.impl.crypto.sendfailure.resolve.aResolveVerifiedUserSendFailureState
4139
import io.element.android.features.messages.impl.messagecomposer.aMessageComposerState
4240
import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerItem
4341
import io.element.android.features.messages.impl.pinned.banner.aLoadedPinnedMessagesBannerState
@@ -424,7 +422,7 @@ class MessagesViewTest {
424422

425423
@Test
426424
fun `clicking on verified user send failure from action list emits the expected Event`() {
427-
val eventsRecorder = EventsRecorder<ResolveVerifiedUserSendFailureEvents>()
425+
val eventsRecorder = EventsRecorder<TimelineEvents>()
428426
val state = aMessagesState()
429427
val timelineItem = state.timelineState.timelineItems.first() as TimelineItem.Event
430428
val stateWithActionListState = state.copy(
@@ -436,9 +434,7 @@ class MessagesViewTest {
436434
actions = persistentListOf(),
437435
),
438436
),
439-
resolveVerifiedUserSendFailureState = aResolveVerifiedUserSendFailureState(
440-
eventSink = eventsRecorder
441-
),
437+
timelineState = aTimelineState(eventSink = eventsRecorder)
442438
)
443439
rule.setMessagesView(
444440
state = stateWithActionListState,
@@ -447,7 +443,7 @@ class MessagesViewTest {
447443
rule.onNodeWithText(verifiedUserSendFailure).performClick()
448444
// Give time for the close animation to complete
449445
rule.mainClock.advanceTimeBy(milliseconds = 1_000)
450-
eventsRecorder.assertSingle(ResolveVerifiedUserSendFailureEvents.ComputeForMessage(timelineItem))
446+
eventsRecorder.assertSingle(TimelineEvents.ComputeVerifiedUserSendFailure(timelineItem))
451447
}
452448

453449
@Test

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import app.cash.turbine.ReceiveTurbine
1313
import app.cash.turbine.test
1414
import com.google.common.truth.Truth.assertThat
1515
import io.element.android.features.messages.impl.FakeMessagesNavigator
16+
import io.element.android.features.messages.impl.crypto.sendfailure.resolve.aResolveVerifiedUserSendFailureState
1617
import io.element.android.features.messages.impl.fixtures.aMessageEvent
1718
import io.element.android.features.messages.impl.fixtures.aTimelineItemsFactoryCreator
1819
import io.element.android.features.messages.impl.timeline.components.aCriticalShield
@@ -680,6 +681,7 @@ import kotlin.time.Duration.Companion.seconds
680681
sessionPreferencesStore = sessionPreferencesStore,
681682
timelineItemIndexer = timelineItemIndexer,
682683
timelineController = TimelineController(room),
684+
resolveVerifiedUserSendFailurePresenter = { aResolveVerifiedUserSendFailureState() },
683685
)
684686
}
685687
}

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/MatrixRoomFixture.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fun aMatrixRoom(
3131
emitRoomInfo: Boolean = false,
3232
canInviteResult: (UserId) -> Result<Boolean> = { lambdaError() },
3333
canSendStateResult: (UserId, StateEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
34-
userDisplayNameResult: () -> Result<String?> = { lambdaError() },
34+
userDisplayNameResult: (UserId) -> Result<String?> = { lambdaError() },
3535
userAvatarUrlResult: () -> Result<String?> = { lambdaError() },
3636
setNameResult: (String) -> Result<Unit> = { lambdaError() },
3737
setTopicResult: (String) -> Result<Unit> = { lambdaError() },

0 commit comments

Comments
 (0)