From 93387c18a1dada02a0e951745074235f274ab6c0 Mon Sep 17 00:00:00 2001 From: megamegax Date: Mon, 3 Feb 2025 15:41:42 +0100 Subject: [PATCH] chore(git): followup changes from main and dev branches Co-authored-by: LordAndras <49073629+LordAndras@users.noreply.github.com> Co-authored-by: matusekma <36794575+matusekma@users.noreply.github.com> --- .../fake/FakeFirebaseDependencyContainer.kt | 3 +-- .../config/DefaultConfigInternalTest.kt | 18 +++++++++--------- .../mapper/MerchantIdHeaderMapperTest.kt | 5 +++-- ...tionHandlerRefreshTokenProxyProviderTest.kt | 2 -- ...reCompletionHandlerRefreshTokenProxyTest.kt | 5 +++-- 5 files changed, 16 insertions(+), 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 index fd077ae2..d5cd4089 100644 --- 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 \ No newline at end of file diff --git a/emarsys/src/androidTest/java/com/emarsys/config/DefaultConfigInternalTest.kt b/emarsys/src/androidTest/java/com/emarsys/config/DefaultConfigInternalTest.kt index 152a9970..4577a307 100644 --- 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,9 +567,9 @@ 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 @@ -577,9 +577,9 @@ class DefaultConfigInternalTest { 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 index 51c5148c..901107b7 100644 --- 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/emarsys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyProviderTest.kt b/emarsys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyProviderTest.kt index a6a6de6d..771b7197 100644 --- a/emarsys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyProviderTest.kt +++ b/emarsys/src/androidTest/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/emarsys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyTest.kt b/emarsys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyTest.kt index c6029220..47dfa058 100644 --- a/emarsys/src/androidTest/java/com/emarsys/request/CoreCompletionHandlerRefreshTokenProxyTest.kt +++ b/emarsys/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 {