test(project): remove kotest runner annotation from tests

SDK-186 Co-authored-by: davidSchuppa <[email protected]> Co-authored-by: LasOri <[email protected]> Co-authored-by: megamegax <[email protected]> Co-authored-by: matusekma <[email protected]>
emartech · Jan 30, 2025 · 699403f · 699403f
1 parent 8e0f52f
commit 699403f
Show file tree

Hide file tree

Showing 221 changed files with 832 additions and 773 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,7 +14,6 @@ plugins {
     alias(libs.plugins.grgit)
     alias(libs.plugins.dotenv)
     alias(libs.plugins.ben.manes.versions)
-    alias(libs.plugins.android.junit5) apply false
     alias(libs.plugins.nexus.publish)
     id("maven-publish")
     id("signing")

diff --git a/common/src/androidTest/java/com/emarsys/common/feature/InnerFeatureTest.kt b/common/src/androidTest/java/com/emarsys/common/feature/InnerFeatureTest.kt
@@ -1,13 +1,12 @@
 package com.emarsys.common.feature
 
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.data.forAll
 import io.kotest.data.row
 import io.kotest.matchers.shouldBe
 import kotlinx.coroutines.runBlocking
+import org.junit.Test
 
-
-class InnerFeatureTest : AnnotationSpec() {
+class InnerFeatureTest  {
 
     @Test
     fun testValues_shouldReturnCorrectValues() {

diff --git a/core-api/src/androidTest/java/com/emarsys/core/api/ApiTest.kt b/core-api/src/androidTest/java/com/emarsys/core/api/ApiTest.kt
@@ -1,11 +1,9 @@
 package com.emarsys.core.api
 
 
-import com.emarsys.testUtil.AnnotationSpec
-
-
-class ApiTest : AnnotationSpec() {
+import org.junit.Test
 
+class ApiTest  {
 
     @Test
     fun test() {

diff --git a/core/src/androidTest/java/com/emarsys/core/DefaultCoreCompletionHandlerTest.kt b/core/src/androidTest/java/com/emarsys/core/DefaultCoreCompletionHandlerTest.kt
@@ -4,15 +4,15 @@ import com.emarsys.core.api.ResponseErrorException
 import com.emarsys.core.api.result.CompletionListener
 import com.emarsys.core.request.model.RequestModel
 import com.emarsys.core.response.ResponseModel
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.matchers.shouldBe
 import io.mockk.confirmVerified
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.spyk
 import io.mockk.verify
+import org.junit.Before
+import org.junit.Test
 
-class DefaultCoreCompletionHandlerTest : AnnotationSpec() {
+class DefaultCoreCompletionHandlerTest  {
 
     companion object {
         const val STATUS_CODE = 500
@@ -94,18 +94,16 @@ class DefaultCoreCompletionHandlerTest : AnnotationSpec() {
     @Test
     fun testOnSuccess_removesListener_afterCalled() {
         val listener: CompletionListener = mockk(relaxed = true)
-        val spyMap = spyk(HashMap<String, CompletionListener>().apply {
-            put(REQUEST_ID, listener)
-        })
-        val coreCompletionHandler = DefaultCoreCompletionHandler(spyMap)
+        every { mockMap[REQUEST_ID] } returns listener
+        val coreCompletionHandler = DefaultCoreCompletionHandler(mockMap)
 
         coreCompletionHandler.onSuccess(REQUEST_ID, createAnyResponseModel())
         coreCompletionHandler.onSuccess(REQUEST_ID, createAnyResponseModel())
 
-        verify(exactly = 2) { spyMap[REQUEST_ID] }
+        verify(exactly = 2) { mockMap[REQUEST_ID] }
         verify { listener.onCompleted(null) }
-        verify { spyMap.remove(REQUEST_ID) }
-        confirmVerified(spyMap)
+        verify { mockMap.remove(REQUEST_ID) }
+        confirmVerified(mockMap)
     }
 
     @Test
@@ -133,27 +131,24 @@ class DefaultCoreCompletionHandlerTest : AnnotationSpec() {
     @Test
     fun testOnError_withException_removesListener_afterCalled() {
         val listener: CompletionListener = mockk(relaxed = true)
-        val spyMap = spyk(HashMap<String, CompletionListener>().apply {
-            put(REQUEST_ID, listener)
-        })
-        val coreCompletionHandler = DefaultCoreCompletionHandler(spyMap)
+        every { mockMap[REQUEST_ID] } returns listener
+        val coreCompletionHandler = DefaultCoreCompletionHandler(mockMap)
 
         coreCompletionHandler.onError(REQUEST_ID, responseErrorException)
         coreCompletionHandler.onError(REQUEST_ID, responseErrorException)
 
-        verify(exactly = 2) { spyMap[REQUEST_ID] }
+        verify(exactly = 2) { mockMap[REQUEST_ID] }
         verify { listener.onCompleted(responseErrorException) }
-        verify { spyMap.remove(REQUEST_ID) }
-        confirmVerified(spyMap)
+        verify { mockMap.remove(REQUEST_ID) }
+        confirmVerified(mockMap)
     }
 
     @Test
     fun testOnError_withResponseModel_callsRegisteredCompletionListener() {
         val listener: CompletionListener = mockk(relaxed = true)
-        val spyMap = spyk(HashMap<String, CompletionListener>().apply {
-            put(REQUEST_ID, listener)
-        })
-        val coreCompletionHandler = DefaultCoreCompletionHandler(spyMap)
+
+        every { mockMap[REQUEST_ID] } returns listener
+        val coreCompletionHandler = DefaultCoreCompletionHandler(mockMap)
 
         coreCompletionHandler.register(mockRequestModel, listener)
 
@@ -178,20 +173,18 @@ class DefaultCoreCompletionHandlerTest : AnnotationSpec() {
     @Test
     fun testOnError_withResponseModel_removesListener_afterCalled() {
         val listener: CompletionListener = mockk(relaxed = true)
-        val spyMap = spyk(HashMap<String, CompletionListener>().apply {
-            put(REQUEST_ID, listener)
-        })
-        val coreCompletionHandler = DefaultCoreCompletionHandler(spyMap)
+        every { mockMap[REQUEST_ID] } returns listener
+        val coreCompletionHandler = DefaultCoreCompletionHandler(mockMap)
 
         val responseModel = createResponseModel(400, "", "")
         val expectedError = responseModel.toError()
         coreCompletionHandler.onError(REQUEST_ID, responseModel)
         coreCompletionHandler.onError(REQUEST_ID, responseModel)
 
-        verify(exactly = 2) { spyMap[REQUEST_ID] }
+        verify(exactly = 2) { mockMap[REQUEST_ID] }
         verify { listener.onCompleted(expectedError) }
-        verify { spyMap.remove(REQUEST_ID) }
-        confirmVerified(spyMap)
+        verify { mockMap.remove(REQUEST_ID) }
+        confirmVerified(mockMap)
     }
 
     @Test
@@ -220,15 +213,15 @@ class DefaultCoreCompletionHandlerTest : AnnotationSpec() {
     private fun createAnyResponseModel() = createResponseModel(200, "", "")
 
     private fun createResponseModel(statusCode: Int, message: String, body: String): ResponseModel {
-        val mockResponseModel = mockk<ResponseModel>(relaxed = true)
+        val mockResponseModel: ResponseModel = mockk(relaxed = true)
         every { mockResponseModel.statusCode } returns statusCode
         every { mockResponseModel.body } returns body
         every { mockResponseModel.message } returns message
         return mockResponseModel
     }
 
     private fun createRequestModelMock(requestId: String): RequestModel {
-        val mockRequestModel = mockk<RequestModel>()
+        val mockRequestModel: RequestModel = mockk(relaxed = true)
         every { mockRequestModel.id } returns requestId
         return mockRequestModel
     }

diff --git a/core/src/androidTest/java/com/emarsys/core/DeviceInfoTest.kt b/core/src/androidTest/java/com/emarsys/core/DeviceInfoTest.kt
@@ -12,7 +12,6 @@ import com.emarsys.core.device.LanguageProvider
 import com.emarsys.core.provider.clientid.ClientIdProvider
 import com.emarsys.core.provider.version.VersionProvider
 import com.emarsys.core.util.AndroidVersionUtils
-import com.emarsys.testUtil.AnnotationSpec
 import com.emarsys.testUtil.ApplicationTestUtils.applicationDebug
 import com.emarsys.testUtil.ApplicationTestUtils.applicationRelease
 import com.emarsys.testUtil.InstrumentationRegistry.Companion.getTargetContext
@@ -24,9 +23,12 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import org.json.JSONObject
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.util.*
 
-class DeviceInfoTest : AnnotationSpec() {
+class DeviceInfoTest {
 
     companion object {
         private const val CLIENT_ID = "hwid"

diff --git a/core/src/androidTest/java/com/emarsys/core/activity/ActivityLifecycleActionRegistryTest.kt b/core/src/androidTest/java/com/emarsys/core/activity/ActivityLifecycleActionRegistryTest.kt
@@ -6,15 +6,16 @@ import com.emarsys.core.activity.ActivityLifecycleAction.ActivityLifecycle.RESUM
 import com.emarsys.core.concurrency.ConcurrentHandlerHolderFactory
 import com.emarsys.core.handler.ConcurrentHandlerHolder
 import com.emarsys.core.provider.activity.CurrentActivityProvider
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import io.mockk.verifyOrder
+import org.junit.Before
+import org.junit.Test
 import java.util.concurrent.CountDownLatch
 
-class ActivityLifecycleActionRegistryTest : AnnotationSpec() {
+class ActivityLifecycleActionRegistryTest  {
 
     private lateinit var activityLifecycleActionRegistry: ActivityLifecycleActionRegistry
     private lateinit var concurrentHandlerHolder: ConcurrentHandlerHolder

diff --git a/core/src/androidTest/java/com/emarsys/core/activity/ActivityLifecycleWatchdogTest.kt b/core/src/androidTest/java/com/emarsys/core/activity/ActivityLifecycleWatchdogTest.kt
@@ -2,7 +2,6 @@ package com.emarsys.core.activity
 
 import android.app.Activity
 import com.emarsys.getCurrentActivity
-import com.emarsys.testUtil.AnnotationSpec
 import io.mockk.coEvery
 import io.mockk.every
 import io.mockk.mockk
@@ -15,10 +14,13 @@ import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.test.setMain
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.util.concurrent.CountDownLatch
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class ActivityLifecycleWatchdogTest : AnnotationSpec() {
+class ActivityLifecycleWatchdogTest {
     private lateinit var watchdog: ActivityLifecycleWatchdog
     private lateinit var mockRegistry: ActivityLifecycleActionRegistry
     private lateinit var mockActivity: Activity

diff --git a/core/src/androidTest/java/com/emarsys/core/api/AsyncProxyTest.kt b/core/src/androidTest/java/com/emarsys/core/api/AsyncProxyTest.kt
@@ -2,17 +2,17 @@ package com.emarsys.core.api
 
 import com.emarsys.core.concurrency.ConcurrentHandlerHolderFactory
 import com.emarsys.core.handler.ConcurrentHandlerHolder
-import com.emarsys.testUtil.AnnotationSpec
 import com.emarsys.testUtil.mockito.ThreadSpy
 import io.kotest.matchers.shouldBe
+import org.junit.Before
+import org.junit.Test
 import java.util.concurrent.Callable
 import java.util.concurrent.CountDownLatch
 
-class AsyncProxyTest : AnnotationSpec() {
+class AsyncProxyTest  {
 
     private lateinit var concurrentHandlerHolder: ConcurrentHandlerHolder
 
-
     @Before
     fun setUp() {
         concurrentHandlerHolder = ConcurrentHandlerHolderFactory.create()

diff --git a/core/src/androidTest/java/com/emarsys/core/api/LogExceptionProxyTest.kt b/core/src/androidTest/java/com/emarsys/core/api/LogExceptionProxyTest.kt
@@ -8,16 +8,17 @@ import com.emarsys.core.handler.ConcurrentHandlerHolder
 import com.emarsys.core.util.log.LogLevel
 import com.emarsys.core.util.log.Logger
 import com.emarsys.core.util.log.entry.CrashLog
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.matchers.shouldBe
 import io.mockk.mockk
 import io.mockk.slot
 import io.mockk.verify
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.CountDownLatch
 
-
-class LogExceptionProxyTest : AnnotationSpec() {
+class LogExceptionProxyTest  {
     private lateinit var mockLogger: Logger
     private lateinit var concurrentHandlerHolder: ConcurrentHandlerHolder
 

diff --git a/core/src/androidTest/java/com/emarsys/core/app/AppLifecycleObserverTest.kt b/core/src/androidTest/java/com/emarsys/core/app/AppLifecycleObserverTest.kt
@@ -8,14 +8,15 @@ import androidx.lifecycle.LifecycleRegistry
 import com.emarsys.core.concurrency.ConcurrentHandlerHolderFactory
 import com.emarsys.core.handler.ConcurrentHandlerHolder
 import com.emarsys.core.session.Session
-import com.emarsys.testUtil.AnnotationSpec
 import com.emarsys.testUtil.mockito.whenever
+import org.junit.Before
+import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import java.util.concurrent.CountDownLatch
 
-class AppLifecycleObserverTest : AnnotationSpec() {
+class AppLifecycleObserverTest  {
     private lateinit var mockSession: Session
     private lateinit var appLifecycleObserver: AppLifecycleObserver
     private lateinit var coreHandlerHolder: ConcurrentHandlerHolder

diff --git a/core/src/androidTest/java/com/emarsys/core/concurrency/ConcurrentHandlerHolderFactoryTest.kt b/core/src/androidTest/java/com/emarsys/core/concurrency/ConcurrentHandlerHolderFactoryTest.kt
@@ -1,15 +1,15 @@
 package com.emarsys.core.concurrency
 
 import com.emarsys.core.handler.ConcurrentHandlerHolder
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 
-
-class ConcurrentHandlerHolderFactoryTest : AnnotationSpec() {
+class ConcurrentHandlerHolderFactoryTest  {
     private lateinit var concurrentHandlerHolder: ConcurrentHandlerHolder
 
-
     @Before
     fun setUp() {
         concurrentHandlerHolder = ConcurrentHandlerHolderFactory.create()

diff --git a/core/src/androidTest/java/com/emarsys/core/concurrency/CoreHandlerTest.kt b/core/src/androidTest/java/com/emarsys/core/concurrency/CoreHandlerTest.kt
@@ -1,12 +1,14 @@
 package com.emarsys.core.concurrency
 
 import android.os.HandlerThread
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import java.util.concurrent.CountDownLatch
 
-class CoreHandlerTest : AnnotationSpec() {
+class CoreHandlerTest  {
     private lateinit var handler: CoreHandler
     private lateinit var handlerThread: HandlerThread
     private lateinit var failingRunnable: Runnable

diff --git a/core/src/androidTest/java/com/emarsys/core/connection/ConnectionProviderTest.kt b/core/src/androidTest/java/com/emarsys/core/connection/ConnectionProviderTest.kt
@@ -1,23 +1,23 @@
 package com.emarsys.core.connection
 
 import com.emarsys.core.request.model.RequestModel
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.should
 import io.kotest.matchers.types.beTheSameInstanceAs
+import org.junit.Before
+import org.junit.Test
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.`when`
 import java.net.URL
 
-class ConnectionProviderTest : AnnotationSpec() {
+class ConnectionProviderTest  {
     companion object {
         const val HTTP_PATH = "http://emarsys.com"
         const val HTTPS_PATH = "https://emarsys.com"
     }
 
     private lateinit var provider: ConnectionProvider
 
-
     @Before
     fun setUp() {
         provider = ConnectionProvider()

diff --git a/core/src/androidTest/java/com/emarsys/core/connection/ConnectionWatchDogTest.kt b/core/src/androidTest/java/com/emarsys/core/connection/ConnectionWatchDogTest.kt
@@ -8,7 +8,6 @@ import androidx.test.filters.SdkSuppress
 import com.emarsys.core.concurrency.ConcurrentHandlerHolderFactory
 import com.emarsys.core.handler.ConcurrentHandlerHolder
 import com.emarsys.core.worker.DefaultWorker
-import com.emarsys.testUtil.AnnotationSpec
 import com.emarsys.testUtil.ConnectionTestUtils.getContextMockWithAppContextWithConnectivityManager
 import com.emarsys.testUtil.InstrumentationRegistry.Companion.getTargetContext
 import com.emarsys.testUtil.ReflectionTestUtils
@@ -19,14 +18,14 @@ import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
 import io.mockk.verify
-
+import org.junit.Before
+import org.junit.Test
 
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.P)
-class ConnectionWatchDogTest : AnnotationSpec() {
+class ConnectionWatchDogTest  {
     private lateinit var context: Context
     private lateinit var concurrentHandlerHolder: ConcurrentHandlerHolder
 
-
     @Before
     fun setup() {
         context = getTargetContext().applicationContext

diff --git a/core/src/androidTest/java/com/emarsys/core/connection/ConnectivityChangeReceiverTest.kt b/core/src/androidTest/java/com/emarsys/core/connection/ConnectivityChangeReceiverTest.kt
@@ -7,17 +7,18 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.emarsys.core.concurrency.ConcurrentHandlerHolderFactory
 import com.emarsys.core.fake.FakeConnectionChangeListener
 import com.emarsys.core.handler.ConcurrentHandlerHolder
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.matchers.shouldBe
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
 import org.mockito.kotlin.mock
 import java.util.concurrent.CountDownLatch
 
-class ConnectivityChangeReceiverTest : AnnotationSpec() {
+class ConnectivityChangeReceiverTest  {
     private lateinit var receiver: ConnectivityChangeReceiver
     private lateinit var mockListener: ConnectionChangeListener
     private lateinit var context: Context
 
-
     lateinit var concurrentHandlerHolder: ConcurrentHandlerHolder
 
     @Before