Merge branch 'develop' of https://github.com/VictorKabata/DarajaMulti…

…platform into develop
VictorKabata · Aug 16, 2024 · 8822d8a · 8822d8a
2 parents f4e25af + 20a897b
commit 8822d8a
Show file tree

Hide file tree

Showing 5 changed files with 189 additions and 139 deletions.
diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts
@@ -85,6 +85,7 @@ kotlin {
             implementation(libs.kotlinX.coroutines.test)
             implementation(libs.mockative)
             implementation(libs.ktor.mock)
+            implementation(libs.assertK)
         }
 
         androidMain.dependencies {

diff --git a/daraja/src/commonTest/kotlin/com/vickbt/darajakmp/network/DarajaApiServiceTest.kt b/daraja/src/commonTest/kotlin/com/vickbt/darajakmp/network/DarajaApiServiceTest.kt
@@ -16,6 +16,8 @@
 
 package com.vickbt.darajakmp.network
 
+import assertk.assertThat
+import assertk.assertions.isEqualTo
 import com.vickbt.darajakmp.network.models.DarajaToken
 import com.vickbt.darajakmp.network.models.DarajaTransactionRequest
 import com.vickbt.darajakmp.network.models.DarajaTransactionResponse
@@ -29,8 +31,6 @@ import kotlinx.coroutines.test.runTest
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
 class DarajaApiServiceTest {
@@ -99,10 +99,7 @@ class DarajaApiServiceTest {
             val actualResult = darajaApiService.fetchAccessToken()
 
             // then
-            assertEquals(
-                expected = DarajaResult.Success(darajaToken),
-                actual = actualResult,
-            )
+            assertThat(actualResult).isEqualTo(DarajaResult.Success(darajaToken))
         }
 
     @Test
@@ -116,8 +113,7 @@ class DarajaApiServiceTest {
             // then
             val cachedToken = mockInMemoryCache.get(1)
 
-            assertNotNull(cachedToken)
-            assertEquals(expected = darajaToken, actual = cachedToken)
+            assertThat(darajaToken).isEqualTo(cachedToken)
         }
 
     @Test
@@ -140,8 +136,8 @@ class DarajaApiServiceTest {
                 )
 
             // then
-            assertEquals(expected = expectedResult, actual = actualResult)
-            assertNotNull(mockInMemoryCache.get(1))
+            assertThat(expectedResult).isEqualTo(actualResult)
+            assertThat(mockInMemoryCache.get(1)).isEqualTo(darajaToken)
         }
 
     @Test
@@ -162,6 +158,6 @@ class DarajaApiServiceTest {
                     ),
                 )
 
-            assertEquals(expected = expectedResult, actual = actualResult)
+            assertThat(expectedResult).isEqualTo(actualResult)
         }
 }
diff --git a/daraja/src/commonTest/kotlin/com/vickbt/darajakmp/utils/DarajaResultTest.kt b/daraja/src/commonTest/kotlin/com/vickbt/darajakmp/utils/DarajaResultTest.kt
@@ -16,10 +16,18 @@
 
 package com.vickbt.darajakmp.utils
 
+import assertk.all
+import assertk.assertThat
+import assertk.assertions.hasMessage
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import assertk.assertions.isSameInstanceAs
+import assertk.assertions.prop
 import com.vickbt.darajakmp.network.models.DarajaException
