chore(git): followup changes from main and dev branches

Co-authored-by: LordAndras <[email protected]> Co-authored-by: matusekma <[email protected]>
emartech · Feb 3, 2025 · 93387c1 · 93387c1
1 parent af31947
commit 93387c1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/emarsys-firebase/src/androidTest/java/com/emarsys/fake/FakeFirebaseDependencyContainer.kt b/emarsys-firebase/src/androidTest/java/com/emarsys/fake/FakeFirebaseDependencyContainer.kt
@@ -120,7 +120,6 @@ class FakeFirebaseDependencyContainer(
     override val appLifecycleObserver: AppLifecycleObserver = mockk(relaxed = true),
     override val requestModelHelper: RequestModelHelper = mockk(relaxed = true),
     override val sessionIdHolder: SessionIdHolder = mockk(relaxed = true),
-    override val coreCompletionHandlerRefreshTokenProxyProvider: CoreCompletionHandlerRefreshTokenProxyProvider = mockk(relaxed = true),
     override val mobileEngageRequestModelFactory: MobileEngageRequestModelFactory = mockk(relaxed = true),
     override val mobileEngageSession: MobileEngageSession = mockk(relaxed = true),
     override val activityLifecycleWatchdog: ActivityLifecycleWatchdog = mockk(relaxed = true),
@@ -154,5 +153,5 @@ class FakeFirebaseDependencyContainer(
     override val jsOnAppEventListener: OnAppEventListener = mockk(relaxed = true),
     override val remoteMessageMapperFactory: RemoteMessageMapperFactory = mockk(relaxed = true),
     override val transitionSafeCurrentActivityWatchdog: TransitionSafeCurrentActivityWatchdog = mockk(relaxed = true),
-    override val sharedPreferencesV3: SharedPreferences = mockk(relaxed = true),
+    override val sharedPreferencesV3: SharedPreferences = mockk(relaxed = true)
 ) : MobileEngageComponent
diff --git a/emarsys/src/androidTest/java/com/emarsys/config/DefaultConfigInternalTest.kt b/emarsys/src/androidTest/java/com/emarsys/config/DefaultConfigInternalTest.kt
@@ -45,7 +45,7 @@ import org.junit.Before
 import org.junit.Test
 import java.util.concurrent.CountDownLatch
 
-class DefaultConfigInternalTest  {
+class DefaultConfigInternalTest {
     private companion object {
         const val APPLICATION_CODE = "applicationCode"
         const val MERCHANT_ID = "merchantId"
@@ -557,7 +557,7 @@ class DefaultConfigInternalTest  {
         configInternal.changeMerchantId(MERCHANT_ID, null)
 
         FeatureRegistry.isFeatureEnabled(InnerFeature.PREDICT) shouldBe true
-        verify(mockPredictRequestContext).merchantId = MERCHANT_ID
+        verify { mockPredictRequestContext.merchantId = MERCHANT_ID }
     }
 
     @Test
@@ -567,19 +567,19 @@ class DefaultConfigInternalTest  {
         configInternal.changeMerchantId(MERCHANT_ID, null)
 
         FeatureRegistry.isFeatureEnabled(InnerFeature.PREDICT) shouldBe true
-        verify(mockPredictRequestContext).merchantId = MERCHANT_ID
-        verify(mockPredictInternal).clearPredictOnlyContact(null)
-        verifyNoInteractions(mockMobileEngageInternal)
+        verify { mockPredictRequestContext.merchantId = MERCHANT_ID }
+        verify { mockPredictInternal.clearPredictOnlyContact(null) }
+        confirmVerified(mockMobileEngageInternal)
     }
 
     @Test
     fun testChangeMerchantId_whenMobileEngageDisabled_andPredictDisabled_shouldEnablePredict_andShouldNotClearContact() {
         configInternal.changeMerchantId(MERCHANT_ID, null)
 
         FeatureRegistry.isFeatureEnabled(InnerFeature.PREDICT) shouldBe true
-        verify(mockPredictRequestContext).merchantId = MERCHANT_ID
-        verifyNoInteractions(mockPredictInternal)
-        verifyNoInteractions(mockMobileEngageInternal)
+        verify { mockPredictRequestContext.merchantId = MERCHANT_ID }
+        confirmVerified(mockPredictInternal)
+        confirmVerified(mockMobileEngageInternal)
     }
 
     @Test
@@ -592,7 +592,7 @@ class DefaultConfigInternalTest  {
         latch.await()
 
         FeatureRegistry.isFeatureEnabled(InnerFeature.PREDICT) shouldBe true
-        verify(mockMobileEngageInternal).clearContact(null)
+        verify { mockMobileEngageInternal.clearContact(null) }
     }
 
     @Test

diff --git a/emarsys/src/androidTest/java/com/emarsys/mapper/MerchantIdHeaderMapperTest.kt b/emarsys/src/androidTest/java/com/emarsys/mapper/MerchantIdHeaderMapperTest.kt
@@ -5,14 +5,15 @@ import com.emarsys.core.request.model.RequestModel
 import com.emarsys.mobileengage.MobileEngageRequestContext
 import com.emarsys.mobileengage.util.RequestModelHelper
 import com.emarsys.predict.request.PredictRequestContext
-import com.emarsys.testUtil.AnnotationSpec
 import io.kotest.matchers.shouldBe
+import org.junit.Before
+import org.junit.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.stub
 
-class MerchantIdHeaderMapperTest : AnnotationSpec() {
+class MerchantIdHeaderMapperTest {
 
     private companion object {
         const val TIMESTAMP = 123456789L

diff --git a/...ndroidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyProviderTest.kt b/...ndroidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyProviderTest.kt
@@ -13,8 +13,6 @@ import com.emarsys.mobileengage.request.MobileEngageRequestModelFactory
 import com.emarsys.mobileengage.responsehandler.MobileEngageTokenResponseHandler
 import com.emarsys.mobileengage.util.RequestModelHelper
 import com.emarsys.predict.request.PredictMultiIdRequestModelFactory
-import com.emarsys.testUtil.AnnotationSpec
-import com.emarsys.testUtil.mockito.whenever
 import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockk

diff --git a/...ys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyTest.kt b/...ys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyTest.kt
@@ -13,8 +13,9 @@ import com.emarsys.mobileengage.request.MobileEngageRequestModelFactory
 import com.emarsys.mobileengage.responsehandler.MobileEngageTokenResponseHandler
 import com.emarsys.mobileengage.util.RequestModelHelper
 import com.emarsys.predict.request.PredictMultiIdRequestModelFactory
-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.doReturn
 import org.mockito.kotlin.eq
@@ -23,7 +24,7 @@ import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import java.net.URL
 
-class CoreCompletionHandlerRefreshTokenProxyTest : AnnotationSpec() {
+class CoreCompletionHandlerRefreshTokenProxyTest {
 
 
     companion object {