-
Notifications
You must be signed in to change notification settings - Fork 368
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2084 from OneSignal/fix/RecoverFromDroppedLoginBu…
…gTests-not-running-in-very-rare-cases [Fix] RecoverFromDroppedLoginBug not running in very rare cases
- Loading branch information
Showing
6 changed files
with
115 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 0 additions & 5 deletions
5
...core/src/main/java/com/onesignal/core/internal/operations/IOperationRepoLoadedListener.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 88 additions & 35 deletions
123
...e/src/test/java/com/onesignal/user/internal/migrations/RecoverFromDroppedLoginBugTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,111 @@ | ||
| package com.onesignal.user.internal.migrations | ||
|
|
||
| import com.onesignal.common.threading.Waiter | ||
| import com.onesignal.core.internal.config.ConfigModelStore | ||
| import com.onesignal.core.internal.operations.IOperationRepoLoadedListener | ||
| import com.onesignal.core.internal.operations.impl.OperationModelStore | ||
| import com.onesignal.core.internal.operations.impl.OperationRepo | ||
| import com.onesignal.core.internal.time.impl.Time | ||
| import com.onesignal.debug.LogLevel | ||
| import com.onesignal.debug.internal.logging.Logging | ||
| import com.onesignal.mocks.MockHelper | ||
| import com.onesignal.user.internal.operations.ExecutorMocks | ||
| import com.onesignal.user.internal.operations.LoginUserOperation | ||
| import io.kotest.core.spec.style.FunSpec | ||
| import io.kotest.matchers.shouldBe | ||
| import io.mockk.every | ||
| import io.mockk.just | ||
| import io.mockk.mockk | ||
| import io.mockk.runs | ||
| import io.mockk.spyk | ||
| import io.mockk.verify | ||
| import kotlinx.coroutines.delay | ||
| import kotlinx.coroutines.withTimeout | ||
|
|
||
| private class Mocks { | ||
| val operationModelStore: OperationModelStore = | ||
| run { | ||
| val mockOperationModelStore = mockk<OperationModelStore>() | ||
| every { mockOperationModelStore.loadOperations() } just runs | ||
| every { mockOperationModelStore.list() } returns listOf() | ||
| every { mockOperationModelStore.add(any()) } just runs | ||
| every { mockOperationModelStore.remove(any()) } just runs | ||
| mockOperationModelStore | ||
| } | ||
| val configModelStore = MockHelper.configModelStore() | ||
| val operationRepo = | ||
| spyk( | ||
| OperationRepo( | ||
| listOf(), | ||
| operationModelStore, | ||
| configModelStore, | ||
| Time(), | ||
| ExecutorMocks.getNewRecordState(configModelStore), | ||
| ), | ||
| ) | ||
|
|
||
| var oneSignalId = "local-id" | ||
| val identityModelStore by lazy { | ||
| MockHelper.identityModelStore { | ||
| it.onesignalId = oneSignalId | ||
| it.externalId = "myExtId" | ||
| } | ||
| } | ||
| val recovery = spyk(RecoverFromDroppedLoginBug(operationRepo, identityModelStore, configModelStore)) | ||
|
|
||
| val expectedOperation by lazy { | ||
| LoginUserOperation( | ||
| configModelStore.model.appId, | ||
| identityModelStore.model.onesignalId, | ||
| identityModelStore.model.externalId, | ||
| null, | ||
| ) | ||
| } | ||
|
|
||
| fun verifyExpectedLoginOperation(expectedOp: LoginUserOperation = expectedOperation) { | ||
| verify(exactly = 1) { | ||
| operationRepo.enqueue( | ||
| withArg { | ||
| (it is LoginUserOperation) shouldBe true | ||
| val op = it as LoginUserOperation | ||
| op.appId shouldBe expectedOp.appId | ||
| op.externalId shouldBe expectedOp.externalId | ||
| op.existingOnesignalId shouldBe expectedOp.existingOnesignalId | ||
| op.onesignalId shouldBe expectedOp.onesignalId | ||
| }, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| class RecoverFromDroppedLoginBugTests : FunSpec({ | ||
| test("ensure RecoverFromDroppedLoginBug receive onOperationRepoLoaded callback from operationRepo") { | ||
| beforeAny { | ||
| Logging.logLevel = LogLevel.NONE | ||
| } | ||
|
|
||
| test("ensure it adds missing operation") { | ||
| // Given | ||
| val mockOperationModelStore = mockk<OperationModelStore>() | ||
| val mockConfigModelStore = mockk<ConfigModelStore>() | ||
| val operationRepo = | ||
| spyk( | ||
| OperationRepo( | ||
| listOf(), | ||
| mockOperationModelStore, | ||
| mockConfigModelStore, | ||
| Time(), | ||
| ExecutorMocks.getNewRecordState(mockConfigModelStore), | ||
| ), | ||
| ) | ||
| every { mockOperationModelStore.loadOperations() } just runs | ||
| every { mockOperationModelStore.list() } returns listOf() | ||
| val recovery = spyk(RecoverFromDroppedLoginBug(operationRepo, MockHelper.identityModelStore(), mockConfigModelStore)) | ||
| val mocks = Mocks() | ||
|
|
||
| // When | ||
| recovery.start() | ||
| val waiter = Waiter() | ||
| operationRepo.addOperationLoadedListener( | ||
| object : IOperationRepoLoadedListener { | ||
| override fun onOperationRepoLoaded() { | ||
| waiter.wake() | ||
| } | ||
| }, | ||
| ) | ||
| operationRepo.start() | ||
| // Waiting here ensures recovery.onOperationRepoLoaded() is called consistently | ||
| waiter.waitForWake() | ||
| mocks.recovery.start() | ||
| mocks.operationRepo.start() | ||
| mocks.operationRepo.awaitInitialized() | ||
|
|
||
| // Then | ||
| verify(exactly = 1) { | ||
| operationRepo.subscribe(recovery) | ||
| recovery.onOperationRepoLoaded() | ||
| } | ||
| mocks.verifyExpectedLoginOperation() | ||
| } | ||
|
|
||
| test("ensure it adds missing operation, even if operationRepo is already initialized") { | ||
| // Given | ||
| val mocks = Mocks() | ||
|
|
||
| // When | ||
| mocks.operationRepo.start() | ||
| // give operation repo some time to fully initialize | ||
| delay(200) | ||
|
|
||
| mocks.recovery.start() | ||
| withTimeout(1_000) { mocks.operationRepo.awaitInitialized() } | ||
|
|
||
| // Then | ||
| mocks.verifyExpectedLoginOperation() | ||
| } | ||
| }) |