Skip to content

Commit 0301242

Browse files
committed
Fix tests
1 parent d4f0c34 commit 0301242

File tree

2 files changed

+7
-55
lines changed

2 files changed

+7
-55
lines changed

android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt

-23
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,6 @@ class VersionNotificationUseCaseTest {
4949
versionNotificationUseCase().test { assertTrue { awaitItem().isEmpty() } }
5050
}
5151

52-
@Test
53-
fun `when a new version is available use case should emit UpdateAvailable with new version`() =
54-
runTest {
55-
versionNotificationUseCase().test {
56-
// Arrange, Act
57-
val upgradeVersionInfo =
58-
VersionInfo(
59-
currentVersion = "1.0",
60-
isSupported = true,
61-
suggestedUpgradeVersion = "1.1"
62-
)
63-
awaitItem()
64-
versionInfo.value = upgradeVersionInfo
65-
66-
// Assert
67-
assertEquals(
68-
awaitItem(),
69-
listOf(InAppNotification.UpdateAvailable(upgradeVersionInfo))
70-
)
71-
}
72-
}
73-
7452
@Test
7553
fun `when an unsupported version use case should emit UnsupportedVersion notification`() =
7654
runTest {
@@ -80,7 +58,6 @@ class VersionNotificationUseCaseTest {
8058
VersionInfo(
8159
currentVersion = "1.0",
8260
isSupported = false,
83-
suggestedUpgradeVersion = null
8461
)
8562
awaitItem()
8663
versionInfo.value = upgradeVersionInfo

android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt

+7-32
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ class SettingsViewModelTest {
2626
private val mockAppVersionInfoRepository: AppVersionInfoRepository = mockk()
2727

2828
private val versionInfo =
29-
MutableStateFlow(
30-
VersionInfo(currentVersion = "", isSupported = false, suggestedUpgradeVersion = null)
31-
)
29+
MutableStateFlow(VersionInfo(currentVersion = "", isSupported = false))
3230

3331
private lateinit var viewModel: SettingsViewModel
3432

@@ -60,53 +58,30 @@ class SettingsViewModelTest {
6058
}
6159

6260
@Test
63-
fun `when AppVersionInfoCache returns isOutdated false uiState should return isUpdateAvailable false`() =
61+
fun `when AppVersionInfoRepository returns isSupported true uiState should return isSupportedVersion true`() =
6462
runTest {
6563
// Arrange
66-
val versionInfoTestItem =
67-
VersionInfo(
68-
currentVersion = "1.0",
69-
isSupported = true,
70-
suggestedUpgradeVersion = null
71-
)
72-
73-
// Act, Assert
74-
viewModel.uiState.test {
75-
awaitItem() // Wait for initial value
76-
77-
versionInfo.value = versionInfoTestItem
78-
val result = awaitItem()
79-
assertEquals(false, result.isUpdateAvailable)
80-
}
81-
}
82-
83-
@Test
84-
fun `when AppVersionInfoCache returns isSupported false uiState should return isUpdateAvailable true`() =
85-
runTest {
86-
// Arrange
87-
val versionInfoTestItem =
88-
VersionInfo(currentVersion = "", isSupported = false, suggestedUpgradeVersion = "")
64+
val versionInfoTestItem = VersionInfo(currentVersion = "", isSupported = true)
8965
versionInfo.value = versionInfoTestItem
9066

9167
// Act, Assert
9268
viewModel.uiState.test {
9369
val result = awaitItem()
94-
assertEquals(true, result.isUpdateAvailable)
70+
assertEquals(true, result.isSupportedVersion)
9571
}
9672
}
9773

9874
@Test
99-
fun `when AppVersionInfoCache returns isOutdated true uiState should return isUpdateAvailable true`() =
75+
fun `when AppVersionInfoRepository returns isSupported false uiState should return isSupportedVersion false`() =
10076
runTest {
10177
// Arrange
102-
val versionInfoTestItem =
103-
VersionInfo(currentVersion = "", isSupported = true, suggestedUpgradeVersion = "")
78+
val versionInfoTestItem = VersionInfo(currentVersion = "", isSupported = false)
10479
versionInfo.value = versionInfoTestItem
10580

10681
// Act, Assert
10782
viewModel.uiState.test {
10883
val result = awaitItem()
109-
assertEquals(true, result.isUpdateAvailable)
84+
assertEquals(false, result.isSupportedVersion)
11085
}
11186
}
11287
}

0 commit comments

Comments
 (0)