From 263c0588437d9cffd0b743765e2bb38d8b9e2c89 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 17 Jul 2024 11:31:25 +0200 Subject: [PATCH] Fix quality and test compilation. --- .../impl/members/RoomMemberListPresenter.kt | 6 +++--- .../roomdetails/members/RoomMemberListPresenterTest.kt | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt index 51f9845a49..01e1cf99c2 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt @@ -83,10 +83,10 @@ class RoomMemberListPresenter @AssistedInject constructor( if (membersState is MatrixRoomMembersState.Unknown) { return@LaunchedEffect } - val _membersState = membersState - if (_membersState is MatrixRoomMembersState.Error && _membersState.roomMembers().orEmpty().isEmpty()) { + val finalMembersState = membersState + if (finalMembersState is MatrixRoomMembersState.Error && finalMembersState.roomMembers().orEmpty().isEmpty()) { // Cannot fetch members and no cached members, display the error - roomMembers = AsyncData.Failure(_membersState.failure) + roomMembers = AsyncData.Failure(finalMembersState.failure) return@LaunchedEffect } withContext(coroutineDispatchers.io) { diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/RoomMemberListPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/RoomMemberListPresenterTest.kt index c6862f3e2e..a352d8bf27 100644 --- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/RoomMemberListPresenterTest.kt +++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/RoomMemberListPresenterTest.kt @@ -62,7 +62,7 @@ class RoomMemberListPresenterTest { }.test { skipItems(1) val initialState = awaitItem() - assertThat(initialState.roomMembers.isLoading).isTrue() + assertThat(initialState.roomMembers.isLoading()).isTrue() assertThat(initialState.searchQuery).isEmpty() assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java) assertThat(initialState.isSearchActive).isFalse() @@ -70,9 +70,9 @@ class RoomMemberListPresenterTest { // Skip item while the new members state is processed skipItems(1) val loadedMembersState = awaitItem() - assertThat(loadedMembersState.roomMembers.isLoading).isFalse() - assertThat(loadedMembersState.roomMembers.invited).isEqualTo(listOf(aVictor(), aWalter())) - assertThat(loadedMembersState.roomMembers.joined).isNotEmpty() + assertThat(loadedMembersState.roomMembers.isLoading()).isFalse() + assertThat(loadedMembersState.roomMembers.dataOrNull()?.invited).isEqualTo(listOf(aVictor(), aWalter())) + assertThat(loadedMembersState.roomMembers.dataOrNull()?.joined).isNotEmpty() } } @@ -126,7 +126,7 @@ class RoomMemberListPresenterTest { assertThat(searchQueryUpdatedState.searchQuery).isEqualTo("Alice") val searchSearchResultDelivered = awaitItem() assertThat(searchSearchResultDelivered.searchResults).isInstanceOf(SearchBarResultState.Results::class.java) - assertThat((searchSearchResultDelivered.searchResults as SearchBarResultState.Results).results.joined.first().displayName) + assertThat((searchSearchResultDelivered.searchResults as SearchBarResultState.Results).results.dataOrNull()!!.joined.first().displayName) .isEqualTo("Alice") } }