Refactor AddSendViewModel to support loading and error states. (#524)

This commit is contained in:
David Perez
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent 1e8d603b61
commit 978e72899b
6 changed files with 635 additions and 367 deletions
@@ -1,5 +1,6 @@
package com.x8bit.bitwarden.ui.tools.feature.send.addsend
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.assertIsOff
import androidx.compose.ui.test.assertIsOn
import androidx.compose.ui.test.assertTextEquals
@@ -13,6 +14,8 @@ import androidx.compose.ui.test.performScrollTo
import androidx.compose.ui.test.performTextInput
import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.util.isProgressBar
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
@@ -83,7 +86,11 @@ class AddSendScreenTest : BaseComposeTest() {
)
mutableStateFlow.update {
it.copy(name = "input")
it.copy(
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(name = "input"),
),
)
}
composeTestRule
.onNodeWithText("Name")
@@ -113,7 +120,9 @@ class AddSendScreenTest : BaseComposeTest() {
@Test
fun `Choose file button click should send ChooseFileClick`() {
mutableStateFlow.value = DEFAULT_STATE.copy(
selectedType = AddSendState.SendType.File,
viewState = DEFAULT_VIEW_STATE.copy(
selectedType = AddSendState.ViewState.Content.SendType.File,
),
)
composeTestRule
.onNodeWithText("Choose file")
@@ -143,9 +152,11 @@ class AddSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
selectedType = AddSendState.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
viewState = DEFAULT_VIEW_STATE.copy(
selectedType = AddSendState.ViewState.Content.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
),
),
)
}
@@ -175,9 +186,11 @@ class AddSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
selectedType = AddSendState.SendType.Text(
input = "",
isHideByDefaultChecked = true,
viewState = DEFAULT_VIEW_STATE.copy(
selectedType = AddSendState.ViewState.Content.SendType.Text(
input = "",
isHideByDefaultChecked = true,
),
),
)
}
@@ -253,7 +266,11 @@ class AddSendScreenTest : BaseComposeTest() {
@Test
fun `max access count decrement should send MaxAccessCountChange`() = runTest {
mutableStateFlow.update {
it.copy(maxAccessCount = 3)
it.copy(
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(maxAccessCount = 3),
),
)
}
// Expand options section:
composeTestRule
@@ -272,7 +289,11 @@ class AddSendScreenTest : BaseComposeTest() {
fun `max access count decrement when set to 1 should do nothing`() =
runTest {
mutableStateFlow.update {
it.copy(maxAccessCount = 1)
it.copy(
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(maxAccessCount = 1),
),
)
}
// Expand options section:
composeTestRule
@@ -333,7 +354,9 @@ class AddSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
passwordInput = "input",
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(passwordInput = "input"),
),
)
}
composeTestRule
@@ -376,7 +399,9 @@ class AddSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
noteInput = "input",
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(noteInput = "input"),
),
)
}
composeTestRule
@@ -416,7 +441,9 @@ class AddSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
isHideEmailChecked = true,
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(isHideEmailChecked = true),
),
)
}
composeTestRule
@@ -452,7 +479,9 @@ class AddSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
isDeactivateChecked = true,
viewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(isDeactivateChecked = true),
),
)
}
composeTestRule
@@ -460,18 +489,60 @@ class AddSendScreenTest : BaseComposeTest() {
.assertIsOn()
}
@Test
fun `progressbar should be displayed according to state`() {
mutableStateFlow.update {
it.copy(viewState = AddSendState.ViewState.Loading)
}
composeTestRule.onNode(isProgressBar).assertIsDisplayed()
mutableStateFlow.update {
it.copy(viewState = AddSendState.ViewState.Error("Fail".asText()))
}
composeTestRule.onNode(isProgressBar).assertDoesNotExist()
mutableStateFlow.update {
it.copy(viewState = DEFAULT_VIEW_STATE)
}
composeTestRule.onNode(isProgressBar).assertDoesNotExist()
}
@Test
fun `error should be displayed according to state`() {
val errorMessage = "Fail"
mutableStateFlow.update {
it.copy(viewState = AddSendState.ViewState.Error(errorMessage.asText()))
}
composeTestRule.onNodeWithText(errorMessage).assertIsDisplayed()
mutableStateFlow.update {
it.copy(viewState = AddSendState.ViewState.Loading)
}
composeTestRule.onNodeWithText(errorMessage).assertDoesNotExist()
}
companion object {
private val DEFAULT_STATE = AddSendState(
private val DEFAULT_COMMON_STATE = AddSendState.ViewState.Content.Common(
name = "",
maxAccessCount = null,
passwordInput = "",
noteInput = "",
isHideEmailChecked = false,
isDeactivateChecked = false,
selectedType = AddSendState.SendType.Text(
input = "",
isHideByDefaultChecked = false,
),
)
private val DEFAULT_SELECTED_TYPE_STATE = AddSendState.ViewState.Content.SendType.Text(
input = "",
isHideByDefaultChecked = false,
)
private val DEFAULT_VIEW_STATE = AddSendState.ViewState.Content(
common = DEFAULT_COMMON_STATE,
selectedType = DEFAULT_SELECTED_TYPE_STATE,
)
private val DEFAULT_STATE = AddSendState(
viewState = DEFAULT_VIEW_STATE,
)
}
}
@@ -19,9 +19,7 @@ class AddSendViewModelTest : BaseViewModelTest() {
@Test
fun `initial state should read from saved state when present`() {
val savedState = mockk<AddSendState>()
val viewModel = createViewModel(
savedStateHandle = SavedStateHandle(mapOf("state" to savedState)),
)
val viewModel = createViewModel(savedState)
assertEquals(savedState, viewModel.stateFlow.value)
}
@@ -55,13 +53,14 @@ class AddSendViewModelTest : BaseViewModelTest() {
@Test
fun `FileTypeClick and TextTypeClick should toggle sendType`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
selectedType = AddSendState.ViewState.Content.SendType.File,
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.FileTypeClick)
assertEquals(
DEFAULT_STATE.copy(selectedType = AddSendState.SendType.File),
awaitItem(),
)
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
viewModel.trySendAction(AddSendAction.TextTypeClick)
assertEquals(DEFAULT_STATE, awaitItem())
}
@@ -70,99 +69,132 @@ class AddSendViewModelTest : BaseViewModelTest() {
@Test
fun `NameChange should update name input`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(name = "input"),
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.NameChange("input"))
assertEquals(DEFAULT_STATE.copy(name = "input"), awaitItem())
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
}
}
@Test
fun `MaxAccessCountChange should update maxAccessCount`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(maxAccessCount = 5),
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.MaxAccessCountChange(5))
assertEquals(DEFAULT_STATE.copy(maxAccessCount = 5), awaitItem())
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
}
}
@Test
fun `TextChange should update text input`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
selectedType = AddSendState.ViewState.Content.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
),
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.TextChange("input"))
assertEquals(
DEFAULT_STATE.copy(
selectedType = AddSendState.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
),
),
awaitItem(),
)
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
}
}
@Test
fun `NoteChange should update note input`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(noteInput = "input"),
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.NoteChange("input"))
assertEquals(DEFAULT_STATE.copy(noteInput = "input"), awaitItem())
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
}
}
@Test
fun `PasswordChange should update note input`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(passwordInput = "input"),
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.PasswordChange("input"))
assertEquals(DEFAULT_STATE.copy(passwordInput = "input"), awaitItem())
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
}
}
@Test
fun `DeactivateThisSendToggle should update isDeactivateChecked`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(isDeactivateChecked = true),
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.DeactivateThisSendToggle(true))
assertEquals(DEFAULT_STATE.copy(isDeactivateChecked = true), awaitItem())
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
}
}
@Test
fun `HideMyEmailToggle should update isHideEmailChecked`() = runTest {
val viewModel = createViewModel()
val expectedViewState = DEFAULT_VIEW_STATE.copy(
common = DEFAULT_COMMON_STATE.copy(isHideEmailChecked = true),
)
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(AddSendAction.HideMyEmailToggle(true))
assertEquals(DEFAULT_STATE.copy(isHideEmailChecked = true), awaitItem())
viewModel.trySendAction(AddSendAction.HideMyEmailToggle(isChecked = true))
assertEquals(DEFAULT_STATE.copy(viewState = expectedViewState), awaitItem())
}
}
private fun createViewModel(
savedStateHandle: SavedStateHandle = SavedStateHandle(),
state: AddSendState? = null,
): AddSendViewModel = AddSendViewModel(
savedStateHandle = savedStateHandle,
savedStateHandle = SavedStateHandle().apply { set("state", state) },
)
companion object {
private val DEFAULT_STATE = AddSendState(
private val DEFAULT_COMMON_STATE = AddSendState.ViewState.Content.Common(
name = "",
maxAccessCount = null,
passwordInput = "",
noteInput = "",
isHideEmailChecked = false,
isDeactivateChecked = false,
selectedType = AddSendState.SendType.Text(
input = "",
isHideByDefaultChecked = false,
),
)
private val DEFAULT_SELECTED_TYPE_STATE = AddSendState.ViewState.Content.SendType.Text(
input = "",
isHideByDefaultChecked = false,
)
private val DEFAULT_VIEW_STATE = AddSendState.ViewState.Content(
common = DEFAULT_COMMON_STATE,
selectedType = DEFAULT_SELECTED_TYPE_STATE,
)
private val DEFAULT_STATE = AddSendState(
viewState = DEFAULT_VIEW_STATE,
)
}
}