[User Model] IAM Unit Tests (partial)

Author: brismithers

OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessageContent.kt

@@ -1,5 +1,9 @@
 package com.onesignal.inAppMessages.internal
 
+import com.onesignal.common.safeBool
+import com.onesignal.common.safeDouble
+import com.onesignal.common.safeJSONObject
+import com.onesignal.common.safeString
 import com.onesignal.inAppMessages.internal.display.impl.WebViewManager
 import org.json.JSONObject
 
@@ -15,11 +19,11 @@ internal open class InAppMessageContent constructor(jsonObject: JSONObject) {
     var pageHeight: Int = 0
 
     init {
-        contentHtml = jsonObject.optString(HTML)
-        displayDuration = jsonObject.optDouble(DISPLAY_DURATION)
-        var styles: JSONObject? = jsonObject.optJSONObject(STYLES)
-        useHeightMargin = !(styles?.optBoolean(REMOVE_HEIGHT_MARGIN, false) ?: false)
-        useWidthMargin = !(styles?.optBoolean(REMOVE_WIDTH_MARGIN, false) ?: false)
+        contentHtml = jsonObject.safeString(HTML)
+        displayDuration = jsonObject.safeDouble(DISPLAY_DURATION)
+        var styles: JSONObject? = jsonObject.safeJSONObject(STYLES)
+        useHeightMargin = !(styles?.safeBool(REMOVE_HEIGHT_MARGIN) ?: false)
+        useWidthMargin = !(styles?.safeBool(REMOVE_WIDTH_MARGIN) ?: false)
         isFullBleed = !useHeightMargin
     }
 

OneSignalSDK/onesignal/inAppMessages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt

@@ -201,7 +201,7 @@ internal class InAppMessagesManager(
             _lastTimeFetchedIAMs = now
         }
 
-        val newMessages = _backend.listInAppMessages(appId, subscriptionId.toString())
+        val newMessages = _backend.listInAppMessages(appId, subscriptionId)
 
         if (newMessages != null) {
             this._messages = newMessages

OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/extensions/ContainedRobolectricRunner.kt

@@ -3,7 +3,7 @@
  *
  * LICENSE: https://github.com/kotest/kotest-extensions-robolectric/blob/master/LICENSE
  */
-package com.onesignal.extensions
+package com.onesignal.inAppMessages.extensions
 
 import org.junit.runners.model.FrameworkMethod
 import org.robolectric.RobolectricTestRunner

OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/extensions/RobolectricExtension.kt

@@ -4,7 +4,7 @@
  *
  * LICENSE: https://github.com/kotest/kotest-extensions-robolectric/blob/master/LICENSE
  */
-package com.onesignal.extensions
+package com.onesignal.inAppMessages.extensions
 
 import android.app.Application
 import io.kotest.core.extensions.ConstructorExtension
@@ -30,13 +30,23 @@ internal class RobolectricExtension : ConstructorExtension, TestCaseExtension {
     }
 
     private fun KClass<*>.getConfig(): Config {
-        val annotations = listOf(this.java).plus(this.java.getParentClass())
+        val configAnnotations = listOf(this.java).plus(this.java.getParentClass())
+            .mapNotNull { it.kotlin.findAnnotation<Config>() }
+            .asSequence()
+
+        val configAnnotation = configAnnotations.firstOrNull()
+
+        if (configAnnotation != null) {
+            return Config.Builder(configAnnotation).build()
+        }
+
+        val robolectricTestAnnotations = listOf(this.java).plus(this.java.getParentClass())
             .mapNotNull { it.kotlin.findAnnotation<RobolectricTest>() }
             .asSequence()
 
-        val application: KClass<out Application>? = annotations
+        val application: KClass<out Application>? = robolectricTestAnnotations
             .firstOrNull { it.application != KotestDefaultApplication::class }?.application
-        val sdk: Int? = annotations.firstOrNull { it.sdk != -1 }?.takeUnless { it.sdk == -1 }?.sdk
+        val sdk: Int? = robolectricTestAnnotations.firstOrNull { it.sdk != -1 }?.takeUnless { it.sdk == -1 }?.sdk
 
         return Config.Builder()
             .also { builder ->

OneSignalSDK/onesignal/inAppMessages/src/test/java/com/onesignal/inAppMessages/internal/InAppMessagesManagerTests.kt

@@ -8,7 +8,7 @@ import com.onesignal.inAppMessages.internal.preferences.IInAppPreferencesControl
 import com.onesignal.inAppMessages.internal.repositories.IInAppRepository
 import com.onesignal.inAppMessages.internal.state.InAppStateService
 import com.onesignal.inAppMessages.internal.triggers.ITriggerController
-import com.onesignal.mocks.MockHelper
+import com.onesignal.inAppMessages.mocks.MockHelper
 import com.onesignal.session.internal.influence.IInfluenceManager
 import com.onesignal.session.internal.outcomes.IOutcomeEventsController
 import com.onesignal.session.internal.session.ISessionService