Skip to content

Commit b0d4eb8

Browse files
bmartybmarty
committed
Fix existing errors on tests.
1 parent 662c002 commit b0d4eb8

File tree

5 files changed

+83
-5
lines changed

5 files changed

+83
-5
lines changed

‎features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,17 @@ class AttachmentsPreviewPresenterTest {
513513
@Test
514514
fun `present - dismissing the progress dialog stops media upload with media queue`() = runTest {
515515
val onDoneListenerResult = lambdaRecorder<Unit> {}
516-
val presenter = createAttachmentsPreviewPresenter(mediaUploadOnSendQueueEnabled = true, onDoneListener = onDoneListenerResult)
516+
val presenter = createAttachmentsPreviewPresenter(
517+
room = FakeJoinedRoom(
518+
liveTimeline = FakeTimeline().apply {
519+
sendFileLambda = { _, _, _, _, _, _ ->
520+
Result.success(FakeMediaUploadHandler())
521+
}
522+
}
523+
),
524+
mediaUploadOnSendQueueEnabled = true,
525+
onDoneListener = onDoneListenerResult,
526+
)
517527
moleculeFlow(RecompositionMode.Immediate) {
518528
presenter.present()
519529
}.test {

‎features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID
6363
import io.element.android.libraries.matrix.test.A_USER_ID_2
6464
import io.element.android.libraries.matrix.test.A_USER_ID_3
6565
import io.element.android.libraries.matrix.test.A_USER_ID_4
66+
import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
6667
import io.element.android.libraries.matrix.test.permalink.FakePermalinkBuilder
6768
import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
6869
import io.element.android.libraries.matrix.test.room.FakeBaseRoom
@@ -1197,7 +1198,17 @@ class MessageComposerPresenterTest {
11971198

11981199
@Test
11991200
fun `present - send uri`() = runTest {
1200-
val presenter = createPresenter(this)
1201+
val presenter = createPresenter(
1202+
this,
1203+
room = FakeJoinedRoom(
1204+
typingNoticeResult = { Result.success(Unit) },
1205+
liveTimeline = FakeTimeline().apply {
1206+
sendFileLambda = { _, _, _, _, _, _ ->
1207+
Result.success(FakeMediaUploadHandler())
1208+
}
1209+
}
1210+
),
1211+
)
12011212
moleculeFlow(RecompositionMode.Immediate) {
12021213
val state = presenter.present()
12031214
remember(state, state.textEditorState.messageHtml()) { state }

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import io.element.android.libraries.matrix.test.A_ROOM_NAME
3636
import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
3737
import io.element.android.libraries.matrix.test.A_SESSION_ID
3838
import io.element.android.libraries.matrix.test.A_USER_ID_2
39+
import io.element.android.libraries.matrix.test.A_USER_NAME
3940
import io.element.android.libraries.matrix.test.FakeMatrixClient
4041
import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
4142
import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
@@ -241,6 +242,8 @@ class RoomDetailsPresenterTest {
241242
fun `present - initial state when user can not invite others to room`() = runTest {
242243
val room = aJoinedRoom(
243244
canInviteResult = { Result.success(false) },
245+
canKickResult = { Result.success(false) },
246+
canBanResult = { Result.success(false) },
244247
canUserJoinCallResult = { Result.success(true) },
245248
canSendStateResult = { _, _ -> Result.success(true) },
246249
)
@@ -277,6 +280,8 @@ class RoomDetailsPresenterTest {
277280
else -> Result.failure(Throwable("Whelp"))
278281
}
279282
},
283+
canBanResult = { Result.success(false) },
284+
canKickResult = { Result.success(false) },
280285
canInviteResult = { Result.success(false) },
281286
canUserJoinCallResult = { Result.success(true) },
282287
)
@@ -304,6 +309,8 @@ class RoomDetailsPresenterTest {
304309
else -> Result.failure(Throwable("Whelp"))
305310
}
306311
},
312+
canKickResult = { Result.success(false) },
313+
canBanResult = { Result.success(false) },
307314
canInviteResult = { Result.success(false) },
308315
canUserJoinCallResult = { Result.success(true) },
309316
getUpdatedMemberResult = { userId ->
@@ -353,6 +360,8 @@ class RoomDetailsPresenterTest {
353360
else -> Result.failure(Throwable("Whelp"))
354361
}
355362
},
363+
userDisplayNameResult = { Result.success(A_USER_NAME) },
364+
userAvatarUrlResult = { Result.success(AN_AVATAR_URL) },
356365
canInviteResult = { Result.success(true) },
357366
canUserJoinCallResult = { Result.success(true) },
358367
getUpdatedMemberResult = { userId ->
@@ -397,6 +406,12 @@ class RoomDetailsPresenterTest {
397406
else -> Result.failure(Throwable("Whelp"))
398407
}
399408
},
409+
canKickResult = {
410+
Result.success(false)
411+
},
412+
canBanResult = {
413+
Result.success(false)
414+
},
400415
canInviteResult = {
401416
Result.success(false)
402417
},
@@ -424,6 +439,12 @@ class RoomDetailsPresenterTest {
424439
else -> Result.failure(Throwable("Whelp"))
425440
}
426441
},
442+
canBanResult = {
443+
Result.success(false)
444+
},
445+
canKickResult = {
446+
Result.success(false)
447+
},
427448
canInviteResult = {
428449
Result.success(false)
429450
},
@@ -450,6 +471,12 @@ class RoomDetailsPresenterTest {
450471
else -> Result.failure(Throwable("Whelp"))
451472
}
452473
},
474+
canKickResult = {
475+
Result.success(false)
476+
},
477+
canBanResult = {
478+
Result.success(false)
479+
},
453480
canInviteResult = {
454481
Result.success(false)
455482
},
@@ -476,6 +503,12 @@ class RoomDetailsPresenterTest {
476503
else -> Result.failure(Throwable("Whelp"))
477504
}
478505
},
506+
canKickResult = {
507+
Result.success(false)
508+
},
509+
canBanResult = {
510+
Result.success(false)
511+
},
479512
canInviteResult = {
480513
Result.success(false)
481514
},

‎features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
1616
import io.element.android.libraries.matrix.api.room.JoinedRoom
1717
import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
1818
import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
19+
import io.element.android.libraries.matrix.test.AN_EXCEPTION
1920
import io.element.android.libraries.matrix.test.A_ROOM_ID
2021
import io.element.android.libraries.matrix.test.FakeMatrixClient
2122
import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
@@ -289,7 +290,14 @@ class EditBaseRoomAddressPresenterTest {
289290
val navigator = FakeSecurityAndPrivacyNavigator(
290291
closeEditRoomAddressLambda = closeEditAddressLambda
291292
)
292-
val presenter = createEditRoomAddressPresenter(navigator = navigator)
293+
val presenter = createEditRoomAddressPresenter(
294+
navigator = navigator,
295+
room = FakeJoinedRoom(
296+
publishRoomAliasInRoomDirectoryResult = {
297+
Result.failure(AN_EXCEPTION)
298+
},
299+
)
300+
)
293301
presenter.test {
294302
with(awaitItem()) {
295303
eventSink(EditRoomAddressEvents.RoomAddressChanged("valid"))
@@ -313,7 +321,13 @@ class EditBaseRoomAddressPresenterTest {
313321

314322
@Test
315323
fun `present - dismiss error`() = runTest {
316-
val presenter = createEditRoomAddressPresenter()
324+
val presenter = createEditRoomAddressPresenter(
325+
room = FakeJoinedRoom(
326+
publishRoomAliasInRoomDirectoryResult = {
327+
Result.failure(AN_EXCEPTION)
328+
},
329+
)
330+
)
317331
presenter.test {
318332
with(awaitItem()) {
319333
eventSink(EditRoomAddressEvents.Save)

‎libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,17 @@ class MediaSenderTest {
3737
@Test
3838
fun `given an attachment when sending it the preprocessor always runs`() = runTest {
3939
val preProcessor = FakeMediaPreProcessor()
40-
val sender = createMediaSender(preProcessor)
40+
val sender = createMediaSender(
41+
preProcessor = preProcessor,
42+
room = FakeJoinedRoom(
43+
liveTimeline = FakeTimeline().apply {
44+
sendFileLambda =
45+
lambdaRecorder<File, FileInfo, String?, String?, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _, _ ->
46+
Result.success(FakeMediaUploadHandler())
47+
}
48+
},
49+
)
50+
)
4151

4252
val uri = Uri.parse("content://image.jpg")
4353
sender.sendMedia(uri = uri, mimeType = MimeTypes.Jpeg)

0 commit comments

Comments
 (0)