Add basic navigation for the search screen (#707)

This commit is contained in:
David Perez
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent e3547f4e13
commit 75fbadb67b
27 changed files with 728 additions and 21 deletions
@@ -0,0 +1,42 @@
package com.x8bit.bitwarden.ui.platform.feature.search
import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType
import io.mockk.every
import io.mockk.mockk
import kotlinx.coroutines.flow.MutableStateFlow
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
class SearchScreenTest : BaseComposeTest() {
private val mutableEventFlow = bufferedMutableSharedFlow<SearchEvent>()
private val mutableStateFlow = MutableStateFlow(DEFAULT_STATE)
private val viewModel = mockk<SearchViewModel> {
every { eventFlow } returns mutableEventFlow
every { stateFlow } returns mutableStateFlow
}
private var onNavigateBackCalled = false
@Before
fun setup() {
composeTestRule.setContent {
SearchScreen(
viewModel = viewModel,
onNavigateBack = { onNavigateBackCalled = true },
)
}
}
@Test
fun `NavigateBack should call onNavigateBack`() {
mutableEventFlow.tryEmit(SearchEvent.NavigateBack)
assertTrue(onNavigateBackCalled)
}
}
private val DEFAULT_STATE: SearchState = SearchState(
searchType = SearchType.Vault.All,
)
@@ -0,0 +1,83 @@
package com.x8bit.bitwarden.ui.platform.feature.search
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType
import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
class SearchViewModelTest : BaseViewModelTest() {
@Test
fun `initial state should be correct when not set`() {
val viewModel = createViewModel(initialState = null)
assertEquals(DEFAULT_STATE, viewModel.stateFlow.value)
}
@Test
fun `initial state should be correct when set`() {
val state = DEFAULT_STATE.copy(searchType = SearchType.Sends.All)
val viewModel = createViewModel(initialState = state)
assertEquals(state, viewModel.stateFlow.value)
}
@Test
fun `BackClick should emit NavigateBack`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(SearchAction.BackClick)
assertEquals(SearchEvent.NavigateBack, awaitItem())
}
}
@Suppress("CyclomaticComplexMethod")
private fun createViewModel(
initialState: SearchState? = null,
): SearchViewModel = SearchViewModel(
SavedStateHandle().apply {
set("state", initialState)
set(
"search_type",
when (initialState?.searchType) {
SearchType.Sends.All -> "search_type_sends_all"
SearchType.Sends.Files -> "search_type_sends_file"
SearchType.Sends.Texts -> "search_type_sends_text"
SearchType.Vault.All -> "search_type_vault_all"
SearchType.Vault.Cards -> "search_type_vault_cards"
is SearchType.Vault.Collection -> "search_type_vault_collection"
is SearchType.Vault.Folder -> "search_type_vault_folder"
SearchType.Vault.Identities -> "search_type_vault_identities"
SearchType.Vault.Logins -> "search_type_vault_logins"
SearchType.Vault.NoFolder -> "search_type_vault_no_folder"
SearchType.Vault.SecureNotes -> "search_type_vault_secure_notes"
SearchType.Vault.Trash -> "search_type_vault_trash"
null -> "search_type_vault_all"
},
)
set(
"search_type_id",
when (val searchType = initialState?.searchType) {
SearchType.Sends.All -> null
SearchType.Sends.Files -> null
SearchType.Sends.Texts -> null
SearchType.Vault.All -> null
SearchType.Vault.Cards -> null
is SearchType.Vault.Collection -> searchType.collectionId
is SearchType.Vault.Folder -> searchType.folderId
SearchType.Vault.Identities -> null
SearchType.Vault.Logins -> null
SearchType.Vault.NoFolder -> null
SearchType.Vault.SecureNotes -> null
SearchType.Vault.Trash -> null
null -> null
},
)
},
)
}
private val DEFAULT_STATE: SearchState = SearchState(
searchType = SearchType.Vault.All,
)
@@ -47,6 +47,8 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
onNavigateToDeleteAccount = {},
onNavigateToFolders = {},
onNavigateToPasswordHistory = {},
onNavigateToSearchVault = {},
onNavigateToSearchSend = {},
)
}
}
@@ -41,6 +41,7 @@ class SendScreenTest : BaseComposeTest() {
private var onNavigateToNewSendCalled = false
private var onNavigateToSendFilesListCalled = false
private var onNavigateToSendTextListCalled = false
private var onNavigateToSendSearchCalled = false
private var onNavigateToEditSendId: String? = null
private val intentManager = mockk<IntentManager> {
@@ -63,6 +64,7 @@ class SendScreenTest : BaseComposeTest() {
onNavigateToEditSend = { onNavigateToEditSendId = it },
onNavigateToSendFilesList = { onNavigateToSendFilesListCalled = true },
onNavigateToSendTextList = { onNavigateToSendTextListCalled = true },
onNavigateToSearchSend = { onNavigateToSendSearchCalled = true },
intentManager = intentManager,
)
}
@@ -93,6 +95,12 @@ class SendScreenTest : BaseComposeTest() {
assertTrue(onNavigateToSendTextListCalled)
}
@Test
fun `on NavigateToSearch should call onNavigateToSendSearch`() {
mutableEventFlow.tryEmit(SendEvent.NavigateToSearch)
assertTrue(onNavigateToSendSearchCalled)
}
@Test
fun `on NavigateToAboutSend should call launchUri on intentManager`() {
mutableEventFlow.tryEmit(SendEvent.NavigateToAboutSend)
@@ -108,11 +108,11 @@ class SendViewModelTest : BaseViewModelTest() {
}
@Test
fun `SearchClick should emit ShowToast`() = runTest {
fun `SearchClick should emit NavigateToSearch`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(SendAction.SearchClick)
assertEquals(SendEvent.ShowToast("Search Not Implemented".asText()), awaitItem())
assertEquals(SendEvent.NavigateToSearch, awaitItem())
}
}
@@ -26,6 +26,7 @@ import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.model.IconData
import com.x8bit.bitwarden.ui.platform.components.model.IconRes
import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
import com.x8bit.bitwarden.ui.util.assertNoDialogExists
import com.x8bit.bitwarden.ui.util.isProgressBar
@@ -50,6 +51,7 @@ class VaultItemListingScreenTest : BaseComposeTest() {
private var onNavigateToAddSendScreenCalled = false
private var onNavigateToEditSendItemId: String? = null
private var onNavigateToVaultItemId: String? = null
private var onNavigateToSearchType: SearchType? = null
private val intentManager: IntentManager = mockk {
every { shareText(any()) } just runs
@@ -72,6 +74,7 @@ class VaultItemListingScreenTest : BaseComposeTest() {
onNavigateToVaultAddItemScreen = { onNavigateToVaultAddItemScreenCalled = true },
onNavigateToAddSendItem = { onNavigateToAddSendScreenCalled = true },
onNavigateToEditSendItem = { onNavigateToEditSendItemId = it },
onNavigateToSearch = { onNavigateToSearchType = it },
)
}
}
@@ -147,6 +150,13 @@ class VaultItemListingScreenTest : BaseComposeTest() {
assertTrue(onNavigateToAddSendScreenCalled)
}
@Test
fun `NavigateToVaultSearchScreen should call onNavigateToSearch`() {
val searchType = SearchType.Vault.SecureNotes
mutableEventFlow.tryEmit(VaultItemListingEvent.NavigateToSearchScreen(searchType))
assertEquals(searchType, onNavigateToSearchType)
}
@Test
fun `NavigateToSendItem event should call onNavigateToEditSendItemId`() {
val sendId = "sendId"
@@ -22,6 +22,7 @@ import com.x8bit.bitwarden.data.vault.repository.model.VaultData
import com.x8bit.bitwarden.ui.platform.base.BaseViewModelTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.base.util.concat
import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.model.ListingItemOverflowAction
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.util.createMockDisplayItemForCipher
import com.x8bit.bitwarden.ui.vault.feature.vault.model.VaultFilterType
@@ -106,10 +107,11 @@ class VaultItemListingViewModelTest : BaseViewModelTest() {
@Test
fun `SearchIconClick should emit NavigateToVaultSearchScreen`() = runTest {
val searchType = SearchType.Vault.Logins
val viewModel = createVaultItemListingViewModel()
viewModel.eventFlow.test {
viewModel.actionChannel.trySend(VaultItemListingsAction.SearchIconClick)
assertEquals(VaultItemListingEvent.NavigateToVaultSearchScreen, awaitItem())
assertEquals(VaultItemListingEvent.NavigateToSearchScreen(searchType), awaitItem())
}
}
@@ -0,0 +1,111 @@
package com.x8bit.bitwarden.ui.vault.feature.itemlisting.util
import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType
import com.x8bit.bitwarden.ui.vault.feature.itemlisting.VaultItemListingState
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
class VaultItemListingStateExtensionsTest {
@Test
fun `toSearchType should return Texts when item type is SendText`() {
val expected = SearchType.Sends.Texts
val itemType = VaultItemListingState.ItemListingType.Send.SendText
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return Files when item type is SendFile`() {
val expected = SearchType.Sends.Files
val itemType = VaultItemListingState.ItemListingType.Send.SendFile
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return Logins when item type is Login`() {
val expected = SearchType.Vault.Logins
val itemType = VaultItemListingState.ItemListingType.Vault.Login
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return Card when item type is Card`() {
val expected = SearchType.Vault.Cards
val itemType = VaultItemListingState.ItemListingType.Vault.Card
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return Identities when item type is Identity`() {
val expected = SearchType.Vault.Identities
val itemType = VaultItemListingState.ItemListingType.Vault.Identity
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return SecureNotes when item type is SecureNote`() {
val expected = SearchType.Vault.SecureNotes
val itemType = VaultItemListingState.ItemListingType.Vault.SecureNote
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return Trash when item type is Trash`() {
val expected = SearchType.Vault.Trash
val itemType = VaultItemListingState.ItemListingType.Vault.Trash
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return Folder when item type is Folder with an ID`() {
val folderId = "folderId"
val expected = SearchType.Vault.Folder(folderId)
val itemType = VaultItemListingState.ItemListingType.Vault.Folder(folderId)
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return NoFolder when item type is Folder without an ID`() {
val expected = SearchType.Vault.NoFolder
val itemType = VaultItemListingState.ItemListingType.Vault.Folder(null)
val result = itemType.toSearchType()
assertEquals(expected, result)
}
@Test
fun `toSearchType should return Collection when item type is Collection`() {
val collectionId = "collectionId"
val expected = SearchType.Vault.Collection(collectionId)
val itemType = VaultItemListingState.ItemListingType.Vault.Collection(collectionId)
val result = itemType.toSearchType()
assertEquals(expected, result)
}
}
@@ -61,6 +61,7 @@ class VaultScreenTest : BaseComposeTest() {
private var onNavigateToVaultItemListingType: VaultItemListingType? = null
private var onDimBottomNavBarRequestCalled = false
private var onNavigateToVerificationCodeScreen = false
private var onNavigateToSearchScreen = false
private val exitManager = mockk<ExitManager>(relaxed = true)
private val mutableEventFlow = bufferedMutableSharedFlow<VaultEvent>()
@@ -81,6 +82,7 @@ class VaultScreenTest : BaseComposeTest() {
onNavigateToVaultItemListingScreen = { onNavigateToVaultItemListingType = it },
onDimBottomNavBarRequest = { onDimBottomNavBarRequestCalled = true },
onNavigateToVerificationCodeScreen = { onNavigateToVerificationCodeScreen = true },
onNavigateToSearchVault = { onNavigateToSearchScreen = true },
exitManager = exitManager,
)
}
@@ -586,6 +588,12 @@ class VaultScreenTest : BaseComposeTest() {
assertTrue(onNavigateToVaultAddItemScreenCalled)
}
@Test
fun `NavigateToVaultSearchScreen event should call onNavigateToSearchScreen`() {
mutableEventFlow.tryEmit(VaultEvent.NavigateToVaultSearchScreen)
assertTrue(onNavigateToSearchScreen)
}
@Test
fun `NavigateToVaultItem event should call onNavigateToVaultItemScreen`() {
val id = "id4321"