From d0e0362771ca2f0ccb384299e1aacb5e2f678e52 Mon Sep 17 00:00:00 2001 From: David Perez Date: Thu, 26 Oct 2023 16:57:59 -0500 Subject: [PATCH] Replace Kotlin assertions with JUnit assertions. (#168) --- .../datasource/network/service/AccountsServiceTest.kt | 8 +++++--- .../ui/auth/feature/landing/LandingScreenTest.kt | 3 ++- .../feature/settings/AccountSecurityScreenTest.kt | 3 ++- .../ui/platform/feature/settings/SettingsScreenTest.kt | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt index 6948eb8271..dcead6aa9b 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt @@ -10,6 +10,7 @@ import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.Json import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test import retrofit2.create @@ -33,7 +34,7 @@ class AccountsServiceTest : BaseServiceTest() { """ val response = MockResponse().setBody(json) server.enqueue(response) - assert(service.preLogin(EMAIL).isFailure) + assertTrue(service.preLogin(EMAIL).isFailure) } @Test @@ -47,7 +48,7 @@ class AccountsServiceTest : BaseServiceTest() { """ val response = MockResponse().setBody(json) server.enqueue(response) - assert(service.preLogin(EMAIL).isFailure) + assertTrue(service.preLogin(EMAIL).isFailure) } @Test @@ -61,7 +62,7 @@ class AccountsServiceTest : BaseServiceTest() { """ val response = MockResponse().setBody(json) server.enqueue(response) - assert(service.preLogin(EMAIL).isFailure) + assertTrue(service.preLogin(EMAIL).isFailure) } @Test @@ -144,6 +145,7 @@ class AccountsServiceTest : BaseServiceTest() { result.getOrThrow(), ) } + @Test fun `register failure with Error json should return Error`() = runTest { val json = """ diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt index 9f02f2b5a8..b637cbdf1c 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreenTest.kt @@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.update import org.junit.Test import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue class LandingScreenTest : BaseComposeTest() { private val resources @@ -196,7 +197,7 @@ class LandingScreenTest : BaseComposeTest() { viewModel = viewModel, ) } - assert(onNavigateToCreateAccountCalled) + assertTrue(onNavigateToCreateAccountCalled) } @Test diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/AccountSecurityScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/AccountSecurityScreenTest.kt index d83f1dfb20..fbce70f15a 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/AccountSecurityScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/AccountSecurityScreenTest.kt @@ -10,6 +10,7 @@ import io.mockk.verify import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flowOf import org.junit.Test +import org.junit.jupiter.api.Assertions.assertTrue class AccountSecurityScreenTest : BaseComposeTest() { @@ -57,6 +58,6 @@ class AccountSecurityScreenTest : BaseComposeTest() { onNavigateBack = { haveCalledNavigateBack = true }, ) } - assert(haveCalledNavigateBack) + assertTrue(haveCalledNavigateBack) } } diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreenTest.kt index 08a39731fb..22b55ff818 100644 --- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreenTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/SettingsScreenTest.kt @@ -9,6 +9,7 @@ import io.mockk.verify import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flowOf import org.junit.Test +import org.junit.jupiter.api.Assertions.assertTrue class SettingsScreenTest : BaseComposeTest() { @@ -124,6 +125,6 @@ class SettingsScreenTest : BaseComposeTest() { }, ) } - assert(haveCalledNavigateToAccountSecurity) + assertTrue(haveCalledNavigateToAccountSecurity) } }