Skip to content

Commit

Permalink
fix(setup): fix setupFromCache, remove params validation from command…
Browse files Browse the repository at this point in the history 
… execution

SUITEDEV-35862

Co-authored-by: LasOri <[email protected]>
Co-authored-by: matusekma <[email protected]>
Co-authored-by: davidSchuppa <[email protected]>
  • Loading branch information
@LordAndras @LasOri
@matusekma @davidSchuppa
4 people committed May 16, 2024
1 parent 1e76921 commit 3686984
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 63 deletions.
10 changes: 5 additions & 5 deletions android/src/main/kotlin/com/emarsys/emarsys_sdk/command/setup/SetupCommand.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ class SetupCommand(
) : EmarsysCommand {

override fun execute(parameters: Map<String, Any?>?, resultCallback: ResultCallback) {
if (parameters == null) {
resultCallback(null, IllegalArgumentException("parameterMap must not be null!"))
return
}

WrapperInfoContainer.wrapperInfo = "flutter"

val configBuilder = if (fromCache) {
ConfigLoader().loadConfigFromSharedPref(
application,
EMARSYS_SETUP_CACHE_SHARED_PREFERENCES
)
} else {
if (parameters == null) {
resultCallback(null, IllegalArgumentException("parameterMap must not be null!"))
return
}
configFromParameters(parameters)
}

Expand Down
142 changes: 84 additions & 58 deletions android/src/test/kotlin/com/emarsys/emarsys_sdk/command/setup/SetupCommandTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ class SetupCommandTest {
mockkStatic(FeatureRegistry::class)

setupCommand = SetupCommand(
mockApplication,
mockPushTokenStorage,
mockSharedPreferences,
false
mockApplication,
mockPushTokenStorage,
mockSharedPreferences,
false
)

every { mockPushTokenStorage.pushToken } returns PUSH_TOKEN
Expand All @@ -92,8 +92,8 @@ class SetupCommandTest {
every { FeatureRegistry.enableFeature(any()) } just Runs
every {
mockApplication.getSharedPreferences(
"emarsys_setup_cache",
0
"emarsys_setup_cache",
0
)
} returns mockSharedPreferences

Expand All @@ -116,32 +116,58 @@ class SetupCommandTest {
WrapperInfoContainer.wrapperInfo = null
}

@Test
fun testExecute_parametersMustNotBeNull_ifSetupCalled_notFromCache() {
var calls = 0
var exception: Throwable? = null
val resultCallback: ResultCallback = { _, error ->
exception = error
calls++
}
setupCommand.execute(null, resultCallback)

calls shouldBe 1
exception!!::class shouldBe IllegalArgumentException::class
}

@Test
fun testExecute_parametersMustNotBeNull() {
val mockResultCallback: ResultCallback = mockk(relaxed = true)
setupCommand.execute(null, mockResultCallback)
fun testExecute_ifSetupCalled_fromCache_shouldCallResultCallback_withoutException() {
var calls = 0
var exception: Throwable? = null
val resultCallback: ResultCallback = { _, error ->
exception = error
calls++
}
val testCommand = SetupCommand(
mockApplication,
mockPushTokenStorage,
mockSharedPreferences,
true
)

testCommand.execute(null, resultCallback)

verify { mockResultCallback.invoke(null, any<IllegalArgumentException>()) }
exception shouldBe null
calls shouldBe 1
}

@Test
fun testExecute_shouldCallEmarsysSetupWithAllConfigValuesFromParametersMap() {
val parameters = mapOf(
"applicationCode" to APP_CODE,
"merchantId" to MERCHANT_ID,
"androidSharedPackageNames" to SHARED_PACKAGE_NAMES,
"androidSharedSecret" to SECRET,
"androidVerboseConsoleLoggingEnabled" to true
"applicationCode" to APP_CODE,
"merchantId" to MERCHANT_ID,
"androidSharedPackageNames" to SHARED_PACKAGE_NAMES,
"androidSharedSecret" to SECRET,
"androidVerboseConsoleLoggingEnabled" to true
)

val expectedConfig = EmarsysConfig(
application = mockApplication,
applicationCode = APP_CODE,
merchantId = MERCHANT_ID,
sharedPackageNames = SHARED_PACKAGE_NAMES,
sharedSecret = SECRET,
verboseConsoleLoggingEnabled = true
application = mockApplication,
applicationCode = APP_CODE,
merchantId = MERCHANT_ID,
sharedPackageNames = SHARED_PACKAGE_NAMES,
sharedSecret = SECRET,
verboseConsoleLoggingEnabled = true
)

setupCommand.execute(parameters) { _, _ ->
Expand All @@ -151,22 +177,22 @@ class SetupCommandTest {

verify {
mockEdit.putString(
ConfigStorageKeys.MOBILE_ENGAGE_APPLICATION_CODE.name,
APP_CODE
ConfigStorageKeys.MOBILE_ENGAGE_APPLICATION_CODE.name,
APP_CODE
)
}
verify { mockEdit.putString(ConfigStorageKeys.PREDICT_MERCHANT_ID.name, MERCHANT_ID) }
verify {
mockEdit.putStringSet(
ConfigStorageKeys.ANDROID_SHARED_PACKAGE_NAMES.name,
mutableSetOf(*SHARED_PACKAGE_NAMES.toTypedArray())
ConfigStorageKeys.ANDROID_SHARED_PACKAGE_NAMES.name,
mutableSetOf(*SHARED_PACKAGE_NAMES.toTypedArray())
)
}
verify { mockEdit.putString(ConfigStorageKeys.ANDROID_SHARED_SECRET.name, SECRET) }
verify {
mockEdit.putBoolean(
ConfigStorageKeys.ANDROID_VERBOSE_CONSOLE_LOGGING_ENABLED.name,
true
ConfigStorageKeys.ANDROID_VERBOSE_CONSOLE_LOGGING_ENABLED.name,
true
)
}

Expand All @@ -186,15 +212,15 @@ class SetupCommandTest {
every { mockSharedPreferences.getBoolean("push_sending_enabled", any()) } returns true
val pushTokenStorage = spyk(PushTokenStorage(mockSharedPreferences))
val setupCommand = SetupCommand(
mockApplication,
pushTokenStorage,
mockSharedPreferences,
false
mockApplication,
pushTokenStorage,
mockSharedPreferences,
false
)


val expectedConfig = EmarsysConfig(
application = mockApplication,
application = mockApplication,
)
setupCommand.execute(mapOf()) { _, _ ->

Expand All @@ -213,16 +239,16 @@ class SetupCommandTest {
every { Emarsys.push } returns mockPushApi

val setupCommand = SetupCommand(
mockApplication,
PushTokenStorage(mockSharedPreferences),
mockSharedPreferences,
false
mockApplication,
PushTokenStorage(mockSharedPreferences),
mockSharedPreferences,
false
)
every { mockPushTokenStorage.pushToken } returns null
every { mockPushTokenStorage.enabled } returns false

val expectedConfig = EmarsysConfig(
application = mockApplication
application = mockApplication
)
setupCommand.execute(mapOf()) { _, _ ->

Expand All @@ -236,55 +262,55 @@ class SetupCommandTest {
@Test
fun testOnMethodCall_callSetupWithStoredConfig() {
setupCommand = SetupCommand(
mockApplication,
mockPushTokenStorage,
mockSharedPreferences,
true
mockApplication,
mockPushTokenStorage,
mockSharedPreferences,
true
)

every {
mockSharedPreferences.getString(
ConfigStorageKeys.MOBILE_ENGAGE_APPLICATION_CODE.name,
any()
ConfigStorageKeys.MOBILE_ENGAGE_APPLICATION_CODE.name,
any()
)
} returns APP_CODE
every {
mockSharedPreferences.getString(
ConfigStorageKeys.PREDICT_MERCHANT_ID.name,
any()
ConfigStorageKeys.PREDICT_MERCHANT_ID.name,
any()
)
} returns MERCHANT_ID
every {
mockSharedPreferences.getString(
ConfigStorageKeys.ANDROID_SHARED_SECRET.name,
any()
ConfigStorageKeys.ANDROID_SHARED_SECRET.name,
any()
)
} returns SECRET
every {
mockSharedPreferences.getStringSet(
ConfigStorageKeys.ANDROID_SHARED_PACKAGE_NAMES.name,
any()
ConfigStorageKeys.ANDROID_SHARED_PACKAGE_NAMES.name,
any()
)
} returns mutableSetOf(*SHARED_PACKAGE_NAMES.toTypedArray())
every {
mockSharedPreferences.getBoolean(
ConfigStorageKeys.ANDROID_VERBOSE_CONSOLE_LOGGING_ENABLED.name,
any()
ConfigStorageKeys.ANDROID_VERBOSE_CONSOLE_LOGGING_ENABLED.name,
any()
)
} returns false
every {
mockSharedPreferences.getBoolean(
ConfigStorageKeys.ANDROID_DISABLE_AUTOMATIC_PUSH_TOKEN_SENDING.name,
any()
ConfigStorageKeys.ANDROID_DISABLE_AUTOMATIC_PUSH_TOKEN_SENDING.name,
any()
)
} returns false

val expectedConfig = EmarsysConfig(
application = mockApplication,
applicationCode = APP_CODE,
merchantId = MERCHANT_ID,
sharedPackageNames = SHARED_PACKAGE_NAMES,
sharedSecret = SECRET
application = mockApplication,
applicationCode = APP_CODE,
merchantId = MERCHANT_ID,
sharedPackageNames = SHARED_PACKAGE_NAMES,
sharedSecret = SECRET
)

setupCommand.execute(mapOf()) { _, _ ->
Expand Down

0 comments on commit 3686984

Please sign in to comment.