From 5a59129b176b39f9425e266925b71b1a2f956d5d Mon Sep 17 00:00:00 2001 From: Jonatan Rhodin Date: Thu, 15 Aug 2024 10:35:33 +0200 Subject: [PATCH] Fix unit tests --- ...iewModelTest.kt => MullvadAppViewModelTest.kt} | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) rename android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/{ChangelogViewModelTest.kt => MullvadAppViewModelTest.kt} (81%) diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/MullvadAppViewModelTest.kt similarity index 81% rename from android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt rename to android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/MullvadAppViewModelTest.kt index 7888f02a4d18..8e5af38a7c16 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ChangelogViewModelTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/MullvadAppViewModelTest.kt @@ -11,6 +11,7 @@ import kotlin.test.assertEquals import kotlinx.coroutines.test.runTest import net.mullvad.mullvadvpn.lib.common.test.TestCoroutineRule import net.mullvad.mullvadvpn.lib.model.BuildVersion +import net.mullvad.mullvadvpn.lib.shared.ConnectionProxy import net.mullvad.mullvadvpn.repository.ChangelogRepository import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach @@ -18,11 +19,12 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @ExtendWith(TestCoroutineRule::class) -class ChangelogViewModelTest { +class MullvadAppViewModelTest { @MockK private lateinit var mockedChangelogRepository: ChangelogRepository + @MockK private lateinit var connectionProxy: ConnectionProxy - private lateinit var viewModel: ChangelogViewModel + private lateinit var viewModel: MullvadAppViewModel private val buildVersion = BuildVersion("1.0", 10) @@ -43,7 +45,8 @@ class ChangelogViewModelTest { // Arrange every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns buildVersion.code - viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersion, false) + viewModel = + MullvadAppViewModel(mockedChangelogRepository, connectionProxy, buildVersion, false) // If we have the most up to date version code, we should not show the changelog dialog viewModel.uiSideEffect.test { expectNoEvents() } @@ -58,7 +61,8 @@ class ChangelogViewModelTest { version every { mockedChangelogRepository.getLastVersionChanges() } returns changes - viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersion, false) + viewModel = + MullvadAppViewModel(mockedChangelogRepository, connectionProxy, buildVersion, false) // Given a new version with a change log we should return it viewModel.uiSideEffect.test { assertEquals(awaitItem(), Changelog(version = buildVersion.name, changes = changes)) @@ -71,7 +75,8 @@ class ChangelogViewModelTest { every { mockedChangelogRepository.getVersionCodeOfMostRecentChangelogShowed() } returns -1 every { mockedChangelogRepository.getLastVersionChanges() } returns emptyList() - viewModel = ChangelogViewModel(mockedChangelogRepository, buildVersion, false) + viewModel = + MullvadAppViewModel(mockedChangelogRepository, connectionProxy, buildVersion, false) // Given a new version with a change log we should not return it viewModel.uiSideEffect.test { expectNoEvents() } }