Merge branch 'fix-account-exipry-notification-test-fail-due-to-time-zone-change-droid-2261'ios-min-15

4 files changed, 8 insertions, 8 deletions

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/AccountExpiryInAppNotificationUseCaseTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/AccountExpiryInAppNotificationUseCaseTest.kt
index 4de9f38b53..6d1a00a30e 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/AccountExpiryInAppNotificationUseCaseTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/AccountExpiryInAppNotificationUseCaseTest.kt
@@ -75,7 +75,7 @@ class AccountExpiryInAppNotificationUseCaseTest {
     fun `account that expires after the threshold should not emit a notification`() = runTest {
         accountExpiryInAppNotificationUseCase().test {
             assertNull(awaitItem())
-            setExpiry(notificationThreshold.plusDays(1))
+            setExpiry(notificationThreshold.plusHours(24))
             expectNoEvents()
         }
     }
@@ -124,7 +124,7 @@ class AccountExpiryInAppNotificationUseCaseTest {
 
             // Make sure we reset the list of notifications emitted when new time is added
             setExpiry(
-                ZonedDateTime.now().plus(ACCOUNT_EXPIRY_CLOSE_TO_EXPIRY_THRESHOLD).plusDays(1)
+                ZonedDateTime.now().plus(ACCOUNT_EXPIRY_CLOSE_TO_EXPIRY_THRESHOLD).plusHours(24)
             )
             assertNull(expectMostRecentItem())
         }
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCaseTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCaseTest.kt
index e494aa41b7..262ec32ec8 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCaseTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/OutOfTimeUseCaseTest.kt
@@ -88,7 +88,7 @@ class OutOfTimeUseCaseTest {
     fun `tunnel is connected should emit false`() =
         scope.runTest {
             // Arrange
-            val expiredAccountExpiry = AccountData.mock(ZonedDateTime.now().plusDays(1))
+            val expiredAccountExpiry = AccountData.mock(ZonedDateTime.now().plusHours(24))
             val tunnelStateChanges =
                 listOf(
                     TunnelState.Disconnected(),
@@ -129,7 +129,7 @@ class OutOfTimeUseCaseTest {
     fun `account expiry that has not expired should emit false`() =
         scope.runTest {
             // Arrange
-            val notExpiredAccountExpiry = AccountData.mock(ZonedDateTime.now().plusDays(1))
+            val notExpiredAccountExpiry = AccountData.mock(ZonedDateTime.now().plusHours(24))
 
             // Act, Assert
             outOfTimeUseCase.isOutOfTime.test {
@@ -167,7 +167,7 @@ class OutOfTimeUseCaseTest {
         scope.runTest {
             // Arrange
             val initialAccountExpiry = AccountData.mock(ZonedDateTime.now().plusSeconds(100))
-            val updatedExpiry = AccountData.mock(initialAccountExpiry.expiryDate.plusDays(30))
+            val updatedExpiry = AccountData.mock(initialAccountExpiry.expiryDate.plusHours(30 * 24))
 
             // Act, Assert
             outOfTimeUseCase.isOutOfTime.test {
@@ -195,7 +195,7 @@ class OutOfTimeUseCaseTest {
         scope.runTest {
             // Arrange
             val initialAccountExpiry = AccountData.mock(ZonedDateTime.now().plusSeconds(100))
-            val updatedExpiry = AccountData.mock(initialAccountExpiry.expiryDate.plusDays(30))
+            val updatedExpiry = AccountData.mock(initialAccountExpiry.expiryDate.plusHours(30 * 24))
             // Act, Assert
             outOfTimeUseCase.isOutOfTime.test {
                 // Initial event
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
index 90ec8f1c8c..55c19b6952 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/LoginViewModelTest.kt
@@ -158,7 +158,7 @@ class LoginViewModelTest {
             val sideEffects = loginViewModel.uiSideEffect.testIn(backgroundScope)
             coEvery { mockedAccountRepository.login(any()) } returns Unit.right()
             coEvery { mockedAccountRepository.accountData } returns
-                MutableStateFlow(AccountData.mock(ZonedDateTime.now().plusDays(3)))
+                MutableStateFlow(AccountData.mock(ZonedDateTime.now().plusHours(3 * 24)))
 
             // Act, Assert
             uiStates.skipDefaultItem()
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
index f753a2e613..f12818ca18 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt
@@ -150,7 +150,7 @@ class WelcomeViewModelTest {
     @Test
     fun `when user has added time then uiSideEffect should emit OpenConnectScreen`() = runTest {
         // Arrange
-        accountExpiryStateFlow.emit(AccountData.mock(ZonedDateTime.now().plusDays(1)))
+        accountExpiryStateFlow.emit(AccountData.mock(ZonedDateTime.now().plusHours(24)))
 
         // Act, Assert
         viewModel.uiSideEffect.test {