Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename RoomDirectoryList.State to RoomDirectoryList.SearchResult to avoid this class to be checked for stability.

Browse source
This commit is contained in:
Benoit Marty 2025-10-09 17:31:11 +02:00 • committed by Benoit Marty
parent c584842611
commit 8f703c2aa7
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt
View file

@ -42,14 +42,14 @@ class RoomDirectoryPresenterTest {
@Test @Test
fun `present - room directory list emits empty state`() = runTest { fun `present - room directory list emits empty state`() = runTest {
val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.State>(replay = 1) val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.SearchResult>(replay = 1)
val roomDirectoryList = FakeRoomDirectoryList(directoryListStateFlow) val roomDirectoryList = FakeRoomDirectoryList(directoryListStateFlow)
val roomDirectoryService = FakeRoomDirectoryService { roomDirectoryList } val roomDirectoryService = FakeRoomDirectoryService { roomDirectoryList }
val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService) val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService)
presenter.test { presenter.test {
skipItems(1) skipItems(1)
directoryListStateFlow.emit( directoryListStateFlow.emit(
RoomDirectoryList.State(false, emptyList()) RoomDirectoryList.SearchResult(false, emptyList())
) )
awaitItem().also { state -> awaitItem().also { state ->
assertThat(state.displayEmptyState).isTrue() assertThat(state.displayEmptyState).isTrue()
@ -60,14 +60,14 @@ class RoomDirectoryPresenterTest {
@Test @Test
fun `present - room directory list emits non-empty state`() = runTest { fun `present - room directory list emits non-empty state`() = runTest {
val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.State>(replay = 1) val directoryListStateFlow = MutableSharedFlow<RoomDirectoryList.SearchResult>(replay = 1)
val roomDirectoryList = FakeRoomDirectoryList(directoryListStateFlow) val roomDirectoryList = FakeRoomDirectoryList(directoryListStateFlow)
val roomDirectoryService = FakeRoomDirectoryService { roomDirectoryList } val roomDirectoryService = FakeRoomDirectoryService { roomDirectoryList }
val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService) val presenter = createRoomDirectoryPresenter(roomDirectoryService = roomDirectoryService)
presenter.test { presenter.test {
skipItems(1) skipItems(1)
directoryListStateFlow.emit( directoryListStateFlow.emit(
RoomDirectoryList.State( RoomDirectoryList.SearchResult(
hasMoreToLoad = true, hasMoreToLoad = true,
items = listOf(aRoomDescription()) items = listOf(aRoomDescription())
) )

4
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomdirectory/RoomDirectoryList.kt
View file

@ -26,9 +26,9 @@ interface RoomDirectoryList {
/** /**
* The current search results as a state flow. * The current search results as a state flow.
*/ */
val state: Flow<State> val state: Flow<SearchResult>
data class State( data class SearchResult(
val hasMoreToLoad: Boolean, val hasMoreToLoad: Boolean,
val items: List<RoomDescription>, val items: List<RoomDescription>,
) )

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryList.kt
View file

@ -73,9 +73,9 @@ class RustRoomDirectoryList(
return !inner.isAtLastPage() return !inner.isAtLastPage()
} }
override val state: Flow<RoomDirectoryList.State> = override val state: Flow<RoomDirectoryList.SearchResult> =
combine(hasMoreToLoad, processor.roomDescriptionsFlow) { hasMoreToLoad, items -> combine(hasMoreToLoad, processor.roomDescriptionsFlow) { hasMoreToLoad, items ->
RoomDirectoryList.State( RoomDirectoryList.SearchResult(
hasMoreToLoad = hasMoreToLoad, hasMoreToLoad = hasMoreToLoad,
items = items items = items
) )

6
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt
View file

@ -42,7 +42,7 @@ class RustBaseRoomDirectoryListTest {
) )
val initialItem = awaitItem() val initialItem = awaitItem()
assertThat(initialItem).isEqualTo( assertThat(initialItem).isEqualTo(
RoomDirectoryList.State( RoomDirectoryList.SearchResult(
hasMoreToLoad = true, hasMoreToLoad = true,
items = listOf(mapper.map(aRustRoomDescription())) items = listOf(mapper.map(aRustRoomDescription()))
) )
@ -57,7 +57,7 @@ class RustBaseRoomDirectoryListTest {
) )
val nextItem = awaitItem() val nextItem = awaitItem()
assertThat(nextItem).isEqualTo( assertThat(nextItem).isEqualTo(
RoomDirectoryList.State( RoomDirectoryList.SearchResult(
hasMoreToLoad = false, hasMoreToLoad = false,
items = listOf( items = listOf(
mapper.map(aRustRoomDescription()), mapper.map(aRustRoomDescription()),
@ -66,7 +66,7 @@ class RustBaseRoomDirectoryListTest {
) )
val finalItem = awaitItem() val finalItem = awaitItem()
assertThat(finalItem).isEqualTo( assertThat(finalItem).isEqualTo(
RoomDirectoryList.State( RoomDirectoryList.SearchResult(
hasMoreToLoad = false, hasMoreToLoad = false,
items = listOf( items = listOf(
mapper.map(aRustRoomDescription()), mapper.map(aRustRoomDescription()),

2
libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/roomdirectory/FakeRoomDirectoryList.kt
View file

@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.emptyFlow
class FakeRoomDirectoryList( class FakeRoomDirectoryList(
override val state: Flow<RoomDirectoryList.State> = emptyFlow(), override val state: Flow<RoomDirectoryList.SearchResult> = emptyFlow(),
val filterLambda: (String?, Int, String?) -> Result<Unit> = { _, _, _ -> Result.success(Unit) }, val filterLambda: (String?, Int, String?) -> Result<Unit> = { _, _, _ -> Result.success(Unit) },
val loadMoreLambda: () -> Result<Unit> = { Result.success(Unit) } val loadMoreLambda: () -> Result<Unit> = { Result.success(Unit) }
) : RoomDirectoryList { ) : RoomDirectoryList {