diff options
Diffstat (limited to 'android/app/src/androidTest')
3 files changed, 8 insertions, 18 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt index 48161a4690..b8165f80fc 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ChangelogDialogTest.kt @@ -4,16 +4,12 @@ import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import io.mockk.MockKAnnotations -import io.mockk.Runs -import io.mockk.every import io.mockk.impl.annotations.MockK -import io.mockk.just -import io.mockk.verify import net.mullvad.mullvadvpn.compose.createEdgeToEdgeComposeExtension import net.mullvad.mullvadvpn.compose.dialog.ChangelogDialog import net.mullvad.mullvadvpn.compose.setContentWithTheme -import net.mullvad.mullvadvpn.viewmodel.Changelog -import net.mullvad.mullvadvpn.viewmodel.ChangelogViewModel +import net.mullvad.mullvadvpn.viewmodel.AppInfoViewModel +import net.mullvad.mullvadvpn.viewmodel.ChangelogUiState import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension @@ -22,7 +18,7 @@ import org.junit.jupiter.api.extension.RegisterExtension class ChangelogDialogTest { @JvmField @RegisterExtension val composeExtension = createEdgeToEdgeComposeExtension() - @MockK lateinit var mockedViewModel: ChangelogViewModel + @MockK lateinit var mockedViewModel: AppInfoViewModel @BeforeEach fun setup() { @@ -33,13 +29,10 @@ class ChangelogDialogTest { fun testShowChangeLogWhenNeeded() = composeExtension.use { // Arrange - // Arrange - every { mockedViewModel.markChangelogAsRead() } just Runs - setContentWithTheme { ChangelogDialog( - Changelog(changes = listOf(CHANGELOG_ITEM), version = CHANGELOG_VERSION), - onDismiss = { mockedViewModel.markChangelogAsRead() }, + ChangelogUiState(changes = listOf(CHANGELOG_ITEM), version = CHANGELOG_VERSION), + onDismiss = {}, ) } @@ -48,9 +41,6 @@ class ChangelogDialogTest { // perform click on Got It button to check if dismiss occur onNodeWithText(CHANGELOG_BUTTON_TEXT).performClick() - - // Assert - verify { mockedViewModel.markChangelogAsRead() } } companion object { diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt index f55e07c1cf..05862a5bc4 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt @@ -594,7 +594,7 @@ class ConnectScreenTest { val versionInfo = VersionInfo(isSupported = false, currentVersion = "") setContentWithTheme { ConnectScreen( - onUpdateVersionClick = mockedClickHandler, + onOpenAppListing = mockedClickHandler, state = ConnectUiState( location = null, diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt index f108efab8e..2509c7be8d 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt @@ -39,7 +39,7 @@ class SettingsScreenTest { // Assert onNodeWithText("VPN settings").assertExists() onNodeWithText("Split tunneling").assertExists() - onNodeWithText("App version").assertExists() + onNodeWithText("App info").assertExists() onNodeWithText("API access").assertExists() } @@ -62,7 +62,7 @@ class SettingsScreenTest { // Assert onNodeWithText("VPN settings").assertDoesNotExist() onNodeWithText("Split tunneling").assertDoesNotExist() - onNodeWithText("App version").assertExists() + onNodeWithText("App info").assertExists() onNodeWithText("API access").assertExists() } } |