Fix some test units and a linting issue

Author: jinliu9508

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/subscriptions/SubscriptionModel.kt

@@ -110,7 +110,6 @@ class SubscriptionModel : Model() {
         }
 
     // Prior to v5.0.5, we did not save the following properties, so we must default get() to ""
-    
     var sdk: String
         get() = getStringProperty(::sdk.name) { "" }
         set(value) {

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/subscriptions/SubscriptionManagerTests.kt

@@ -2,6 +2,8 @@ package com.onesignal.user.internal.subscriptions
 
 import com.onesignal.common.modeling.ModelChangeTags
 import com.onesignal.common.modeling.ModelChangedArgs
+import com.onesignal.core.internal.application.IApplicationService
+import com.onesignal.session.internal.session.ISessionService
 import com.onesignal.user.internal.subscriptions.impl.SubscriptionManager
 import com.onesignal.user.subscriptions.ISmsSubscription
 import io.kotest.core.spec.style.FunSpec
@@ -24,6 +26,8 @@ class SubscriptionManagerTests : FunSpec({
     test("initializes subscriptions from model store") {
         // Given
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
         val pushSubscription = SubscriptionModel()
         pushSubscription.id = "subscription1"
         pushSubscription.type = SubscriptionType.PUSH
@@ -49,7 +53,7 @@ class SubscriptionManagerTests : FunSpec({
         every { mockSubscriptionModelStore.subscribe(any()) } just runs
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
 
         // When
         val subscriptions = subscriptionManager.subscriptions
@@ -71,13 +75,15 @@ class SubscriptionManagerTests : FunSpec({
     test("add email subscription adds to model store") {
         // Given
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
 
         val listOfSubscriptions = listOf<SubscriptionModel>()
         every { mockSubscriptionModelStore.subscribe(any()) } just runs
         every { mockSubscriptionModelStore.add(any()) } just runs
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
 
         // When
         subscriptionManager.addEmailSubscription("name@company.com")
@@ -98,13 +104,15 @@ class SubscriptionManagerTests : FunSpec({
     test("add sms subscription adds to model store") {
         // Given
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
 
         val listOfSubscriptions = listOf<SubscriptionModel>()
         every { mockSubscriptionModelStore.subscribe(any()) } just runs
         every { mockSubscriptionModelStore.add(any()) } just runs
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
 
         // When
         subscriptionManager.addSmsSubscription("+15558675309")
@@ -125,13 +133,15 @@ class SubscriptionManagerTests : FunSpec({
     test("add push subscription adds to model store") {
         // Given
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
 
         val listOfSubscriptions = listOf<SubscriptionModel>()
         every { mockSubscriptionModelStore.subscribe(any()) } just runs
         every { mockSubscriptionModelStore.add(any()) } just runs
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
 
         // When
         subscriptionManager.addOrUpdatePushSubscriptionToken("pushToken", SubscriptionStatus.SUBSCRIBED)
@@ -152,6 +162,8 @@ class SubscriptionManagerTests : FunSpec({
     test("update push subscription updates model store") {
         // Given
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
 
         val pushSubscription = SubscriptionModel()
         pushSubscription.id = "subscription1"
@@ -167,7 +179,7 @@ class SubscriptionManagerTests : FunSpec({
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
         every { mockSubscriptionModelStore.get("subscription1") } returns pushSubscription
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
 
         // When
         subscriptionManager.addOrUpdatePushSubscriptionToken("pushToken2", SubscriptionStatus.FIREBASE_FCM_ERROR_IOEXCEPTION_OTHER)
@@ -180,6 +192,8 @@ class SubscriptionManagerTests : FunSpec({
     test("remove email subscription removes from model store") {
         // Given
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
 
         val emailSubscription = SubscriptionModel()
         emailSubscription.id = "subscription1"
@@ -195,7 +209,7 @@ class SubscriptionManagerTests : FunSpec({
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
         every { mockSubscriptionModelStore.remove("subscription1") } just runs
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
 
         // When
         subscriptionManager.removeEmailSubscription("name@company.com")
@@ -207,6 +221,8 @@ class SubscriptionManagerTests : FunSpec({
     test("remove sms subscription removes from model store") {
         // Given
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
 
         val emailSubscription = SubscriptionModel()
         emailSubscription.id = "subscription1"
@@ -222,7 +238,7 @@ class SubscriptionManagerTests : FunSpec({
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
         every { mockSubscriptionModelStore.remove("subscription1") } just runs
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
 
         // When
         subscriptionManager.removeSmsSubscription("+18458675309")
@@ -241,14 +257,16 @@ class SubscriptionManagerTests : FunSpec({
         smsSubscription.address = "+18458675309"
 
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
         val listOfSubscriptions = listOf<SubscriptionModel>()
 
         every { mockSubscriptionModelStore.subscribe(any()) } just runs
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
 
         val spySubscriptionChangedHandler = spyk<ISubscriptionChangedHandler>()
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
         subscriptionManager.subscribe(spySubscriptionChangedHandler)
 
         // When
@@ -280,14 +298,16 @@ class SubscriptionManagerTests : FunSpec({
         emailSubscription.address = "+18458675309"
 
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
         val listOfSubscriptions = listOf(emailSubscription)
 
         every { mockSubscriptionModelStore.subscribe(any()) } just runs
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
 
         val spySubscriptionChangedHandler = spyk<ISubscriptionChangedHandler>()
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
         subscriptionManager.subscribe(spySubscriptionChangedHandler)
 
         // When
@@ -321,14 +341,16 @@ class SubscriptionManagerTests : FunSpec({
         smsSubscription.address = "+18458675309"
 
         val mockSubscriptionModelStore = mockk<SubscriptionModelStore>()
+        val mockApplicationService = mockk<IApplicationService>()
+        val mockSessionService = mockk<ISessionService>(relaxed = true)
         val listOfSubscriptions = listOf(smsSubscription)
 
         every { mockSubscriptionModelStore.subscribe(any()) } just runs
         every { mockSubscriptionModelStore.list() } returns listOfSubscriptions
 
         val spySubscriptionChangedHandler = spyk<ISubscriptionChangedHandler>()
 
-        val subscriptionManager = SubscriptionManager(mockSubscriptionModelStore)
+        val subscriptionManager = SubscriptionManager(mockApplicationService, mockSessionService, mockSubscriptionModelStore)
         subscriptionManager.subscribe(spySubscriptionChangedHandler)
 
         // When