Skip to content

Commit 00d3799

Browse files
nan-linan-li
committed
Fix unit test compilation for identity verification parameters
Made-with: Cursor
1 parent 457b745 commit 00d3799

File tree

13 files changed

+173
-81
lines changed

13 files changed

+173
-81
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.onesignal.debug.LogLevel
1212
import com.onesignal.debug.internal.logging.Logging
1313
import com.onesignal.mocks.MockHelper
1414
import com.onesignal.mocks.MockPreferencesService
15+
import com.onesignal.user.internal.identity.JwtTokenStore
1516
import com.onesignal.user.internal.operations.ExecutorMocks.Companion.getNewRecordState
1617
import com.onesignal.user.internal.operations.LoginUserOperation
1718
import io.kotest.core.spec.style.FunSpec
@@ -72,6 +73,8 @@ private class Mocks {
7273
configModelStore,
7374
Time(),
7475
getNewRecordState(configModelStore),
76+
mockk<JwtTokenStore>(relaxed = true),
77+
MockHelper.identityModelStore(),
7578
),
7679
recordPrivateCalls = true,
7780
)
@@ -97,6 +100,8 @@ class OperationRepoTests : FunSpec({
97100
mocks.configModelStore,
98101
Time(),
99102
getNewRecordState(mocks.configModelStore),
103+
mockk<JwtTokenStore>(relaxed = true),
104+
MockHelper.identityModelStore(),
100105
),
101106
)
102107

