Merge pull request #1749 from OneSignal/user-model/broken-unit-tests

[User Model] Ensure 100% unit test pass

Author: brismithers

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/application/impl/ApplicationService.kt

@@ -102,7 +102,7 @@ class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, On
             if (isCurrentActivityNull && isContextActivity) {
                 current = context as Activity?
                 _activityReferences = 1
-                _nextResumeIsFirstActivity = true
+                _nextResumeIsFirstActivity = false
             }
         } else {
             _nextResumeIsFirstActivity = true
@@ -138,12 +138,17 @@ class ApplicationService() : IApplicationService, ActivityLifecycleCallbacks, On
     override fun onActivityStarted(activity: Activity) {
         Logging.debug("ApplicationService.onActivityStarted($_activityReferences,$entryState): $activity")
 
+        if (current == activity) {
+            return
+        }
+
         current = activity
-        _activityReferences++
 
         if ((!isInForeground || _nextResumeIsFirstActivity) && !_isActivityChangingConfigurations) {
             _activityReferences = 1
             handleFocus()
+        } else {
+            _activityReferences++
         }
     }
 

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt

@@ -31,6 +31,7 @@ import org.junit.runner.RunWith
 @RunWith(KotestTestRunner::class)
 class RefreshUserOperationExecutorTests : FunSpec({
     val appId = "appId"
+    val existingSubscriptionId1 = "existing-subscriptionId1"
     val remoteOneSignalId = "remote-onesignalId"
     val remoteSubscriptionId1 = "remote-subscriptionId1"
     val remoteSubscriptionId2 = "remote-subscriptionId2"
@@ -42,7 +43,7 @@ class RefreshUserOperationExecutorTests : FunSpec({
             CreateUserResponse(
                 mapOf(IdentityConstants.ONESIGNAL_ID to remoteOneSignalId, "aliasLabel1" to "aliasValue1"),
                 PropertiesObject(country = "US"),
-                listOf(SubscriptionObject(remoteSubscriptionId1, SubscriptionObjectType.ANDROID_PUSH, enabled = true, token = "pushToken"), SubscriptionObject(remoteSubscriptionId2, SubscriptionObjectType.EMAIL, token = "name@company.com")),
+                listOf(SubscriptionObject(existingSubscriptionId1, SubscriptionObjectType.ANDROID_PUSH, enabled = true, token = "pushToken1"), SubscriptionObject(remoteSubscriptionId1, SubscriptionObjectType.ANDROID_PUSH, enabled = true, token = "pushToken2"), SubscriptionObject(remoteSubscriptionId2, SubscriptionObjectType.EMAIL, token = "name@company.com")),
             )
 
         /* Given */
@@ -63,14 +64,18 @@ class RefreshUserOperationExecutorTests : FunSpec({
         val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
         every { mockSubscriptionsModelStore.replaceAll(any(), any()) } just runs
 
+        val mockConfigModelStore = MockHelper.configModelStore {
+            it.pushSubscriptionId = existingSubscriptionId1
+        }
+
         val mockBuildUserService = mockk<IRebuildUserService>()
 
         val loginUserOperationExecutor = RefreshUserOperationExecutor(
             mockUserBackendService,
             mockIdentityModelStore,
             mockPropertiesModelStore,
             mockSubscriptionsModelStore,
-            MockHelper.configModelStore(),
+            mockConfigModelStore,
             mockBuildUserService,
         )
 
@@ -99,10 +104,10 @@ class RefreshUserOperationExecutorTests : FunSpec({
             mockSubscriptionsModelStore.replaceAll(
                 withArg {
                     it.count() shouldBe 2
-                    it[0].id shouldBe remoteSubscriptionId1
+                    it[0].id shouldBe existingSubscriptionId1
                     it[0].type shouldBe SubscriptionType.PUSH
                     it[0].optedIn shouldBe true
-                    it[0].address shouldBe "pushToken"
+                    it[0].address shouldBe "pushToken1"
                     it[1].id shouldBe remoteSubscriptionId2
                     it[1].type shouldBe SubscriptionType.EMAIL
                     it[1].optedIn shouldBe true