From fd6d523f862244dd834349a8b92c45edb668d6ec Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 30 Jan 2023 13:47:22 -0500 Subject: [PATCH] [User Model] Fix broken unit test compilation --- .../user/internal/UserManagerTests.kt | 12 ++-- .../IdentityOperationExecutorTests.kt | 25 ++++--- .../LoginUserOperationExecutorTests.kt | 29 ++++---- .../RefreshUserOperationExecutorTests.kt | 24 +++++-- .../SubscriptionOperationExecutorTests.kt | 70 ++++++++++++++++--- .../UpdateUserOperationExecutorTests.kt | 21 ++++-- .../backend/InAppBackendServiceTests.kt | 4 +- 7 files changed, 135 insertions(+), 50 deletions(-) diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt index 43ca0439e2..4bbf5b4c1f 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt @@ -30,11 +30,9 @@ class UserManagerTests : FunSpec({ val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), MockHelper.propertiesModelStore(), languageContext) /* When */ - val language = userManager.language - userManager.language = "new-language" + userManager.setLanguage("new-language") /* Then */ - language shouldBe "custom-language" languageSlot.captured shouldBe "new-language" } @@ -144,11 +142,11 @@ class UserManagerTests : FunSpec({ /* When */ val subscriptions = userManager.subscriptions - userManager.addEmailSubscription("email@co.com") - userManager.removeEmailSubscription("email@co.com") + userManager.addEmail("email@co.com") + userManager.removeEmail("email@co.com") - userManager.addSmsSubscription("+15558675309") - userManager.removeSmsSubscription("+15558675309") + userManager.addSms("+15558675309") + userManager.removeSms("+15558675309") /* Then */ subscriptions shouldBe subscriptionList diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt index 199cf245ab..66c8a9feed 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/IdentityOperationExecutorTests.kt @@ -7,6 +7,7 @@ import com.onesignal.core.internal.operations.Operation import com.onesignal.mocks.MockHelper import com.onesignal.user.internal.backend.IIdentityBackendService import com.onesignal.user.internal.backend.IdentityConstants +import com.onesignal.user.internal.builduser.IRebuildUserService import com.onesignal.user.internal.identity.IdentityModel import com.onesignal.user.internal.identity.IdentityModelStore import com.onesignal.user.internal.operations.impl.executors.IdentityOperationExecutor @@ -37,7 +38,9 @@ class IdentityOperationExecutorTests : FunSpec({ val mockIdentityModelStore = mockk() every { mockIdentityModelStore.model } returns mockIdentityModel - val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore) + val mockBuildUserService = mockk() + + val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService) val operations = listOf(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1")) /* When */ @@ -55,8 +58,9 @@ class IdentityOperationExecutorTests : FunSpec({ coEvery { mockIdentityBackendService.setAlias(any(), any(), any(), any()) } throws BackendException(408, "TIMEOUT") val mockIdentityModelStore = MockHelper.identityModelStore() + val mockBuildUserService = mockk() - val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore) + val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService) val operations = listOf(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1")) /* When */ @@ -70,11 +74,12 @@ class IdentityOperationExecutorTests : FunSpec({ test("execution of set alias operation with non-retryable error") { /* Given */ val mockIdentityBackendService = mockk() - coEvery { mockIdentityBackendService.setAlias(any(), any(), any(), any()) } throws BackendException(404, "NOT FOUND") + coEvery { mockIdentityBackendService.setAlias(any(), any(), any(), any()) } throws BackendException(400, "INVALID") val mockIdentityModelStore = MockHelper.identityModelStore() + val mockBuildUserService = mockk() - val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore) + val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService) val operations = listOf(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1")) /* When */ @@ -97,7 +102,9 @@ class IdentityOperationExecutorTests : FunSpec({ val mockIdentityModelStore = mockk() every { mockIdentityModelStore.model } returns mockIdentityModel - val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore) + val mockBuildUserService = mockk() + + val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService) val operations = listOf(DeleteAliasOperation("appId", "onesignalId", "aliasKey1")) /* When */ @@ -115,8 +122,9 @@ class IdentityOperationExecutorTests : FunSpec({ coEvery { mockIdentityBackendService.deleteAlias(any(), any(), any(), any()) } throws BackendException(408, "TIMEOUT") val mockIdentityModelStore = MockHelper.identityModelStore() + val mockBuildUserService = mockk() - val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore) + val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService) val operations = listOf(DeleteAliasOperation("appId", "onesignalId", "aliasKey1")) /* When */ @@ -130,11 +138,12 @@ class IdentityOperationExecutorTests : FunSpec({ test("execution of delete alias operation with non-retryable error") { /* Given */ val mockIdentityBackendService = mockk() - coEvery { mockIdentityBackendService.deleteAlias(any(), any(), any(), any()) } throws BackendException(404, "NOT FOUND") + coEvery { mockIdentityBackendService.deleteAlias(any(), any(), any(), any()) } throws BackendException(400, "INVALID") val mockIdentityModelStore = MockHelper.identityModelStore() + val mockBuildUserService = mockk() - val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore) + val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService) val operations = listOf(DeleteAliasOperation("appId", "onesignalId", "aliasKey1")) /* When */ diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt index 0787eb7c68..5d11a58cb0 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/LoginUserOperationExecutorTests.kt @@ -65,7 +65,8 @@ class LoginUserOperationExecutorTests : FunSpec({ mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore() ) val operations = listOf(LoginUserOperation(appId, localOneSignalId, null, null)) @@ -95,7 +96,7 @@ class LoginUserOperationExecutorTests : FunSpec({ val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() - val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore) + val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore()) val operations = listOf(LoginUserOperation(appId, localOneSignalId, null, null)) /* When */ @@ -117,7 +118,7 @@ class LoginUserOperationExecutorTests : FunSpec({ val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() - val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore) + val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore()) val operations = listOf(LoginUserOperation(appId, localOneSignalId, null, null)) /* When */ @@ -140,7 +141,7 @@ class LoginUserOperationExecutorTests : FunSpec({ val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() - val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore) + val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore()) val operations = listOf(LoginUserOperation(appId, localOneSignalId, "externalId", null)) /* When */ @@ -162,7 +163,7 @@ class LoginUserOperationExecutorTests : FunSpec({ val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() - val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore) + val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore()) val operations = listOf(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId")) /* When */ @@ -197,7 +198,7 @@ class LoginUserOperationExecutorTests : FunSpec({ val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() - val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore) + val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore()) val operations = listOf(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId")) /* When */ @@ -232,7 +233,7 @@ class LoginUserOperationExecutorTests : FunSpec({ val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() - val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore) + val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore()) val operations = listOf(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId")) /* When */ @@ -267,7 +268,7 @@ class LoginUserOperationExecutorTests : FunSpec({ val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() - val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore) + val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore()) val operations = listOf(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId")) /* When */ @@ -312,7 +313,8 @@ class LoginUserOperationExecutorTests : FunSpec({ mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore() ) val operations = listOf( LoginUserOperation(appId, localOneSignalId, null, null), @@ -405,7 +407,8 @@ class LoginUserOperationExecutorTests : FunSpec({ mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore() ) val operations = listOf( LoginUserOperation(appId, localOneSignalId, null, null), @@ -471,7 +474,8 @@ class LoginUserOperationExecutorTests : FunSpec({ mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore() ) val operations = listOf( LoginUserOperation(appId, localOneSignalId, null, null), @@ -523,7 +527,8 @@ class LoginUserOperationExecutorTests : FunSpec({ mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore() ) val operations = listOf( LoginUserOperation(appId, localOneSignalId, null, null), diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt index d6b275f9a9..0cdd5fa693 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/RefreshUserOperationExecutorTests.kt @@ -11,6 +11,7 @@ import com.onesignal.user.internal.backend.IdentityConstants import com.onesignal.user.internal.backend.PropertiesObject import com.onesignal.user.internal.backend.SubscriptionObject import com.onesignal.user.internal.backend.SubscriptionObjectType +import com.onesignal.user.internal.builduser.IRebuildUserService import com.onesignal.user.internal.identity.IdentityModel import com.onesignal.user.internal.operations.impl.executors.RefreshUserOperationExecutor import com.onesignal.user.internal.properties.PropertiesModel @@ -62,11 +63,15 @@ class RefreshUserOperationExecutorTests : FunSpec({ val mockSubscriptionsModelStore = mockk() every { mockSubscriptionsModelStore.replaceAll(any(), any()) } just runs + val mockBuildUserService = mockk() + val loginUserOperationExecutor = RefreshUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf(RefreshUserOperation(appId, remoteOneSignalId)) @@ -131,12 +136,15 @@ class RefreshUserOperationExecutorTests : FunSpec({ every { mockPropertiesModelStore.model } returns mockPropertiesModel val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() val loginUserOperationExecutor = RefreshUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf(RefreshUserOperation(appId, remoteOneSignalId)) @@ -163,12 +171,15 @@ class RefreshUserOperationExecutorTests : FunSpec({ val mockIdentityModelStore = MockHelper.identityModelStore() val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() val loginUserOperationExecutor = RefreshUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf(RefreshUserOperation(appId, remoteOneSignalId)) @@ -186,18 +197,21 @@ class RefreshUserOperationExecutorTests : FunSpec({ test("refresh user fails without retry when there is a backend error condition") { /* Given */ val mockUserBackendService = mockk() - coEvery { mockUserBackendService.getUser(appId, IdentityConstants.ONESIGNAL_ID, remoteOneSignalId) } throws BackendException(404) + coEvery { mockUserBackendService.getUser(appId, IdentityConstants.ONESIGNAL_ID, remoteOneSignalId) } throws BackendException(400) /* Given */ val mockIdentityModelStore = MockHelper.identityModelStore() val mockPropertiesModelStore = MockHelper.propertiesModelStore() val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() val loginUserOperationExecutor = RefreshUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf(RefreshUserOperation(appId, remoteOneSignalId)) diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt index 6c51b8fc2f..7845478b43 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/SubscriptionOperationExecutorTests.kt @@ -9,6 +9,7 @@ import com.onesignal.mocks.MockHelper import com.onesignal.user.internal.backend.ISubscriptionBackendService import com.onesignal.user.internal.backend.IdentityConstants import com.onesignal.user.internal.backend.SubscriptionObjectType +import com.onesignal.user.internal.builduser.IRebuildUserService import com.onesignal.user.internal.operations.impl.executors.SubscriptionOperationExecutor import com.onesignal.user.internal.subscriptions.SubscriptionModel import com.onesignal.user.internal.subscriptions.SubscriptionModelStore @@ -43,11 +44,16 @@ class SubscriptionOperationExecutorTests : FunSpec({ val subscriptionModel1 = SubscriptionModel() subscriptionModel1.id = localSubscriptionId every { mockSubscriptionsModelStore.get(localSubscriptionId) } returns subscriptionModel1 + + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf(CreateSubscriptionOperation(appId, remoteOneSignalId, localSubscriptionId, SubscriptionType.PUSH, true, "pushToken", SubscriptionStatus.SUBSCRIBED)) @@ -79,11 +85,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ coEvery { mockSubscriptionBackendService.createSubscription(any(), any(), any(), any()) } throws BackendException(408) val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf(CreateSubscriptionOperation(appId, remoteOneSignalId, localSubscriptionId, SubscriptionType.PUSH, true, "pushToken", SubscriptionStatus.SUBSCRIBED)) @@ -114,11 +124,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ coEvery { mockSubscriptionBackendService.createSubscription(any(), any(), any(), any()) } throws BackendException(404) val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf(CreateSubscriptionOperation(appId, remoteOneSignalId, localSubscriptionId, SubscriptionType.PUSH, true, "pushToken", SubscriptionStatus.SUBSCRIBED)) @@ -151,11 +165,16 @@ class SubscriptionOperationExecutorTests : FunSpec({ val subscriptionModel1 = SubscriptionModel() subscriptionModel1.id = localSubscriptionId every { mockSubscriptionsModelStore.get(localSubscriptionId) } returns subscriptionModel1 + + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( @@ -179,11 +198,16 @@ class SubscriptionOperationExecutorTests : FunSpec({ val subscriptionModel1 = SubscriptionModel() subscriptionModel1.id = localSubscriptionId every { mockSubscriptionsModelStore.get(localSubscriptionId) } returns subscriptionModel1 + + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( @@ -223,11 +247,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ subscriptionModel1.address = "pushToken1" every { mockSubscriptionsModelStore.get(remoteSubscriptionId) } returns subscriptionModel1 + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( @@ -261,11 +289,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ coEvery { mockSubscriptionBackendService.updateSubscription(any(), any(), any()) } throws BackendException(408) val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( @@ -297,11 +329,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ coEvery { mockSubscriptionBackendService.updateSubscription(any(), any(), any()) } throws BackendException(404) val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( @@ -335,11 +371,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ val mockSubscriptionsModelStore = mockk() every { mockSubscriptionsModelStore.remove(any(), any()) } just runs + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( @@ -362,11 +402,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ coEvery { mockSubscriptionBackendService.deleteSubscription(any(), any()) } throws BackendException(408) val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( @@ -387,11 +431,15 @@ class SubscriptionOperationExecutorTests : FunSpec({ coEvery { mockSubscriptionBackendService.deleteSubscription(any(), any()) } throws BackendException(404) val mockSubscriptionsModelStore = mockk() + val mockBuildUserService = mockk() + val subscriptionOperationExecutor = SubscriptionOperationExecutor( mockSubscriptionBackendService, MockHelper.deviceService(), AndroidMockHelper.applicationService(), - mockSubscriptionsModelStore + mockSubscriptionsModelStore, + MockHelper.configModelStore(), + mockBuildUserService ) val operations = listOf( diff --git a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt index 576d18ab48..20e264b99e 100644 --- a/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt +++ b/OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/operations/UpdateUserOperationExecutorTests.kt @@ -5,6 +5,7 @@ import com.onesignal.core.internal.operations.Operation import com.onesignal.mocks.MockHelper import com.onesignal.user.internal.backend.IUserBackendService import com.onesignal.user.internal.backend.IdentityConstants +import com.onesignal.user.internal.builduser.IRebuildUserService import com.onesignal.user.internal.operations.impl.executors.UpdateUserOperationExecutor import com.onesignal.user.internal.properties.PropertiesModel import io.kotest.core.spec.style.FunSpec @@ -33,11 +34,13 @@ class UpdateUserOperationExecutorTests : FunSpec({ /* Given */ val mockIdentityModelStore = MockHelper.identityModelStore() val mockPropertiesModelStore = MockHelper.propertiesModelStore() + val mockBuildUserService = mockk() val loginUserOperationExecutor = UpdateUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, - mockPropertiesModelStore + mockPropertiesModelStore, + mockBuildUserService ) val operations = listOf(SetTagOperation(appId, remoteOneSignalId, "tagKey1", "tagValue1")) @@ -68,11 +71,13 @@ class UpdateUserOperationExecutorTests : FunSpec({ /* Given */ val mockIdentityModelStore = MockHelper.identityModelStore() val mockPropertiesModelStore = MockHelper.propertiesModelStore() + val mockBuildUserService = mockk() val loginUserOperationExecutor = UpdateUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, - mockPropertiesModelStore + mockPropertiesModelStore, + mockBuildUserService ) val operations = listOf( SetTagOperation(appId, remoteOneSignalId, "tagKey1", "tagValue1-1"), @@ -124,11 +129,13 @@ class UpdateUserOperationExecutorTests : FunSpec({ /* Given */ val mockIdentityModelStore = MockHelper.identityModelStore() val mockPropertiesModelStore = MockHelper.propertiesModelStore() + val mockBuildUserService = mockk() val loginUserOperationExecutor = UpdateUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, - mockPropertiesModelStore + mockPropertiesModelStore, + mockBuildUserService ) val operations = listOf( TrackSessionEndOperation(appId, remoteOneSignalId, 1111) @@ -163,11 +170,13 @@ class UpdateUserOperationExecutorTests : FunSpec({ /* Given */ val mockIdentityModelStore = MockHelper.identityModelStore() val mockPropertiesModelStore = MockHelper.propertiesModelStore() + val mockBuildUserService = mockk() val loginUserOperationExecutor = UpdateUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, - mockPropertiesModelStore + mockPropertiesModelStore, + mockBuildUserService ) val operations = listOf( TrackSessionEndOperation(appId, remoteOneSignalId, 1111), @@ -222,11 +231,13 @@ class UpdateUserOperationExecutorTests : FunSpec({ /* Given */ val mockIdentityModelStore = MockHelper.identityModelStore() val mockPropertiesModelStore = MockHelper.propertiesModelStore() + val mockBuildUserService = mockk() val loginUserOperationExecutor = UpdateUserOperationExecutor( mockUserBackendService, mockIdentityModelStore, - mockPropertiesModelStore + mockPropertiesModelStore, + mockBuildUserService ) val operations = listOf( TrackSessionEndOperation(appId, remoteOneSignalId, 1111), diff --git a/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt index 8884605e10..0f31f31c5f 100644 --- a/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt +++ b/OneSignalSDK/onesignal/in-app-messages/src/test/java/com/onesignal/inAppMessages/internal/backend/InAppBackendServiceTests.kt @@ -167,7 +167,7 @@ class InAppBackendServiceTests : FunSpec({ /* Given */ val mockHydrator = InAppHydrator(MockHelper.time(1000), MockHelper.propertiesModelStore()) val mockHttpClient = mockk() - coEvery { mockHttpClient.get(any(), any()) } returns HttpResponse(409, null) + coEvery { mockHttpClient.get(any(), any()) } returns HttpResponse(500, null) val inAppBackendService = InAppBackendService(mockHttpClient, MockHelper.deviceService(), mockHydrator) @@ -205,7 +205,7 @@ class InAppBackendServiceTests : FunSpec({ /* Given */ val mockHydrator = InAppHydrator(MockHelper.time(1000), MockHelper.propertiesModelStore()) val mockHttpClient = mockk() - coEvery { mockHttpClient.get(any(), any()) } returns HttpResponse(409, null) + coEvery { mockHttpClient.get(any(), any()) } returns HttpResponse(500, null) val inAppBackendService = InAppBackendService(mockHttpClient, MockHelper.deviceService(), mockHydrator)