Create package for add send feature (#472)

This commit is contained in:
David Perez
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent 6e69e00d96
commit 9bf07f0693
13 changed files with 146 additions and 144 deletions
@@ -44,7 +44,7 @@ class VaultUnlockedNavBarScreenTest : BaseComposeTest() {
onNavigateToVaultAddItem = {},
onNavigateToVaultItem = {},
onNavigateToVaultEditItem = {},
onNavigateToNewSend = {},
onNavigateToAddSend = {},
onNavigateToDeleteAccount = {},
onNavigateToFolders = {},
onNavigateToPasswordHistory = {},
@@ -39,7 +39,7 @@ class SendScreenTest : BaseComposeTest() {
composeTestRule.setContent {
SendScreen(
viewModel = viewModel,
onNavigateNewSend = { onNavigateToNewSendCalled = true },
onNavigateAddSend = { onNavigateToNewSendCalled = true },
intentHandler = intentHandler,
)
}
@@ -1,4 +1,4 @@
package com.x8bit.bitwarden.ui.tools.feature.send
package com.x8bit.bitwarden.ui.tools.feature.send.addsend
import androidx.compose.ui.test.assertIsOff
import androidx.compose.ui.test.assertIsOn
@@ -22,10 +22,10 @@ import kotlinx.coroutines.test.runTest
import org.junit.Before
import org.junit.Test
class NewSendScreenTest : BaseComposeTest() {
class AddSendScreenTest : BaseComposeTest() {
private var onNavigateBackCalled = false
private val mutableEventFlow = MutableSharedFlow<NewSendEvent>(
private val mutableEventFlow = MutableSharedFlow<AddSendEvent>(
extraBufferCapacity = Int.MAX_VALUE,
)
private val mutableStateFlow = MutableStateFlow(DEFAULT_STATE)
@@ -37,7 +37,7 @@ class NewSendScreenTest : BaseComposeTest() {
@Before
fun setUp() {
composeTestRule.setContent {
NewSendScreen(
AddSendScreen(
viewModel = viewModel,
onNavigateBack = { onNavigateBackCalled = true },
)
@@ -46,7 +46,7 @@ class NewSendScreenTest : BaseComposeTest() {
@Test
fun `on NavigateBack should call onNavigateBack`() {
mutableEventFlow.tryEmit(NewSendEvent.NavigateBack)
mutableEventFlow.tryEmit(AddSendEvent.NavigateBack)
assert(onNavigateBackCalled)
}
@@ -55,7 +55,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithContentDescription("Close")
.performClick()
verify { viewModel.trySendAction(NewSendAction.CloseClick) }
verify { viewModel.trySendAction(AddSendAction.CloseClick) }
}
@Test
@@ -63,7 +63,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText("Save")
.performClick()
verify { viewModel.trySendAction(NewSendAction.SaveClick) }
verify { viewModel.trySendAction(AddSendAction.SaveClick) }
}
@Test
@@ -71,7 +71,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText("Name")
.performTextInput("input")
verify { viewModel.trySendAction(NewSendAction.NameChange("input")) }
verify { viewModel.trySendAction(AddSendAction.NameChange("input")) }
}
@Test
@@ -101,7 +101,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText("File")
.performClick()
verify { viewModel.trySendAction(NewSendAction.FileTypeClick) }
verify { viewModel.trySendAction(AddSendAction.FileTypeClick) }
}
@Test
@@ -109,19 +109,19 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onAllNodesWithText("Text")[0]
.performClick()
verify { viewModel.trySendAction(NewSendAction.TextTypeClick) }
verify { viewModel.trySendAction(AddSendAction.TextTypeClick) }
}
@Test
fun `Choose file button click should send ChooseFileClick`() {
mutableStateFlow.value = DEFAULT_STATE.copy(
selectedType = NewSendState.SendType.File,
selectedType = AddSendState.SendType.File,
)
composeTestRule
.onNodeWithText("Choose file")
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.ChooseFileClick) }
verify { viewModel.trySendAction(AddSendAction.ChooseFileClick) }
}
@Test
@@ -129,7 +129,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onAllNodesWithText("Text")[1]
.performTextInput("input")
viewModel.trySendAction(NewSendAction.TextChange("input"))
viewModel.trySendAction(AddSendAction.TextChange("input"))
}
@Test
@@ -145,7 +145,7 @@ class NewSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
selectedType = NewSendState.SendType.Text(
selectedType = AddSendState.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
),
@@ -166,7 +166,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText(text = "When accessing the Send", substring = true)
.performClick()
viewModel.trySendAction(NewSendAction.HideByDefaultToggle(true))
viewModel.trySendAction(AddSendAction.HideByDefaultToggle(true))
}
@Test
@@ -177,7 +177,7 @@ class NewSendScreenTest : BaseComposeTest() {
mutableStateFlow.update {
it.copy(
selectedType = NewSendState.SendType.Text(
selectedType = AddSendState.SendType.Text(
input = "",
isHideByDefaultChecked = true,
),
@@ -267,7 +267,7 @@ class NewSendScreenTest : BaseComposeTest() {
.onNodeWithContentDescription("\u2212")
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.MaxAccessCountChange(2)) }
verify { viewModel.trySendAction(AddSendAction.MaxAccessCountChange(2)) }
}
@Test
@@ -301,7 +301,7 @@ class NewSendScreenTest : BaseComposeTest() {
.onNodeWithContentDescription("+")
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.MaxAccessCountChange(1)) }
verify { viewModel.trySendAction(AddSendAction.MaxAccessCountChange(1)) }
}
@Test
@@ -315,7 +315,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText("New password")
.performTextInput("input")
verify { viewModel.trySendAction(NewSendAction.PasswordChange("input")) }
verify { viewModel.trySendAction(AddSendAction.PasswordChange("input")) }
}
@Test
@@ -358,7 +358,7 @@ class NewSendScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText("Notes")
.performTextInput("input")
verify { viewModel.trySendAction(NewSendAction.NoteChange("input")) }
verify { viewModel.trySendAction(AddSendAction.NoteChange("input")) }
}
@Test
@@ -402,7 +402,7 @@ class NewSendScreenTest : BaseComposeTest() {
.onNodeWithText("Hide my email address", substring = true)
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.HideMyEmailToggle(true)) }
verify { viewModel.trySendAction(AddSendAction.HideMyEmailToggle(true)) }
}
@Test
@@ -438,7 +438,7 @@ class NewSendScreenTest : BaseComposeTest() {
.onNodeWithText("Deactivate this Send", substring = true)
.performScrollTo()
.performClick()
verify { viewModel.trySendAction(NewSendAction.DeactivateThisSendToggle(true)) }
verify { viewModel.trySendAction(AddSendAction.DeactivateThisSendToggle(true)) }
}
@Test
@@ -463,14 +463,14 @@ class NewSendScreenTest : BaseComposeTest() {
}
companion object {
private val DEFAULT_STATE = NewSendState(
private val DEFAULT_STATE = AddSendState(
name = "",
maxAccessCount = null,
passwordInput = "",
noteInput = "",
isHideEmailChecked = false,
isDeactivateChecked = false,
selectedType = NewSendState.SendType.Text(
selectedType = AddSendState.SendType.Text(
input = "",
isHideByDefaultChecked = false,
),
@@ -1,4 +1,4 @@
package com.x8bit.bitwarden.ui.tools.feature.send
package com.x8bit.bitwarden.ui.tools.feature.send.addsend
import androidx.lifecycle.SavedStateHandle
import app.cash.turbine.test
@@ -8,7 +8,7 @@ import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
class NewSendViewModelTest : BaseViewModelTest() {
class AddSendViewModelTest : BaseViewModelTest() {
@Test
fun `initial state should be correct`() {
@@ -18,7 +18,7 @@ class NewSendViewModelTest : BaseViewModelTest() {
@Test
fun `initial state should read from saved state when present`() {
val savedState = mockk<NewSendState>()
val savedState = mockk<AddSendState>()
val viewModel = createViewModel(
savedStateHandle = SavedStateHandle(mapOf("state" to savedState)),
)
@@ -29,8 +29,8 @@ class NewSendViewModelTest : BaseViewModelTest() {
fun `CloseClick should emit NavigateBack`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(NewSendAction.CloseClick)
assertEquals(NewSendEvent.NavigateBack, awaitItem())
viewModel.trySendAction(AddSendAction.CloseClick)
assertEquals(AddSendEvent.NavigateBack, awaitItem())
}
}
@@ -38,8 +38,8 @@ class NewSendViewModelTest : BaseViewModelTest() {
fun `SaveClick should emit ShowToast`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(NewSendAction.SaveClick)
assertEquals(NewSendEvent.ShowToast("Save Not Implemented"), awaitItem())
viewModel.trySendAction(AddSendAction.SaveClick)
assertEquals(AddSendEvent.ShowToast("Save Not Implemented"), awaitItem())
}
}
@@ -47,8 +47,8 @@ class NewSendViewModelTest : BaseViewModelTest() {
fun `ChooseFileClick should emit ShowToast`() = runTest {
val viewModel = createViewModel()
viewModel.eventFlow.test {
viewModel.trySendAction(NewSendAction.ChooseFileClick)
assertEquals(NewSendEvent.ShowToast("Not Implemented: File Upload"), awaitItem())
viewModel.trySendAction(AddSendAction.ChooseFileClick)
assertEquals(AddSendEvent.ShowToast("Not Implemented: File Upload"), awaitItem())
}
}
@@ -57,12 +57,12 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.FileTypeClick)
viewModel.trySendAction(AddSendAction.FileTypeClick)
assertEquals(
DEFAULT_STATE.copy(selectedType = NewSendState.SendType.File),
DEFAULT_STATE.copy(selectedType = AddSendState.SendType.File),
awaitItem(),
)
viewModel.trySendAction(NewSendAction.TextTypeClick)
viewModel.trySendAction(AddSendAction.TextTypeClick)
assertEquals(DEFAULT_STATE, awaitItem())
}
}
@@ -72,7 +72,7 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.NameChange("input"))
viewModel.trySendAction(AddSendAction.NameChange("input"))
assertEquals(DEFAULT_STATE.copy(name = "input"), awaitItem())
}
}
@@ -82,7 +82,7 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.MaxAccessCountChange(5))
viewModel.trySendAction(AddSendAction.MaxAccessCountChange(5))
assertEquals(DEFAULT_STATE.copy(maxAccessCount = 5), awaitItem())
}
}
@@ -92,10 +92,10 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.TextChange("input"))
viewModel.trySendAction(AddSendAction.TextChange("input"))
assertEquals(
DEFAULT_STATE.copy(
selectedType = NewSendState.SendType.Text(
selectedType = AddSendState.SendType.Text(
input = "input",
isHideByDefaultChecked = false,
),
@@ -110,7 +110,7 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.NoteChange("input"))
viewModel.trySendAction(AddSendAction.NoteChange("input"))
assertEquals(DEFAULT_STATE.copy(noteInput = "input"), awaitItem())
}
}
@@ -120,7 +120,7 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.PasswordChange("input"))
viewModel.trySendAction(AddSendAction.PasswordChange("input"))
assertEquals(DEFAULT_STATE.copy(passwordInput = "input"), awaitItem())
}
}
@@ -130,7 +130,7 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.DeactivateThisSendToggle(true))
viewModel.trySendAction(AddSendAction.DeactivateThisSendToggle(true))
assertEquals(DEFAULT_STATE.copy(isDeactivateChecked = true), awaitItem())
}
}
@@ -140,7 +140,7 @@ class NewSendViewModelTest : BaseViewModelTest() {
val viewModel = createViewModel()
viewModel.stateFlow.test {
assertEquals(DEFAULT_STATE, awaitItem())
viewModel.trySendAction(NewSendAction.HideMyEmailToggle(true))
viewModel.trySendAction(AddSendAction.HideMyEmailToggle(true))
assertEquals(DEFAULT_STATE.copy(isHideEmailChecked = true), awaitItem())
}
}
@@ -152,14 +152,14 @@ class NewSendViewModelTest : BaseViewModelTest() {
)
companion object {
private val DEFAULT_STATE = NewSendState(
private val DEFAULT_STATE = AddSendState(
name = "",
maxAccessCount = null,
passwordInput = "",
noteInput = "",
isHideEmailChecked = false,
isDeactivateChecked = false,
selectedType = NewSendState.SendType.Text(
selectedType = AddSendState.SendType.Text(
input = "",
isHideByDefaultChecked = false,
),