ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 10:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MatrixUserRepositoryTest

Browse Source
This commit is contained in:
ganfra
2024-01-05 15:12:31 +01:00
parent fae247d38d
commit 96302da97c
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/usersearch/impl/src/main/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepository.kt
+1 -1
View File
@@ -42,7 +42,7 @@ class MatrixUserRepository @Inject constructor(
val shouldFetchSearchResults = query.length >= MINIMUM_SEARCH_LENGTH val shouldFetchSearchResults = query.length >= MINIMUM_SEARCH_LENGTH
// If the search term is a MXID that's not ours, we'll show a 'fake' result for that user, then update it when we get search results. // If the search term is a MXID that's not ours, we'll show a 'fake' result for that user, then update it when we get search results.
val fakeSearchResult = if (shouldQueryProfile) { val fakeSearchResult = if (shouldQueryProfile) {
UserSearchResult(MatrixUser(UserId(query)), isUnresolved = true) UserSearchResult(MatrixUser(UserId(query)))
} else { } else {
null null
} }
libraries/usersearch/impl/src/test/kotlin/io/element/android/libraries/usersearch/impl/MatrixUserRepositoryTest.kt
+33 -12
View File
@@ -54,7 +54,14 @@ internal class MatrixUserRepositoryTest {
val result = repository.search("some query") val result = repository.search("some query")
result.test { result.test {
assertThat(awaitItem()).isEmpty() awaitItem().also {
assertThat(it.isFetchingSearchResults).isTrue()
assertThat(it.results).isEmpty()
}
awaitItem().also {
assertThat(it.isFetchingSearchResults).isFalse()
assertThat(it.results).isEmpty()
}
awaitComplete() awaitComplete()
} }
} }
@@ -68,7 +75,14 @@ internal class MatrixUserRepositoryTest {
val result = repository.search("some query") val result = repository.search("some query")
result.test { result.test {
assertThat(awaitItem()).isEqualTo(aMatrixUserList().toUserSearchResults()) awaitItem().also {
assertThat(it.isFetchingSearchResults).isTrue()
assertThat(it.results).isEmpty()
}
awaitItem().also {
assertThat(it.isFetchingSearchResults).isFalse()
assertThat(it.results).isEqualTo(aMatrixUserList().toUserSearchResults())
}
awaitComplete() awaitComplete()
} }
} }
@@ -81,9 +95,11 @@ internal class MatrixUserRepositoryTest {
val result = repository.search(A_USER_ID.value) val result = repository.search(A_USER_ID.value)
result.test { result.test {
assertThat(awaitItem()).isEqualTo(listOf(placeholderResult())) awaitItem().also {
skipItems(1) assertThat(it.isFetchingSearchResults).isTrue()
awaitComplete() assertThat(it.results).isEqualTo(listOf(placeholderResult()))
}
cancelAndConsumeRemainingEvents()
} }
} }
@@ -95,8 +111,11 @@ internal class MatrixUserRepositoryTest {
val result = repository.search(SESSION_ID.value) val result = repository.search(SESSION_ID.value)
result.test { result.test {
assertThat(awaitItem()).isEmpty() awaitItem().also {
awaitComplete() assertThat(it.isFetchingSearchResults).isTrue()
assertThat(it.results).isEmpty()
}
cancelAndConsumeRemainingEvents()
} }
} }
@@ -110,7 +129,8 @@ internal class MatrixUserRepositoryTest {
val result = repository.search("some text") val result = repository.search("some text")
result.test { result.test {
assertThat(awaitItem()).isEqualTo(aMatrixUserList().toUserSearchResults()) skipItems(1)
assertThat(awaitItem().results).isEqualTo(aMatrixUserList().toUserSearchResults())
awaitComplete() awaitComplete()
} }
} }
@@ -126,7 +146,7 @@ internal class MatrixUserRepositoryTest {
result.test { result.test {
skipItems(1) skipItems(1)
assertThat(awaitItem()).isEqualTo(searchResults.toUserSearchResults()) assertThat(awaitItem().results).isEqualTo(searchResults.toUserSearchResults())
awaitComplete() awaitComplete()
} }
} }
@@ -145,7 +165,7 @@ internal class MatrixUserRepositoryTest {
result.test { result.test {
skipItems(1) skipItems(1)
assertThat(awaitItem()).isEqualTo((listOf(userProfile) + searchResults).toUserSearchResults()) assertThat(awaitItem().results).isEqualTo((listOf(userProfile) + searchResults).toUserSearchResults())
awaitComplete() awaitComplete()
} }
} }
@@ -163,7 +183,8 @@ internal class MatrixUserRepositoryTest {
val result = repository.search(SESSION_ID.value) val result = repository.search(SESSION_ID.value)
result.test { result.test {
assertThat(awaitItem()).isEqualTo(searchResults.toUserSearchResults()) skipItems(1)
assertThat(awaitItem().results).isEqualTo(searchResults.toUserSearchResults())
awaitComplete() awaitComplete()
} }
} }
@@ -181,7 +202,7 @@ internal class MatrixUserRepositoryTest {
result.test { result.test {
skipItems(1) skipItems(1)
assertThat(awaitItem()).isEqualTo(listOf(placeholderResult(isUnresolved = true)) + searchResults.toUserSearchResults()) assertThat(awaitItem().results).isEqualTo(listOf(placeholderResult(isUnresolved = true)) + searchResults.toUserSearchResults())
awaitComplete() awaitComplete()
} }
} }