From bc9b69c71cd356e1e3adbdcb70acb1ea0c45a26e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 2 Oct 2024 21:28:35 +0200 Subject: [PATCH] Fix a naming issue. --- .../matrix/impl/fixtures/fakes/FakeRustClient.kt | 2 +- ...orySearch.kt => FakeRustRoomDirectorySearch.kt} | 2 +- .../roomdirectory/RustRoomDirectoryListTest.kt | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) rename libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/{FakeRoomDirectorySearch.kt => FakeRustRoomDirectorySearch.kt} (97%) diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustClient.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustClient.kt index 740d354821..5922290110 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustClient.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustClient.kt @@ -42,7 +42,7 @@ class FakeRustClient( override fun cachedAvatarUrl(): String? = null override suspend fun restoreSession(session: Session) = Unit override fun syncService(): SyncServiceBuilder = FakeRustSyncServiceBuilder() - override fun roomDirectorySearch(): RoomDirectorySearch = FakeRoomDirectorySearch() + override fun roomDirectorySearch(): RoomDirectorySearch = FakeRustRoomDirectorySearch() override suspend fun setPusher( identifiers: PusherIdentifiers, kind: PusherKind, diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRoomDirectorySearch.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustRoomDirectorySearch.kt similarity index 97% rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRoomDirectorySearch.kt rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustRoomDirectorySearch.kt index 587b1bf5ce..0569ee55c8 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRoomDirectorySearch.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/fakes/FakeRustRoomDirectorySearch.kt @@ -14,7 +14,7 @@ import org.matrix.rustcomponents.sdk.RoomDirectorySearchEntriesListener import org.matrix.rustcomponents.sdk.RoomDirectorySearchEntryUpdate import org.matrix.rustcomponents.sdk.TaskHandle -class FakeRoomDirectorySearch( +class FakeRustRoomDirectorySearch( var isAtLastPage: Boolean = false, ) : RoomDirectorySearch(NoPointer) { override suspend fun isAtLastPage(): Boolean { diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryListTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryListTest.kt index 6dff45c815..134b90adc9 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryListTest.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryListTest.kt @@ -11,7 +11,7 @@ import app.cash.turbine.test import com.google.common.truth.Truth.assertThat import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryList import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomDescription -import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRoomDirectorySearch +import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustRoomDirectorySearch import io.element.android.libraries.matrix.test.A_ROOM_ID_2 import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -27,17 +27,17 @@ import org.matrix.rustcomponents.sdk.RoomDirectorySearchEntryUpdate class RustRoomDirectoryListTest { @Test fun `check that the state emits the expected values`() = runTest { - val fakeRoomDirectorySearch = FakeRoomDirectorySearch() + val roomDirectorySearch = FakeRustRoomDirectorySearch() val mapper = RoomDescriptionMapper() val sut = createRustRoomDirectoryList( - roomDirectorySearch = fakeRoomDirectorySearch, + roomDirectorySearch = roomDirectorySearch, scope = backgroundScope, ) // Let the mxCallback be ready runCurrent() sut.state.test { sut.filter("", 20) - fakeRoomDirectorySearch.emitResult( + roomDirectorySearch.emitResult( listOf( RoomDirectorySearchEntryUpdate.Append(listOf(aRustRoomDescription())) ) @@ -50,9 +50,9 @@ class RustRoomDirectoryListTest { ) ) assertThat(initialItem.hasMoreToLoad).isTrue() - fakeRoomDirectorySearch.isAtLastPage = true + roomDirectorySearch.isAtLastPage = true sut.loadMore() - fakeRoomDirectorySearch.emitResult( + roomDirectorySearch.emitResult( listOf( RoomDirectorySearchEntryUpdate.Append(listOf(aRustRoomDescription(A_ROOM_ID_2.value))) ) @@ -80,7 +80,7 @@ class RustRoomDirectoryListTest { } private fun TestScope.createRustRoomDirectoryList( - roomDirectorySearch: RoomDirectorySearch = FakeRoomDirectorySearch(), + roomDirectorySearch: RoomDirectorySearch = FakeRustRoomDirectorySearch(), scope: CoroutineScope, ) = RustRoomDirectoryList( inner = roomDirectorySearch,