chore(security): use kotest instead of old version called kotlintest

SUITEDEV-36111 Co-authored-by: Co-authored-by: LasOri <[email protected]> Co-authored-by: Co-authored-by: Andras Sarro <[email protected]>
emartech · Jul 11, 2024 · d99175e · d99175e
1 parent afb7adf
commit d99175e
Show file tree

Hide file tree

Showing 29 changed files with 42 additions and 42 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -56,7 +56,7 @@ android {
 dependencies {
     ext.emarsys_sdk_version = '3.7.5'
     ext.junit_version = '4.13.2'
-    ext.kotlintest_version = '3.4.2'
+    ext.kotest_version = '5.9.1'
     ext.mockk_version = '1.13.9'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -65,7 +65,7 @@ dependencies {
     api "com.emarsys:emarsys-huawei:$emarsys_sdk_version"
 
     testImplementation "junit:junit:$junit_version"
-    testImplementation "io.kotlintest:kotlintest-runner-junit4:$kotlintest_version"
+    testImplementation "io.kotest:kotest-runner-junit4:$kotest_version"
     testImplementation "io.mockk:mockk:$mockk_version"
     testImplementation 'org.json:json:20240303'
 }
diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/EmarsysCommandFactoryTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/EmarsysCommandFactoryTest.kt
@@ -17,7 +17,7 @@ import com.emarsys.emarsys_sdk.command.mobileengage.push.SetPushTokenCommand
 import com.emarsys.emarsys_sdk.command.predict.*
 import com.emarsys.emarsys_sdk.command.setup.InitializeCommand
 import com.emarsys.emarsys_sdk.command.setup.SetupCommand
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.mockk
 import org.junit.Before
 import org.junit.Test

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/ApplicationCodeCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/ApplicationCodeCommandTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.command.config
 
 import com.emarsys.Emarsys
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/ContactFieldIdCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/ContactFieldIdCommandTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.command.config
 
 import com.emarsys.Emarsys
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/HardwareIdCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/HardwareIdCommandTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.command.config
 
 import com.emarsys.Emarsys
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/LanguageCodeCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/LanguageCodeCommandTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.command.config
 
 import com.emarsys.Emarsys
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/MerchantIdCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/MerchantIdCommandTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.command.config
 
 import com.emarsys.Emarsys
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic

diff --git a/...src/test/kotlin/com/emarsys/emarsys_sdk/command/config/NotificationSettingsCommandTest.kt b/...src/test/kotlin/com/emarsys/emarsys_sdk/command/config/NotificationSettingsCommandTest.kt
@@ -3,7 +3,7 @@ package com.emarsys.emarsys_sdk.command.config
 import com.emarsys.Emarsys
 import com.emarsys.core.api.notification.ChannelSettings
 import com.emarsys.core.api.notification.NotificationSettings
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.*
 import org.junit.After
 import org.junit.Before

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/SdkVersionCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/config/SdkVersionCommandTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.command.config
 
 import com.emarsys.Emarsys
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic

diff --git a/...com/emarsys/emarsys_sdk/command/geofence/GeofenceInitialEnterTriggerEnabledCommandTest.kt b/...com/emarsys/emarsys_sdk/command/geofence/GeofenceInitialEnterTriggerEnabledCommandTest.kt
@@ -3,8 +3,8 @@ package com.emarsys.emarsys_sdk.command.geofence
 import com.emarsys.Emarsys
 import com.emarsys.emarsys_sdk.command.ResultCallback
 import com.emarsys.geofence.GeofenceApi
-import io.kotlintest.shouldBe
-import io.kotlintest.shouldNotBe
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just

diff --git a/.../src/test/kotlin/com/emarsys/emarsys_sdk/command/geofence/GeofenceIsEnabledCommandTest.kt b/.../src/test/kotlin/com/emarsys/emarsys_sdk/command/geofence/GeofenceIsEnabledCommandTest.kt
@@ -2,7 +2,7 @@ package com.emarsys.emarsys_sdk.command.geofence
 
 import com.emarsys.Emarsys
 import com.emarsys.geofence.GeofenceApi
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.*
 import org.junit.After
 import org.junit.Before

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/inapp/InAppIsPausedCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/inapp/InAppIsPausedCommandTest.kt
@@ -2,7 +2,7 @@ package com.emarsys.emarsys_sdk.command.inapp
 
 import com.emarsys.Emarsys
 import com.emarsys.inapp.InAppApi
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.*
 import org.junit.After
 import org.junit.Before

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/inapp/InAppPauseCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/inapp/InAppPauseCommandTest.kt
@@ -2,7 +2,7 @@ package com.emarsys.emarsys_sdk.command.inapp
 
 import com.emarsys.Emarsys
 import com.emarsys.inapp.InAppApi
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.*
 import org.junit.After
 import org.junit.Before

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/inapp/InAppResumeCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/inapp/InAppResumeCommandTest.kt
@@ -2,7 +2,7 @@ package com.emarsys.emarsys_sdk.command.inapp
 
 import com.emarsys.Emarsys
 import com.emarsys.inapp.InAppApi
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.*
 import org.junit.After
 import org.junit.Before

diff --git a/...est/kotlin/com/emarsys/emarsys_sdk/command/mobileengage/inbox/FetchMessagesCommandTest.kt b/...est/kotlin/com/emarsys/emarsys_sdk/command/mobileengage/inbox/FetchMessagesCommandTest.kt
@@ -5,7 +5,7 @@ import com.emarsys.core.api.result.Try
 import com.emarsys.emarsys_sdk.mapper.InboxResultMapper
 import com.emarsys.mobileengage.api.inbox.InboxResult
 import com.emarsys.mobileengage.api.inbox.Message
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.*
 import org.junit.After
 import org.junit.Before

diff --git a/.../test/kotlin/com/emarsys/emarsys_sdk/command/mobileengage/push/GetPushTokenCommandTest.kt b/.../test/kotlin/com/emarsys/emarsys_sdk/command/mobileengage/push/GetPushTokenCommandTest.kt
@@ -2,16 +2,14 @@ package com.emarsys.emarsys_sdk.command.mobileengage.push
 
 import com.emarsys.Emarsys
 import com.emarsys.push.Push
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.unmockkStatic
-import io.mockk.verify
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
-import org.junit.jupiter.api.Assertions.*
 
 internal class GetPushTokenCommandTest {
     private companion object {

diff --git a/...kotlin/com/emarsys/emarsys_sdk/command/mobileengage/push/PushSendingEnabledCommandTest.kt b/...kotlin/com/emarsys/emarsys_sdk/command/mobileengage/push/PushSendingEnabledCommandTest.kt
@@ -5,8 +5,8 @@ import com.emarsys.core.api.result.CompletionListener
 import com.emarsys.emarsys_sdk.command.ResultCallback
 import com.emarsys.emarsys_sdk.storage.PushTokenStorage
 import com.emarsys.push.PushApi
-import io.kotlintest.shouldBe
-import io.kotlintest.shouldNotBe
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just

diff --git a/.../emarsys/emarsys_sdk/command/mobileengage/push/RegisterNotificationChannelsCommandTest.kt b/.../emarsys/emarsys_sdk/command/mobileengage/push/RegisterNotificationChannelsCommandTest.kt
@@ -7,8 +7,8 @@ import android.content.Context
 import com.emarsys.core.util.AndroidVersionUtils
 import com.emarsys.emarsys_sdk.command.ResultCallback
 import com.emarsys.emarsys_sdk.notification.NotificationChannelFactory
-import io.kotlintest.shouldBe
-import io.kotlintest.shouldNotBe
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.shouldNotBe
 import io.mockk.called
 import io.mockk.every
 import io.mockk.mockk

diff --git a/...d/src/test/kotlin/com/emarsys/emarsys_sdk/command/predict/RecommendProductsCommandTest.kt b/...d/src/test/kotlin/com/emarsys/emarsys_sdk/command/predict/RecommendProductsCommandTest.kt
@@ -9,7 +9,7 @@ import com.emarsys.emarsys_sdk.mapper.RecommendationFilterListMapper
 import com.emarsys.emarsys_sdk.mapper.RecommendationLogicMapper
 import com.emarsys.predict.Predict
 import com.emarsys.predict.api.model.*
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.*
 import org.junit.After
 

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/predict/TrackPurchaseCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/predict/TrackPurchaseCommandTest.kt
@@ -5,11 +5,16 @@ import com.emarsys.emarsys_sdk.command.EmarsysCommand
 import com.emarsys.emarsys_sdk.command.ResultCallback
 import com.emarsys.predict.api.model.CartItem
 import com.emarsys.predict.api.model.PredictCartItem
-import io.mockk.*
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import io.mockk.verify
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
-import org.junit.jupiter.api.Assertions.*
 
 internal class TrackPurchaseCommandTest {
 

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/setup/SetupCommandTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/command/setup/SetupCommandTest.kt
@@ -16,7 +16,7 @@ import com.emarsys.emarsys_sdk.di.tearDownDependencyContainer
 import com.emarsys.emarsys_sdk.storage.PushTokenStorage
 import com.emarsys.mobileengage.api.event.EventHandler
 import com.emarsys.push.PushApi
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.Runs
 import io.mockk.clearAllMocks
 import io.mockk.every

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/GeofenceMapperTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/GeofenceMapperTest.kt
@@ -3,7 +3,7 @@ package com.emarsys.emarsys_sdk.mapper
 import com.emarsys.mobileengage.api.geofence.Geofence
 import com.emarsys.mobileengage.api.geofence.Trigger
 import com.emarsys.mobileengage.api.geofence.TriggerType
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import org.json.JSONObject
 import org.junit.Before
 import org.junit.Test

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/InboxResultMapperTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/InboxResultMapperTest.kt
@@ -3,7 +3,7 @@ package com.emarsys.emarsys_sdk.mapper
 import com.emarsys.mobileengage.api.action.*
 import com.emarsys.mobileengage.api.inbox.InboxResult
 import com.emarsys.mobileengage.api.inbox.Message
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/MapToProductMapperTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/MapToProductMapperTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.mapper
 
 import com.emarsys.predict.api.model.Product
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import org.junit.Before
 import org.junit.Test
 

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/ProductMapperTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/ProductMapperTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.mapper
 
 import com.emarsys.predict.api.model.Product
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 
 import org.junit.Before
 import org.junit.Test

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/RecommendationFilterListMapperTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/RecommendationFilterListMapperTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.mapper
 
 import com.emarsys.Emarsys
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import org.junit.Assert.*
 
 import org.junit.Before

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/RecommendationLogicMapperTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/mapper/RecommendationLogicMapperTest.kt
@@ -1,14 +1,12 @@
 package com.emarsys.emarsys_sdk.mapper
 
-import arrow.core.mapOf
-import com.emarsys.predict.api.model.CartItem
 import com.emarsys.predict.api.model.Logic
-import com.emarsys.predict.api.model.PredictCartItem
 import com.emarsys.predict.api.model.RecommendationLogic
-import io.kotlintest.shouldBe
-import io.mockk.*
+import io.kotest.matchers.shouldBe
+import io.mockk.mockk
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
 import org.junit.After
-
 import org.junit.Before
 import org.junit.Test
 

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/storage/CurrentActivityHolderTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/storage/CurrentActivityHolderTest.kt
@@ -1,11 +1,10 @@
 package com.emarsys.emarsys_sdk.storage
 
 import android.app.Activity
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.mockk
 import org.junit.Before
 import org.junit.Test
-import org.junit.jupiter.api.Assertions.*
 import java.lang.ref.WeakReference
 
 internal class CurrentActivityHolderTest {

diff --git a/android/src/test/kotlin/com/emarsys/emarsys_sdk/storage/PushTokenStorageTest.kt b/android/src/test/kotlin/com/emarsys/emarsys_sdk/storage/PushTokenStorageTest.kt
@@ -1,7 +1,7 @@
 package com.emarsys.emarsys_sdk.storage
 
 import android.content.SharedPreferences
-import io.kotlintest.shouldBe
+import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify