-
Notifications
You must be signed in to change notification settings - Fork 352
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/MaryamShaghaghi/mullvadvpn-…
…fork into filter-providers
- Loading branch information
Showing
22 changed files
with
445 additions
and
94 deletions.
There are no files selected for viewing
149 changes: 149 additions & 0 deletions
149
...p/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/RedeemVoucherDialogTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| package net.mullvad.mullvadvpn.compose.screen | ||
|
|
||
| import androidx.compose.ui.test.junit4.createComposeRule | ||
| import androidx.compose.ui.test.onNodeWithTag | ||
| import androidx.compose.ui.test.onNodeWithText | ||
| import androidx.compose.ui.test.performClick | ||
| import androidx.compose.ui.test.performTextInput | ||
| import io.mockk.mockk | ||
| import io.mockk.mockkObject | ||
| import io.mockk.verify | ||
| import net.mullvad.mullvadvpn.compose.setContentWithTheme | ||
| import net.mullvad.mullvadvpn.compose.state.VoucherDialogState | ||
| import net.mullvad.mullvadvpn.compose.state.VoucherDialogUiState | ||
| import net.mullvad.mullvadvpn.compose.test.VOUCHER_INPUT_TEST_TAG | ||
| import net.mullvad.mullvadvpn.util.VoucherRegexHelper | ||
| import org.junit.Before | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
|
|
||
| class RedeemVoucherDialogTest { | ||
| @get:Rule val composeTestRule = createComposeRule() | ||
|
|
||
| @Before | ||
| fun setup() { | ||
| mockkObject(VoucherRegexHelper) | ||
| } | ||
|
|
||
| @Test | ||
| fun testDismissDialog() { | ||
| // Arrange | ||
| val mockedClickHandler: (Boolean) -> Unit = mockk(relaxed = true) | ||
| composeTestRule.setContentWithTheme { | ||
| RedeemVoucherDialogScreen( | ||
| uiState = VoucherDialogUiState.INITIAL, | ||
| onVoucherInputChange = {}, | ||
| onRedeem = {}, | ||
| onDismiss = mockedClickHandler | ||
| ) | ||
| } | ||
|
|
||
| // Act | ||
| composeTestRule.onNodeWithText(CANCEL_BUTTON_TEXT).performClick() | ||
|
|
||
| // Assert | ||
| verify { mockedClickHandler.invoke(false) } | ||
| } | ||
|
|
||
| @Test | ||
| fun testDismissDialogAfterSuccessfulRedeem() { | ||
| // Arrange | ||
| val mockedClickHandler: (Boolean) -> Unit = mockk(relaxed = true) | ||
| composeTestRule.setContentWithTheme { | ||
| RedeemVoucherDialogScreen( | ||
| uiState = | ||
| VoucherDialogUiState(voucherViewModelState = VoucherDialogState.Success(0)), | ||
| onVoucherInputChange = {}, | ||
| onRedeem = {}, | ||
| onDismiss = mockedClickHandler | ||
| ) | ||
| } | ||
|
|
||
| // Act | ||
| composeTestRule.onNodeWithText(GOT_IT_BUTTON_TEXT).performClick() | ||
|
|
||
| // Assert | ||
| verify { mockedClickHandler.invoke(true) } | ||
| } | ||
|
|
||
| @Test | ||
| fun testInsertVoucher() { | ||
| // Arrange | ||
| val mockedClickHandler: (String) -> Unit = mockk(relaxed = true) | ||
| composeTestRule.setContentWithTheme { | ||
| RedeemVoucherDialogScreen( | ||
| uiState = VoucherDialogUiState(), | ||
| onVoucherInputChange = mockedClickHandler, | ||
| onRedeem = {}, | ||
| onDismiss = {} | ||
| ) | ||
| } | ||
|
|
||
| // Act | ||
| composeTestRule.onNodeWithTag(VOUCHER_INPUT_TEST_TAG).performTextInput(DUMMY_VOUCHER) | ||
|
|
||
| // Assert | ||
| verify { mockedClickHandler.invoke(DUMMY_VOUCHER) } | ||
| } | ||
|
|
||
| @Test | ||
| fun testVerifyingState() { | ||
| // Arrange | ||
| composeTestRule.setContentWithTheme { | ||
| RedeemVoucherDialogScreen( | ||
| uiState = | ||
| VoucherDialogUiState(voucherViewModelState = VoucherDialogState.Verifying), | ||
| onVoucherInputChange = {}, | ||
| onRedeem = {}, | ||
| onDismiss = {} | ||
| ) | ||
| } | ||
|
|
||
| // Assert | ||
| composeTestRule.onNodeWithText("Verifying voucher…").assertExists() | ||
| } | ||
|
|
||
| @Test | ||
| fun testSuccessState() { | ||
| // Arrange | ||
| composeTestRule.setContentWithTheme { | ||
| RedeemVoucherDialogScreen( | ||
| uiState = | ||
| VoucherDialogUiState(voucherViewModelState = VoucherDialogState.Success(0)), | ||
| onVoucherInputChange = {}, | ||
| onRedeem = {}, | ||
| onDismiss = {} | ||
| ) | ||
| } | ||
|
|
||
| // Assert | ||
| composeTestRule.onNodeWithText("Voucher was successfully redeemed.").assertExists() | ||
| } | ||
|
|
||
| @Test | ||
| fun testErrorState() { | ||
| // Arrange | ||
| composeTestRule.setContentWithTheme { | ||
| RedeemVoucherDialogScreen( | ||
| uiState = | ||
| VoucherDialogUiState( | ||
| voucherViewModelState = VoucherDialogState.Error(ERROR_MESSAGE) | ||
| ), | ||
| onVoucherInputChange = {}, | ||
| onRedeem = {}, | ||
| onDismiss = {} | ||
| ) | ||
| } | ||
|
|
||
| // Assert | ||
| composeTestRule.onNodeWithText(ERROR_MESSAGE).assertExists() | ||
| } | ||
|
|
||
| companion object { | ||
| private const val REDEEM_BUTTON_TEXT = "Redeem" | ||
| private const val CANCEL_BUTTON_TEXT = "Cancel" | ||
| private const val GOT_IT_BUTTON_TEXT = "Got it!" | ||
| private const val DUMMY_VOUCHER = "DUMMY____VOUCHER" | ||
| private const val ERROR_MESSAGE = "error_message" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/textfield/GroupedTextField.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.