From 8860dac7597ef518e3e2dc35d7f8ff86cc0b3d90 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL Date: Tue, 14 Jun 2022 14:30:24 +0200 Subject: [PATCH] Improving send locations tasks tests --- .../room/location/DefaultSendLiveLocationTaskTest.kt | 9 +++++++-- .../room/location/DefaultSendStaticLocationTaskTest.kt | 9 +++++++-- .../android/sdk/test/fakes/FakeEventSenderProcessor.kt | 5 ++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendLiveLocationTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendLiveLocationTaskTest.kt index 0cc3f29b52..423c680054 100644 --- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendLiveLocationTaskTest.kt +++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendLiveLocationTaskTest.kt @@ -16,11 +16,14 @@ package org.matrix.android.sdk.internal.session.room.location +import io.mockk.mockk import io.mockk.unmockkAll import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest +import org.amshove.kluent.shouldBeEqualTo import org.junit.After import org.junit.Test +import org.matrix.android.sdk.api.util.Cancelable import org.matrix.android.sdk.test.fakes.FakeEventSenderProcessor import org.matrix.android.sdk.test.fakes.FakeLocalEchoEventFactory @@ -55,13 +58,15 @@ internal class DefaultSendLiveLocationTaskTest { longitude = A_LONGITUDE, uncertainty = AN_UNCERTAINTY ) - val event = fakeLocalEchoEventFactory.givenCreateLiveLocationEvent( withLocalEcho = true ) + val cancelable = mockk() + fakeEventSenderProcessor.givenPostEventReturns(event, cancelable) - defaultSendLiveLocationTask.execute(params) + val result = defaultSendLiveLocationTask.execute(params) + result shouldBeEqualTo cancelable fakeLocalEchoEventFactory.verifyCreateLiveLocationEvent( roomId = params.roomId, beaconInfoEventId = params.beaconInfoEventId, diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendStaticLocationTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendStaticLocationTaskTest.kt index 3a09ea51c1..cfde568b71 100644 --- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendStaticLocationTaskTest.kt +++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultSendStaticLocationTaskTest.kt @@ -16,11 +16,14 @@ package org.matrix.android.sdk.internal.session.room.location +import io.mockk.mockk import io.mockk.unmockkAll import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest +import org.amshove.kluent.shouldBeEqualTo import org.junit.After import org.junit.Test +import org.matrix.android.sdk.api.util.Cancelable import org.matrix.android.sdk.test.fakes.FakeEventSenderProcessor import org.matrix.android.sdk.test.fakes.FakeLocalEchoEventFactory @@ -54,13 +57,15 @@ internal class DefaultSendStaticLocationTaskTest { uncertainty = AN_UNCERTAINTY, isUserLocation = true ) - val event = fakeLocalEchoEventFactory.givenCreateStaticLocationEvent( withLocalEcho = true ) + val cancelable = mockk() + fakeEventSenderProcessor.givenPostEventReturns(event, cancelable) - defaultSendStaticLocationTask.execute(params) + val result = defaultSendStaticLocationTask.execute(params) + result shouldBeEqualTo cancelable fakeLocalEchoEventFactory.verifyCreateStaticLocationEvent( roomId = params.roomId, latitude = params.latitude, diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeEventSenderProcessor.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeEventSenderProcessor.kt index 1f6938d1dd..fbdcf5bfd7 100644 --- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeEventSenderProcessor.kt +++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeEventSenderProcessor.kt @@ -16,6 +16,7 @@ package org.matrix.android.sdk.test.fakes +import io.mockk.every import io.mockk.mockk import org.matrix.android.sdk.api.session.events.model.Event import org.matrix.android.sdk.api.util.Cancelable @@ -23,5 +24,7 @@ import org.matrix.android.sdk.internal.session.room.send.queue.EventSenderProces internal class FakeEventSenderProcessor : EventSenderProcessor by mockk() { - override fun postEvent(event: Event): Cancelable = mockk() + fun givenPostEventReturns(event: Event, cancelable: Cancelable) { + every { postEvent(event) } returns cancelable + } }