From 91b4dc1f975a323baf9524fb5a03774906cce81f Mon Sep 17 00:00:00 2001 From: NIkita Fedrunov Date: Fri, 23 Dec 2022 13:51:19 +0100 Subject: [PATCH] tests are fixed --- .../internal/sync/filter/SyncFilterBuilder.kt | 10 ---------- .../sync/DefaultGetCurrentFilterTaskTest.kt | 19 +++++++++++-------- .../sdk/test/fakes/FakeFilterRepository.kt | 4 ---- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/sync/filter/SyncFilterBuilder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/sync/filter/SyncFilterBuilder.kt index 2b76cdd74f..d58b9d3765 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/sync/filter/SyncFilterBuilder.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/sync/filter/SyncFilterBuilder.kt @@ -54,16 +54,6 @@ internal class SyncFilterBuilder { } } - internal fun extractParams(): SyncFilterParams { - return SyncFilterParams( - useThreadNotifications = useThreadNotifications, - lazyLoadMembersForMessageEvents = lazyLoadMembersForMessageEvents, - lazyLoadMembersForStateEvents = lazyLoadMembersForStateEvents, - listOfSupportedEventTypes = listOfSupportedEventTypes, - listOfSupportedStateEventTypes = listOfSupportedStateEventTypes, - ) - } - internal fun build(homeServerCapabilities: HomeServerCapabilities): Filter { return Filter( room = buildRoomFilter(homeServerCapabilities) diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/sync/DefaultGetCurrentFilterTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/sync/DefaultGetCurrentFilterTaskTest.kt index 310e25f83b..f3ab65f6c4 100644 --- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/sync/DefaultGetCurrentFilterTaskTest.kt +++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/sync/DefaultGetCurrentFilterTaskTest.kt @@ -16,12 +16,17 @@ package org.matrix.android.sdk.internal.sync +import io.mockk.mockk import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.amshove.kluent.shouldBeEqualTo import org.junit.Test +import org.matrix.android.sdk.api.MatrixConfiguration +import org.matrix.android.sdk.api.SyncConfig import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilities +import org.matrix.android.sdk.api.session.sync.filter.SyncFilterParams import org.matrix.android.sdk.internal.session.filter.DefaultGetCurrentFilterTask +import org.matrix.android.sdk.internal.sync.filter.SyncFilterBuilder import org.matrix.android.sdk.test.fakes.FakeFilterRepository import org.matrix.android.sdk.test.fakes.FakeHomeServerCapabilitiesDataSource import org.matrix.android.sdk.test.fakes.FakeSaveFilterTask @@ -29,7 +34,6 @@ import org.matrix.android.sdk.test.fakes.FakeSaveFilterTask private const val A_FILTER_ID = "filter-id" private val A_HOMESERVER_CAPABILITIES = HomeServerCapabilities() private val A_SYNC_FILTER_PARAMS = SyncFilterParams( - lazyLoadMembersForMessageEvents = true, lazyLoadMembersForStateEvents = true, useThreadNotifications = true ) @@ -44,13 +48,16 @@ class DefaultGetCurrentFilterTaskTest { private val getCurrentFilterTask = DefaultGetCurrentFilterTask( filterRepository = filterRepository, homeServerCapabilitiesDataSource = homeServerCapabilitiesDataSource.instance, - saveFilterTask = saveFilterTask + saveFilterTask = saveFilterTask, + matrixConfiguration = MatrixConfiguration( + applicationFlavor = "TestFlavor", + roomDisplayNameFallbackProvider = mockk(), + syncConfig = SyncConfig(syncFilterParams = SyncFilterParams(lazyLoadMembersForStateEvents = true, useThreadNotifications = true)), + ) ) @Test fun `given no filter is stored, when execute, then executes task to save new filter`() = runTest { - filterRepository.givenFilterParamsAreStored(A_SYNC_FILTER_PARAMS) - homeServerCapabilitiesDataSource.givenHomeServerCapabilities(A_HOMESERVER_CAPABILITIES) filterRepository.givenFilterStored(null, null) @@ -66,8 +73,6 @@ class DefaultGetCurrentFilterTaskTest { @Test fun `given filter is stored and didn't change, when execute, then returns stored filter id`() = runTest { - filterRepository.givenFilterParamsAreStored(A_SYNC_FILTER_PARAMS) - homeServerCapabilitiesDataSource.givenHomeServerCapabilities(A_HOMESERVER_CAPABILITIES) val filter = SyncFilterBuilder().with(A_SYNC_FILTER_PARAMS).build(A_HOMESERVER_CAPABILITIES) @@ -80,8 +85,6 @@ class DefaultGetCurrentFilterTaskTest { @Test fun `given filter is set and home server capabilities has changed, when execute, then executes task to save new filter`() = runTest { - filterRepository.givenFilterParamsAreStored(A_SYNC_FILTER_PARAMS) - homeServerCapabilitiesDataSource.givenHomeServerCapabilities(A_HOMESERVER_CAPABILITIES) val filter = SyncFilterBuilder().with(A_SYNC_FILTER_PARAMS).build(A_HOMESERVER_CAPABILITIES) diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFilterRepository.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFilterRepository.kt index ec714a265a..27a39120f8 100644 --- a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFilterRepository.kt +++ b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/test/fakes/FakeFilterRepository.kt @@ -26,8 +26,4 @@ internal class FakeFilterRepository : FilterRepository by mockk() { coEvery { getStoredSyncFilterId() } returns filterId coEvery { getStoredSyncFilterBody() } returns filterBody } - - fun givenFilterParamsAreStored(syncFilterParams: SyncFilterParams?) { - coEvery { getStoredFilterParams() } returns syncFilterParams - } }