+import com.vickbt.darajakmp.utils.DarajaResult.Success
+import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
 class DarajaResultTest {
@@ -31,94 +39,110 @@ class DarajaResultTest {
         )
 
     @Test
-    fun darajaResult_getOrNull_returns_data_on_success() {
-        val result = DarajaResult.Success(data = "Success").getOrNull()
+    fun `darajaResult getOrNull returns data on success`() =
+        runTest {
+            val result = Success(data = "Success").getOrNull()
 
-        assertNotNull(result)
-        assertEquals(expected = "Success", actual = result)
-    }
+            assertThat(result).isEqualTo("Success")
+        }
 
     @Test
-    fun darajaResult_getOrNull_returns_null_on_error() {
-        val result = DarajaResult.Failure(exception = darajaException).getOrNull()
+    fun `darajaResult getOrNull returns null on error`() =
+        runTest {
+            val result = DarajaResult.Failure(exception = darajaException).getOrNull()
 
-        assertNull(result)
-        assertEquals(expected = null, actual = result)
-    }
+            assertThat(result).isEqualTo(null)
+        }
 
     @Test
-    fun darajaResult_throwOnFailure_returns_exception_on_error() {
-        val result = DarajaResult.Failure(exception = darajaException).throwOnFailure()
-
-        assertNotNull(result)
-        assertEquals(expected = darajaException, actual = result)
-    }
+    fun `darajaResult throwOnFailure returns exception on error`() =
+        runTest {
+            val result = DarajaResult.Failure(exception = darajaException).throwOnFailure()
+
+            assertThat(result).all {
+                hasMessage(darajaException.errorMessage)
+                isSameInstanceAs(darajaException)
+            }
+        }
 
     @Test
-    fun darajaResult_getOrThrow_returns_data_on_success() {
-        val result = DarajaResult.Success("Success").getOrThrow()
+    fun `darajaResult getOrThrow returns data on success`() =
+        runTest {
+            val result = Success("Success").getOrThrow()
 
-        assertNotNull(result)
-        assertEquals(expected = "Success", actual = result)
-    }
+            assertThat(result).isEqualTo("Success")
+        }
 
     @Test
-    fun darajaResult_onSuccess_returns_data_on_success() {
-        val result = DarajaResult.Success(data = "Success")
-
-        result.onSuccess {
-            assertNotNull(it)
-            assertEquals(expected = it, actual = "Success")
+    fun `darajaResult onSuccess returns data on success`() =
+        runTest {
+            val result = Success(data = "Success")
+
+            result.onSuccess {
+                assertThat(it).isEqualTo("Success")
+            }.onFailure {
+                assertThat(it).all {
+                    prop(DarajaException::errorMessage).isNotNull()
+                    isSameInstanceAs(DarajaException::errorMessage)
+                }
+            }
         }
-    }
 
     @Test
-    fun darajaResult_onSuccess_returns_null_on_error() {
-        val result = DarajaResult.Failure(darajaException)
-
-        result.onSuccess {
-            assertNull(it)
+    fun `darajaResult onSuccess returns null on error`() =
+        runTest {
+            val result = DarajaResult.Failure(darajaException)
+
+            result.onSuccess {
+                assertNull(it)
+            }.onFailure {
+                assertThat(it.errorMessage).isEqualTo("Invalid Authentication passed")
+            }
         }
-    }
 
     @Test
-    fun darajaResult_onFailure_returns_null_on_success() {
-        val result = DarajaResult.Success(data = "Success")
+    fun `darajaResult onFailure returns null on success`() =
+        runTest {
+            val result = Success(data = "Success")
 
-        result.onFailure {
-            assertNull(it)
+            result.onFailure {
+                assertThat(it.errorMessage).isEqualTo("Invalid Authentication passed")
+            }
         }
-    }
 
     @Test
-    fun darajaResult_onFailure_returns_exception_on_error() {
-        val result = DarajaResult.Failure(darajaException)
-
-        result.onFailure {
-            assertNotNull(it)
-            assertEquals(expected = it, actual = darajaException)
+    fun `darajaResult onFailure returns exception on error`() =
+        runTest {
+            val result = DarajaResult.Failure(darajaException)
+
+            result.onFailure {
+                assertThat(it).all {
+                    prop(DarajaException::errorMessage).isEqualTo("Invalid Authentication passed")
+                }
+            }
         }
-    }
 
     @Test
-    fun darajaResult_onSuccess_onFailure_on_success() {
-        val result = DarajaResult.Success(data = "Success")
-
-        result.onSuccess {
-            assertNotNull(it)
-            assertEquals(expected = it, actual = "Success")
-        }.onFailure {
-            assertNull(it)
+    fun `darajaResult onSuccess does not trigger onFailure on success`() =
+        runTest {
+            val result = Success(data = "Success")
+
+            result.onSuccess {
+                assertThat(it).isEqualTo("Success")
+            }.onFailure {
+                assertThat(it).isNull()
+            }
         }
-    }
 
     @Test
-    fun darajaResult_onSuccess_onFailure_on_error() {
-        val result = DarajaResult.Failure(darajaException)
-
-        result.onFailure {
-            assertNotNull(it)
-            assertEquals(expected = it, actual = darajaException)
+    fun `darajaResult onSuccess returns onFailure on error`() =
+        runTest {
+            val result = DarajaResult.Failure(darajaException)
+
+            result.onFailure {
+                assertThat(it).all {
+                    prop(DarajaException::errorMessage).isEqualTo("Invalid Authentication passed")
+                }
+            }
         }
-    }
 }