@@ -913,6 +918,8 @@ class OperationRepoTests : FunSpec({
913918
every { operation.modifyComparisonKey } returns modifyComparisonKey
914919
every { operation.translateIds(any()) } just runs
915920
every { operation.applyToRecordId } returns applyToRecordId
921+
every { operation.externalId } returns null
922+
every { operation.externalId = any() } just runs
916923

917924
return operation
918925
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.onesignal.debug.LogLevel
66
import com.onesignal.debug.internal.logging.Logging
77
import com.onesignal.mocks.MockHelper
88
import com.onesignal.user.internal.identity.IdentityModel
9+
import com.onesignal.user.internal.identity.JwtTokenStore
910
import com.onesignal.user.internal.operations.LoginUserOperation
1011
import com.onesignal.user.internal.properties.PropertiesModel
1112
import io.kotest.core.spec.style.FunSpec
@@ -48,6 +49,7 @@ class LoginHelperTests : FunSpec({
4849
val mockOperationRepo = mockk<IOperationRepo>(relaxed = true)
4950
val mockConfigModel = mockk<ConfigModel>()
5051
every { mockConfigModel.appId } returns appId
52+
every { mockConfigModel.useIdentityVerification } returns false
5153
val loginLock = Any()
5254

5355
val loginHelper =
@@ -56,6 +58,7 @@ class LoginHelperTests : FunSpec({
5658
userSwitcher = mockUserSwitcher,
5759
operationRepo = mockOperationRepo,
5860
configModel = mockConfigModel,
61+
jwtTokenStore = mockk<JwtTokenStore>(relaxed = true),
5962
lock = loginLock,
6063
)
6164

@@ -87,6 +90,7 @@ class LoginHelperTests : FunSpec({
8790
val mockOperationRepo = mockk<IOperationRepo>()
8891
val mockConfigModel = mockk<ConfigModel>()
8992
every { mockConfigModel.appId } returns appId
93+
every { mockConfigModel.useIdentityVerification } returns false
9094
val loginLock = Any()
9195

9296
val userSwitcherSlot = slot<(IdentityModel, PropertiesModel) -> Unit>()
@@ -108,6 +112,7 @@ class LoginHelperTests : FunSpec({
108112
userSwitcher = mockUserSwitcher,
109113
operationRepo = mockOperationRepo,
110114
configModel = mockConfigModel,
115+
jwtTokenStore = mockk<JwtTokenStore>(relaxed = true),
111116
lock = loginLock,
112117
)
113118

@@ -152,6 +157,7 @@ class LoginHelperTests : FunSpec({
152157
val mockOperationRepo = mockk<IOperationRepo>()
153158
val mockConfigModel = mockk<ConfigModel>()
154159
every { mockConfigModel.appId } returns appId
160+
every { mockConfigModel.useIdentityVerification } returns false
155161
val loginLock = Any()
156162

157163
val userSwitcherSlot = slot<(IdentityModel, PropertiesModel) -> Unit>()
@@ -173,6 +179,7 @@ class LoginHelperTests : FunSpec({
173179
userSwitcher = mockUserSwitcher,
174180
operationRepo = mockOperationRepo,
175181
configModel = mockConfigModel,
182+
jwtTokenStore = mockk<JwtTokenStore>(relaxed = true),
176183
lock = loginLock,
177184
)
178185

@@ -212,6 +219,7 @@ class LoginHelperTests : FunSpec({
212219
val mockOperationRepo = mockk<IOperationRepo>()
213220
val mockConfigModel = mockk<ConfigModel>()
214221
every { mockConfigModel.appId } returns appId
222+
every { mockConfigModel.useIdentityVerification } returns false
215223
val loginLock = Any()
216224

217225
val userSwitcherSlot = slot<(IdentityModel, PropertiesModel) -> Unit>()
@@ -234,6 +242,7 @@ class LoginHelperTests : FunSpec({
234242
userSwitcher = mockUserSwitcher,
235243
operationRepo = mockOperationRepo,
236244
configModel = mockConfigModel,
245+
jwtTokenStore = mockk<JwtTokenStore>(relaxed = true),
237246
lock = loginLock,
238247
)
239248

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.onesignal.debug.LogLevel
66
import com.onesignal.debug.internal.logging.Logging
77
import com.onesignal.mocks.MockHelper
88
import com.onesignal.user.internal.operations.LoginUserOperation
9+
import com.onesignal.user.internal.subscriptions.SubscriptionModelStore
910
import io.kotest.core.spec.style.FunSpec
1011
import io.kotest.matchers.shouldBe
1112
import io.mockk.every
@@ -41,6 +42,7 @@ class LogoutHelperTests : FunSpec({
4142
val mockOperationRepo = mockk<IOperationRepo>(relaxed = true)
4243
val mockConfigModel = mockk<ConfigModel>()
4344
every { mockConfigModel.appId } returns appId
45+
every { mockConfigModel.useIdentityVerification } returns false
4446
val logoutLock = Any()
4547

4648
val logoutHelper =
@@ -49,6 +51,7 @@ class LogoutHelperTests : FunSpec({
4951
userSwitcher = mockUserSwitcher,
5052
operationRepo = mockOperationRepo,
5153
configModel = mockConfigModel,
54+
subscriptionModelStore = mockk<SubscriptionModelStore>(relaxed = true),
5255
lock = logoutLock,
5356
)
5457

@@ -71,6 +74,7 @@ class LogoutHelperTests : FunSpec({
7174
val mockOperationRepo = mockk<IOperationRepo>(relaxed = true)
7275
val mockConfigModel = mockk<ConfigModel>()
7376
every { mockConfigModel.appId } returns appId
77+
every { mockConfigModel.useIdentityVerification } returns false
7478
val logoutLock = Any()
7579

7680
val logoutHelper =
@@ -79,6 +83,7 @@ class LogoutHelperTests : FunSpec({
7983
userSwitcher = mockUserSwitcher,
8084
operationRepo = mockOperationRepo,
8185
configModel = mockConfigModel,
86+
subscriptionModelStore = mockk<SubscriptionModelStore>(relaxed = true),
8287
lock = logoutLock,
8388
)
8489

@@ -110,6 +115,7 @@ class LogoutHelperTests : FunSpec({
110115
val mockOperationRepo = mockk<IOperationRepo>(relaxed = true)
111116
val mockConfigModel = mockk<ConfigModel>()
112117
every { mockConfigModel.appId } returns appId
118+
every { mockConfigModel.useIdentityVerification } returns false
113119
val logoutLock = Any()
114120

115121
val logoutHelper =
@@ -118,6 +124,7 @@ class LogoutHelperTests : FunSpec({
118124
userSwitcher = mockUserSwitcher,
119125
operationRepo = mockOperationRepo,
120126
configModel = mockConfigModel,
127+
subscriptionModelStore = mockk<SubscriptionModelStore>(relaxed = true),
121128
lock = logoutLock,
122129
)
123130

@@ -142,6 +149,7 @@ class LogoutHelperTests : FunSpec({
142149
val mockOperationRepo = mockk<IOperationRepo>(relaxed = true)
143150
val mockConfigModel = mockk<ConfigModel>()
144151
every { mockConfigModel.appId } returns appId
152+
every { mockConfigModel.useIdentityVerification } returns false
145153
val logoutLock = Any()
146154

147155
val logoutHelper =
@@ -150,6 +158,7 @@ class LogoutHelperTests : FunSpec({
150158
userSwitcher = mockUserSwitcher,
151159
operationRepo = mockOperationRepo,
152160
configModel = mockConfigModel,
161+
subscriptionModelStore = mockk<SubscriptionModelStore>(relaxed = true),
153162
lock = logoutLock,
154163
)
155164

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.onesignal.core.internal.time.impl.Time
66
import com.onesignal.debug.LogLevel
77
import com.onesignal.debug.internal.logging.Logging
88
import com.onesignal.mocks.MockHelper
9+
import com.onesignal.user.internal.identity.JwtTokenStore
910
import com.onesignal.user.internal.operations.ExecutorMocks
1011
import com.onesignal.user.internal.operations.LoginUserOperation
1112
import io.kotest.core.spec.style.FunSpec
@@ -38,6 +39,8 @@ private class Mocks {
3839
configModelStore,
3940
Time(),
4041
ExecutorMocks.getNewRecordState(configModelStore),
42+
mockk<JwtTokenStore>(relaxed = true),
43+
MockHelper.identityModelStore(),
4144
),
4245
)
4346

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.onesignal.core.internal.operations.ExecutionResult
99
import com.onesignal.core.internal.operations.Operation
1010
import com.onesignal.mocks.MockHelper
1111
import com.onesignal.user.internal.customEvents.ICustomEventBackendService
12+
import com.onesignal.user.internal.identity.JwtTokenStore
1213
import com.onesignal.user.internal.operations.impl.executors.CustomEventOperationExecutor
1314
import io.kotest.core.spec.style.FunSpec
1415
import io.kotest.matchers.equals.shouldBeEqual
@@ -36,7 +37,7 @@ class CustomEventOperationExecutorTests : FunSpec({
3637
val properties = JSONObject().put("key", "value").toString()
3738

3839
val customEventOperationExecutor =
39-
CustomEventOperationExecutor(mockCustomEventBackendService, mockApplicationService, mockDeviceService)
40+
CustomEventOperationExecutor(mockCustomEventBackendService, mockApplicationService, mockDeviceService, mockk<JwtTokenStore>(relaxed = true))
4041
val operations = listOf<Operation>(TrackCustomEventOperation("appId", "onesignalId", null, 1, "event-name", properties))
4142

4243
// When

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import com.onesignal.user.internal.backend.IdentityConstants
1010
import com.onesignal.user.internal.builduser.IRebuildUserService
1111
import com.onesignal.user.internal.identity.IdentityModel
1212
import com.onesignal.user.internal.identity.IdentityModelStore
13+
import com.onesignal.user.internal.identity.JwtTokenStore
1314
import com.onesignal.user.internal.operations.ExecutorMocks.Companion.getNewRecordState
1415
import com.onesignal.user.internal.operations.impl.executors.IdentityOperationExecutor
1516
import io.kotest.core.spec.style.FunSpec
@@ -39,7 +40,7 @@ class IdentityOperationExecutorTests : FunSpec({
3940
val mockBuildUserService = mockk<IRebuildUserService>()
4041

4142
val identityOperationExecutor =
42-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
43+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
4344
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
4445

4546
// When
@@ -69,7 +70,7 @@ class IdentityOperationExecutorTests : FunSpec({
6970
val mockBuildUserService = mockk<IRebuildUserService>()
7071

7172
val identityOperationExecutor =
72-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
73+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
7374
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
7475

7576
// When
@@ -90,7 +91,7 @@ class IdentityOperationExecutorTests : FunSpec({
9091
val mockBuildUserService = mockk<IRebuildUserService>()
9192

9293
val identityOperationExecutor =
93-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
94+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
9495
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
9596

9697
// When
@@ -111,7 +112,7 @@ class IdentityOperationExecutorTests : FunSpec({
111112
every { mockBuildUserService.getRebuildOperationsIfCurrentUser(any(), any()) } returns null
112113

113114
val identityOperationExecutor =
114-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
115+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
115116
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
116117

117118
// When
@@ -134,7 +135,7 @@ class IdentityOperationExecutorTests : FunSpec({
134135
val mockConfigModelStore = MockHelper.configModelStore().also { it.model.opRepoPostCreateRetryUpTo = 1_000 }
135136
val newRecordState = getNewRecordState(mockConfigModelStore).also { it.add("onesignalId") }
136137
val identityOperationExecutor =
137-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, newRecordState)
138+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, newRecordState, mockConfigModelStore, mockk<JwtTokenStore>(relaxed = true))
138139
val operations = listOf<Operation>(SetAliasOperation("appId", "onesignalId", "aliasKey1", "aliasValue1"))
139140

140141
// When
@@ -160,7 +161,7 @@ class IdentityOperationExecutorTests : FunSpec({
160161
val mockBuildUserService = mockk<IRebuildUserService>()
161162

162163
val identityOperationExecutor =
163-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
164+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
164165
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
165166

166167
// When
@@ -183,7 +184,7 @@ class IdentityOperationExecutorTests : FunSpec({
183184
val mockBuildUserService = mockk<IRebuildUserService>()
184185

185186
val identityOperationExecutor =
186-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
187+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
187188
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
188189

189190
// When
@@ -203,7 +204,7 @@ class IdentityOperationExecutorTests : FunSpec({
203204
val mockBuildUserService = mockk<IRebuildUserService>()
204205

205206
val identityOperationExecutor =
206-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
207+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
207208
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
208209

209210
// When
@@ -225,7 +226,7 @@ class IdentityOperationExecutorTests : FunSpec({
225226
val mockBuildUserService = mockk<IRebuildUserService>()
226227

227228
val identityOperationExecutor =
228-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState())
229+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, getNewRecordState(), MockHelper.configModelStore(), mockk<JwtTokenStore>(relaxed = true))
229230
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
230231

231232
// When
@@ -250,7 +251,7 @@ class IdentityOperationExecutorTests : FunSpec({
250251
val mockConfigModelStore = MockHelper.configModelStore().also { it.model.opRepoPostCreateRetryUpTo = 1_000 }
251252
val newRecordState = getNewRecordState(mockConfigModelStore).also { it.add("onesignalId") }
252253
val identityOperationExecutor =
253-
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, newRecordState)
254+
IdentityOperationExecutor(mockIdentityBackendService, mockIdentityModelStore, mockBuildUserService, newRecordState, mockConfigModelStore, mockk<JwtTokenStore>(relaxed = true))
254255
val operations = listOf<Operation>(DeleteAliasOperation("appId", "onesignalId", "aliasKey1"))
255256

256257
// When

0 commit comments

Comments
 (0)