Skip to content

Commit e82fc07

Browse files
brismithersjinliu9508
brismithers
authored and
jinliu9508
committed
Merge pull request #1728 from OneSignal/user-model/unit-test-fixup
[User Model] Fix broken unit test compilation
2 parents f75eef2 + e0e2122 commit e82fc07

File tree

7 files changed

+135
-50
lines changed

7 files changed

+135
-50
lines changed

‎OneSignalSDK/onesignal/core/src/test/java/com/onesignal/user/internal/UserManagerTests.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ class UserManagerTests : FunSpec({
3030
val userManager = UserManager(mockSubscriptionManager, MockHelper.identityModelStore(), MockHelper.propertiesModelStore(), languageContext)
3131

3232
/* When */
33-
val language = userManager.language
34-
userManager.language = "new-language"
33+
userManager.setLanguage("new-language")
3534

3635
/* Then */
37-
language shouldBe "custom-language"
3836
languageSlot.captured shouldBe "new-language"
3937
}
4038

@@ -144,11 +142,11 @@ class UserManagerTests : FunSpec({
144142

145143
/* When */
146144
val subscriptions = userManager.subscriptions
147-
userManager.addEmailSubscription("[email protected]")
148-
userManager.removeEmailSubscription("[email protected]")
145+
userManager.addEmail("[email protected]")
146+
userManager.removeEmail("[email protected]")
149147

150-
userManager.addSmsSubscription("+15558675309")
151-
userManager.removeSmsSubscription("+15558675309")
148+
userManager.addSms("+15558675309")
149+
userManager.removeSms("+15558675309")
152150

153151
/* Then */
154152
subscriptions shouldBe subscriptionList

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

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.onesignal.core.internal.operations.Operation
77
import com.onesignal.mocks.MockHelper
88
import com.onesignal.user.internal.backend.IIdentityBackendService
99
import com.onesignal.user.internal.backend.IdentityConstants
10+
import com.onesignal.user.internal.builduser.IRebuildUserService
1011
import com.onesignal.user.internal.identity.IdentityModel
1112
import com.onesignal.user.internal.identity.IdentityModelStore
1213
import com.onesignal.user.internal.operations.impl.executors.IdentityOperationExecutor
@@ -37,7 +38,9 @@ class IdentityOperationExecutorTests : FunSpec({
3738
val mockIdentityModelStore = mockk<IdentityModelStore>()
3839
every { mockIdentityModelStore.model } returns mockIdentityModel
3940

40-
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore)
41+
val mockBuildUserService = mockk<IRebuildUserService>()
42+
43+
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService)
4144
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
4245

4346
/* When */
@@ -55,8 +58,9 @@ class IdentityOperationExecutorTests : FunSpec({
5558
coEvery { mockIdentityBackendService.setAlias(any(), any(), any(), any()) } throws BackendException(408, "TIMEOUT")
5659

5760
val mockIdentityModelStore = MockHelper.identityModelStore()
61+
val mockBuildUserService = mockk<IRebuildUserService>()
5862

59-
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore)
63+
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService)
6064
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
6165

6266
/* When */
@@ -70,11 +74,12 @@ class IdentityOperationExecutorTests : FunSpec({
7074
test("execution of set alias operation with non-retryable error") {
7175
/* Given */
7276
val mockIdentityBackendService = mockk<IIdentityBackendService>()
73-
coEvery { mockIdentityBackendService.setAlias(any(), any(), any(), any()) } throws BackendException(404, "NOT FOUND")
77+
coEvery { mockIdentityBackendService.setAlias(any(), any(), any(), any()) } throws BackendException(400, "INVALID")
7478

7579
val mockIdentityModelStore = MockHelper.identityModelStore()
80+
val mockBuildUserService = mockk<IRebuildUserService>()
7681

77-
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore)
82+
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService)
7883
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
7984

8085
/* When */
@@ -97,7 +102,9 @@ class IdentityOperationExecutorTests : FunSpec({
97102
val mockIdentityModelStore = mockk<IdentityModelStore>()
98103
every { mockIdentityModelStore.model } returns mockIdentityModel
99104

100-
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore)
105+
val mockBuildUserService = mockk<IRebuildUserService>()
106+
107+
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService)
101108
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
102109

103110
/* When */
@@ -115,8 +122,9 @@ class IdentityOperationExecutorTests : FunSpec({
115122
coEvery { mockIdentityBackendService.deleteAlias(any(), any(), any(), any()) } throws BackendException(408, "TIMEOUT")
116123

117124
val mockIdentityModelStore = MockHelper.identityModelStore()
125+
val mockBuildUserService = mockk<IRebuildUserService>()
118126

119-
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore)
127+
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService)
120128
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
121129

122130
/* When */
@@ -130,11 +138,12 @@ class IdentityOperationExecutorTests : FunSpec({
130138
test("execution of delete alias operation with non-retryable error") {
131139
/* Given */
132140
val mockIdentityBackendService = mockk<IIdentityBackendService>()
133-
coEvery { mockIdentityBackendService.deleteAlias(any(), any(), any(), any()) } throws BackendException(404, "NOT FOUND")
141+
coEvery { mockIdentityBackendService.deleteAlias(any(), any(), any(), any()) } throws BackendException(400, "INVALID")
134142

135143
val mockIdentityModelStore = MockHelper.identityModelStore()
144+
val mockBuildUserService = mockk<IRebuildUserService>()
136145

137-
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore)
146+
val identityOperationExecutor = IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService)
138147
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
139148

140149
/* When */

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ class LoginUserOperationExecutorTests : FunSpec({
6565
mockUserBackendService,
6666
mockIdentityModelStore,
6767
mockPropertiesModelStore,
68-
mockSubscriptionsModelStore
68+
mockSubscriptionsModelStore,
69+
MockHelper.configModelStore()
6970
)
7071
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, null, null))
7172

@@ -95,7 +96,7 @@ class LoginUserOperationExecutorTests : FunSpec({
9596
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
9697
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
9798

98-
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore)
99+
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore())
99100
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, null, null))
100101

101102
/* When */
@@ -117,7 +118,7 @@ class LoginUserOperationExecutorTests : FunSpec({
117118
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
118119
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
119120

120-
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore)
121+
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore())
121122
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, null, null))
122123

