ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression on tests.

Browse Source
This commit is contained in:
Benoit Marty
2026-06-29 09:11:51 +02:00
parent b62242cdd2
commit 95e656cc32
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
+2 -1
View File
@@ -68,6 +68,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
import io.element.android.tests.testutils.EnsureCalledOnceWithTwoParamsAndResult import io.element.android.tests.testutils.EnsureCalledOnceWithTwoParamsAndResult
import io.element.android.tests.testutils.EnsureNeverCalled import io.element.android.tests.testutils.EnsureNeverCalled
import io.element.android.tests.testutils.EnsureNeverCalledWithParam import io.element.android.tests.testutils.EnsureNeverCalledWithParam
import io.element.android.tests.testutils.EnsureNeverCalledWithThreeParamsAndResult
import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParams import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParams
import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParamsAndResult import io.element.android.tests.testutils.EnsureNeverCalledWithTwoParamsAndResult
import io.element.android.tests.testutils.EventsRecorder import io.element.android.tests.testutils.EventsRecorder
@@ -685,7 +686,7 @@ private fun AndroidComposeUiTest<ComponentActivity>.setMessagesView(
onBackClick: () -> Unit = EnsureNeverCalled(), onBackClick: () -> Unit = EnsureNeverCalled(),
onRoomDetailsClick: () -> Unit = EnsureNeverCalled(), onRoomDetailsClick: () -> Unit = EnsureNeverCalled(),
onEventClick: (isLive: Boolean, event: TimelineItem.Event) -> Boolean = EnsureNeverCalledWithTwoParamsAndResult(), onEventClick: (isLive: Boolean, event: TimelineItem.Event) -> Boolean = EnsureNeverCalledWithTwoParamsAndResult(),
onGalleryEventItemClick: (event: TimelineItem.Event, index: Int) -> Boolean = EnsureNeverCalledWithTwoParamsAndResult(), onGalleryEventItemClick: (isLive: Boolean, event: TimelineItem.Event, index: Int) -> Boolean = EnsureNeverCalledWithThreeParamsAndResult(),
onUserDataClick: (UserId) -> Unit = EnsureNeverCalledWithParam(), onUserDataClick: (UserId) -> Unit = EnsureNeverCalledWithParam(),
onLinkClick: (String, Boolean) -> Unit = EnsureNeverCalledWithTwoParams(), onLinkClick: (String, Boolean) -> Unit = EnsureNeverCalledWithTwoParams(),
onSendLocationClick: () -> Unit = EnsureNeverCalled(), onSendLocationClick: () -> Unit = EnsureNeverCalled(),
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
+5 -1
View File
@@ -152,7 +152,11 @@ class MediaViewerPresenter(
navigator.onForwardClick( navigator.onForwardClick(
eventId = event.eventId, eventId = event.eventId,
fromPinnedEvents = when (inputs) { fromPinnedEvents = when (inputs) {
is MediaViewerEntryPoint.Params.RoomMedia -> inputs.mode == Timeline.Mode.PinnedEvents is MediaViewerEntryPoint.Params.RoomMedia -> when (val myMode = inputs.mode) {
is MediaViewerEntryPoint.MediaViewerMode.EventGallery -> myMode.fromPinnedMessages
is MediaViewerEntryPoint.MediaViewerMode.TimelineFilesAndAudios -> myMode.getTimelineMode() == Timeline.Mode.PinnedEvents
is MediaViewerEntryPoint.MediaViewerMode.TimelineImagesAndVideos -> myMode.getTimelineMode() == Timeline.Mode.PinnedEvents
}
is MediaViewerEntryPoint.Params.EventGallery -> inputs.fromPinnedMessages is MediaViewerEntryPoint.Params.EventGallery -> inputs.fromPinnedMessages
is MediaViewerEntryPoint.Params.Avatar -> false is MediaViewerEntryPoint.Params.Avatar -> false
}, },
tests/testutils/src/main/kotlin/io/element/android/tests/testutils/EnsureNeverCalled.kt
+6
View File
@@ -45,3 +45,9 @@ class EnsureNeverCalledWithThreeParams<T, U, V> : (T, U, V) -> Unit {
lambdaError("Should not be called and is called with $p1, $p2 and $p3") lambdaError("Should not be called and is called with $p1, $p2 and $p3")
} }
} }
class EnsureNeverCalledWithThreeParamsAndResult<T, U, V, R> : (T, U, V) -> R {
override fun invoke(p1: T, p2: U, p3: V): R {
lambdaError("Should not be called and is called with $p1, $p2 and $p3")
}
}