123124
/* When */
@@ -140,7 +141,7 @@ class LoginUserOperationExecutorTests : FunSpec({
140141
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
141142
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
142143

143-
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore)
144+
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore())
144145
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, "externalId", null))
145146

146147
/* When */
@@ -162,7 +163,7 @@ class LoginUserOperationExecutorTests : FunSpec({
162163
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
163164
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
164165

165-
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore)
166+
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore())
166167
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId"))
167168

168169
/* When */
@@ -197,7 +198,7 @@ class LoginUserOperationExecutorTests : FunSpec({
197198
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
198199
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
199200

200-
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore)
201+
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore())
201202
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId"))
202203

203204
/* When */
@@ -232,7 +233,7 @@ class LoginUserOperationExecutorTests : FunSpec({
232233
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
233234
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
234235

235-
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore)
236+
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore())
236237
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId"))
237238

238239
/* When */
@@ -267,7 +268,7 @@ class LoginUserOperationExecutorTests : FunSpec({
267268
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
268269
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
269270

270-
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore)
271+
val loginUserOperationExecutor = LoginUserOperationExecutor(mockIdentityOperationExecutor, MockHelper.applicationService(), MockHelper.deviceService(), mockUserBackendService, mockIdentityModelStore, mockPropertiesModelStore, mockSubscriptionsModelStore, MockHelper.configModelStore())
271272
val operations = listOf<Operation>(LoginUserOperation(appId, localOneSignalId, "externalId", "existingOneSignalId"))
272273

273274
/* When */
@@ -312,7 +313,8 @@ class LoginUserOperationExecutorTests : FunSpec({
312313
mockUserBackendService,
313314
mockIdentityModelStore,
314315
mockPropertiesModelStore,
315-
mockSubscriptionsModelStore
316+
mockSubscriptionsModelStore,
317+
MockHelper.configModelStore()
316318
)
317319
val operations = listOf<Operation>(
318320
LoginUserOperation(appId, localOneSignalId, null, null),
@@ -405,7 +407,8 @@ class LoginUserOperationExecutorTests : FunSpec({
405407
mockUserBackendService,
406408
mockIdentityModelStore,
407409
mockPropertiesModelStore,
408-
mockSubscriptionsModelStore
410+
mockSubscriptionsModelStore,
411+
MockHelper.configModelStore()
409412
)
410413
val operations = listOf<Operation>(
411414
LoginUserOperation(appId, localOneSignalId, null, null),
@@ -471,7 +474,8 @@ class LoginUserOperationExecutorTests : FunSpec({
471474
mockUserBackendService,
472475
mockIdentityModelStore,
473476
mockPropertiesModelStore,
474-
mockSubscriptionsModelStore
477+
mockSubscriptionsModelStore,
478+
MockHelper.configModelStore()
475479
)
476480
val operations = listOf<Operation>(
477481
LoginUserOperation(appId, localOneSignalId, null, null),
@@ -523,7 +527,8 @@ class LoginUserOperationExecutorTests : FunSpec({
523527
mockUserBackendService,
524528
mockIdentityModelStore,
525529
mockPropertiesModelStore,
526-
mockSubscriptionsModelStore
530+
mockSubscriptionsModelStore,
531+
MockHelper.configModelStore()
527532
)
528533
val operations = listOf<Operation>(
529534
LoginUserOperation(appId, localOneSignalId, null, null),

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

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.onesignal.user.internal.backend.IdentityConstants
1111
import com.onesignal.user.internal.backend.PropertiesObject
1212
import com.onesignal.user.internal.backend.SubscriptionObject
1313
import com.onesignal.user.internal.backend.SubscriptionObjectType
14+
import com.onesignal.user.internal.builduser.IRebuildUserService
1415
import com.onesignal.user.internal.identity.IdentityModel
1516
import com.onesignal.user.internal.operations.impl.executors.RefreshUserOperationExecutor
1617
import com.onesignal.user.internal.properties.PropertiesModel
@@ -62,11 +63,15 @@ class RefreshUserOperationExecutorTests : FunSpec({
6263
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
6364
every { mockSubscriptionsModelStore.replaceAll(any(), any()) } just runs
6465

66+
val mockBuildUserService = mockk<IRebuildUserService>()
67+
6568
val loginUserOperationExecutor = RefreshUserOperationExecutor(
6669
mockUserBackendService,
6770
mockIdentityModelStore,
6871
mockPropertiesModelStore,
69-
mockSubscriptionsModelStore
72+
mockSubscriptionsModelStore,
73+
MockHelper.configModelStore(),
74+
mockBuildUserService
7075
)
7176

7277
val operations = listOf<Operation>(RefreshUserOperation(appId, remoteOneSignalId))
@@ -131,12 +136,15 @@ class RefreshUserOperationExecutorTests : FunSpec({
131136
every { mockPropertiesModelStore.model } returns mockPropertiesModel
132137

133138
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
139+
val mockBuildUserService = mockk<IRebuildUserService>()
134140

135141
val loginUserOperationExecutor = RefreshUserOperationExecutor(
136142
mockUserBackendService,
137143
mockIdentityModelStore,
138144
mockPropertiesModelStore,
139-
mockSubscriptionsModelStore
145+
mockSubscriptionsModelStore,
146+
MockHelper.configModelStore(),
147+
mockBuildUserService
140148
)
141149

142150
val operations = listOf<Operation>(RefreshUserOperation(appId, remoteOneSignalId))
@@ -163,12 +171,15 @@ class RefreshUserOperationExecutorTests : FunSpec({
163171
val mockIdentityModelStore = MockHelper.identityModelStore()
164172
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
165173
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
174+
val mockBuildUserService = mockk<IRebuildUserService>()
166175

167176
val loginUserOperationExecutor = RefreshUserOperationExecutor(
168177
mockUserBackendService,
169178
mockIdentityModelStore,
170179
mockPropertiesModelStore,
171-
mockSubscriptionsModelStore
180+
mockSubscriptionsModelStore,
181+
MockHelper.configModelStore(),
182+
mockBuildUserService
172183
)
173184

174185
val operations = listOf<Operation>(RefreshUserOperation(appId, remoteOneSignalId))
@@ -186,18 +197,21 @@ class RefreshUserOperationExecutorTests : FunSpec({
186197
test("refresh user fails without retry when there is a backend error condition") {
187198
/* Given */
188199
val mockUserBackendService = mockk<IUserBackendService>()
189-
coEvery { mockUserBackendService.getUser(appId, IdentityConstants.ONESIGNAL_ID, remoteOneSignalId) } throws BackendException(404)
200+
coEvery { mockUserBackendService.getUser(appId, IdentityConstants.ONESIGNAL_ID, remoteOneSignalId) } throws BackendException(400)
190201

191202
/* Given */
192203
val mockIdentityModelStore = MockHelper.identityModelStore()
193204
val mockPropertiesModelStore = MockHelper.propertiesModelStore()
194205
val mockSubscriptionsModelStore = mockk<SubscriptionModelStore>()
206+
val mockBuildUserService = mockk<IRebuildUserService>()
195207

196208
val loginUserOperationExecutor = RefreshUserOperationExecutor(
197209
mockUserBackendService,
198210
mockIdentityModelStore,
199211
mockPropertiesModelStore,
200-
mockSubscriptionsModelStore
212+
mockSubscriptionsModelStore,
213+
MockHelper.configModelStore(),
214+
mockBuildUserService
201215
)
202216

203217
val operations = listOf<Operation>(RefreshUserOperation(appId, remoteOneSignalId))

0 commit comments

Comments
 (0)