chores: tests: replace or remove thread.sleep or delay in tests

Author: jinliu9508

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/common/threading/CompletionAwaiterTests.kt

@@ -115,9 +115,6 @@ class CompletionAwaiterTests : FunSpec({
                 jobs.add(thread)
             }
 
-            // Wait a bit to ensure all threads are waiting
-            Thread.sleep(100)
-
             // Complete the awaiter
             awaiter.complete()
 
@@ -257,9 +254,6 @@ class CompletionAwaiterTests : FunSpec({
                 }
             blockingThreads.forEach { it.start() }
 
-            // Wait a bit to ensure all are waiting
-            Thread.sleep(100)
-
             // Complete the awaiter
             awaiter.complete()
 

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/application/ApplicationServiceTests.kt

@@ -9,16 +9,19 @@ import com.onesignal.common.threading.suspendifyOnIO
 import com.onesignal.core.internal.application.impl.ApplicationService
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
+import com.onesignal.mocks.IOMockHelper
+import com.onesignal.mocks.IOMockHelper.awaitIO
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
 import io.mockk.spyk
 import io.mockk.verify
-import kotlinx.coroutines.delay
 import org.robolectric.Robolectric
 
 @RobolectricTest
 class ApplicationServiceTests : FunSpec({
 
+    listener(IOMockHelper)
+
     beforeAny {
         Logging.logLevel = LogLevel.NONE
     }
@@ -199,7 +202,7 @@ class ApplicationServiceTests : FunSpec({
             waiter.wake(response)
         }
 
-        delay(7000)
+        awaitIO(7_000)
 
         applicationService.onActivityStarted(activity)
         val response = waiter.waitForWake()
@@ -224,8 +227,6 @@ class ApplicationServiceTests : FunSpec({
             waiter.wake(response)
         }
 
-        delay(3000)
-
         applicationService.onActivityStarted(activity)
         val response = waiter.waitForWake()
 

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

@@ -77,7 +77,6 @@ private class Mocks {
 }
 
 class OperationRepoTests : FunSpec({
-
     beforeAny {
         Logging.logLevel = LogLevel.NONE
     }
@@ -133,13 +132,6 @@ class OperationRepoTests : FunSpec({
         // insertion from the main thread is done without blocking
         mainThread.join(500)
         mainThread.state shouldBe Thread.State.TERMINATED
-
-        // Wait for the async enqueue to complete (give it more time)
-        var attempts = 0
-        while (operationRepo.queue.size == 0 && attempts < 50) {
-            Thread.sleep(10)
-            attempts++
-        }
         operationRepo.queue.size shouldBe 1
 
         // after loading is completed, the cached operation should be at the beginning of the queue
@@ -166,13 +158,6 @@ class OperationRepoTests : FunSpec({
         operationRepo.start()
         operationRepo.enqueue(MyOperation())
 
-        // Wait for the async enqueue to complete
-        var attempts = 0
-        while (!operationRepo.containsInstanceOf<MyOperation>() && attempts < 50) {
-            Thread.sleep(10)
-            attempts++
-        }
-
         // Then
         operationRepo.containsInstanceOf<MyOperation>() shouldBe true
         operationRepo.containsInstanceOf<MyOperation2>() shouldBe false
@@ -276,7 +261,7 @@ class OperationRepoTests : FunSpec({
         // When
         opRepo.start()
         opRepo.enqueue(mockOperation())
-        Thread.sleep(200) // Give time for the operation to be processed and retry delay to be set
+
         val response1 =
             withTimeoutOrNull(500) {
                 opRepo.enqueueAndWait(mockOperation())
@@ -751,13 +736,6 @@ class OperationRepoTests : FunSpec({
         val op = mockOperation()
         mocks.operationRepo.enqueue(op)
 
-        // Wait for the async enqueue to complete
-        var attempts = 0
-        while (mocks.operationRepo.queue.size == 0 && attempts < 50) {
-            Thread.sleep(10)
-            attempts++
-        }
-
         // When
         mocks.operationRepo.loadSavedOperations()
 
@@ -797,7 +775,6 @@ class OperationRepoTests : FunSpec({
         // When
         opRepo.start()
         opRepo.enqueue(mockOperation())
-        Thread.sleep(100) // Give time for the operation to be processed and retry delay to be set
         val response1 =
             withTimeoutOrNull(999) {
                 opRepo.enqueueAndWait(mockOperation())
@@ -876,23 +853,6 @@ class OperationRepoTests : FunSpec({
         mocks.operationRepo.enqueue(groupableOp1) // This needs translation
         mocks.operationRepo.enqueueAndWait(groupableOp2) // This doesn't need translation but should be grouped
 
-        // Wait for all critical async operations to complete
-        // We need: execute-translation-source, translate-groupable-1, execute-grouped-operations
-        var attempts = 0
-        val maxAttempts = 200 // Increased timeout for CI/CD environments (200 * 20ms = 4 seconds)
-        while (attempts < maxAttempts) {
-            val hasTranslationSource = executionOrder.contains("execute-translation-source")
-            val hasTranslation = executionOrder.contains("translate-groupable-1")
-            val hasGroupedExecution = executionOrder.contains("execute-grouped-operations")
-
-            if (hasTranslationSource && hasTranslation && hasGroupedExecution) {
-                break // All critical events have occurred
-            }
-
-            Thread.sleep(20)
-            attempts++
-        }
-
         // Then verify the critical execution order
         executionOrder.size shouldBeGreaterThan 2 // At minimum: Translation source + translation + grouped execution (>= 3)
 
@@ -964,7 +924,6 @@ class OperationRepoTests : FunSpec({
             val executeWaiter = WaiterWithValue<Boolean>()
             coEvery { opRepo.executeOperations(any()) } coAnswers {
                 executeWaiter.wake(true)
-                delay(10)
                 firstArg<List<OperationRepo.OperationQueueItem>>().forEach { it.waiter?.wake(true) }
             }
             return executeWaiter

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/preferences/PreferencesServiceTests.kt

@@ -7,11 +7,12 @@ import com.onesignal.core.internal.preferences.impl.PreferencesService
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.mocks.AndroidMockHelper
+import com.onesignal.mocks.IOMockHelper
+import com.onesignal.mocks.IOMockHelper.awaitIO
 import com.onesignal.mocks.MockHelper
 import io.kotest.assertions.throwables.shouldThrowUnit
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
-import kotlinx.coroutines.delay
 
 @RobolectricTest
 class PreferencesServiceTests : FunSpec({
@@ -22,6 +23,8 @@ class PreferencesServiceTests : FunSpec({
     val mockStringPrefStoreKey = "mock-string"
     val mockStringSetPrefStoreKey = "mock-string-set"
 
+    listener(IOMockHelper)
+
     beforeAny {
         Logging.logLevel = LogLevel.NONE
     }
@@ -182,7 +185,7 @@ class PreferencesServiceTests : FunSpec({
         preferencesService.saveStringSet(mockPrefStoreName, mockStringSetPrefStoreKey, setOf("default1", "default2"))
         preferencesService.start()
 
-        delay(1000)
+        awaitIO()
 
         val store =
             ApplicationProvider.getApplicationContext<Context>().getSharedPreferences(
@@ -219,7 +222,7 @@ class PreferencesServiceTests : FunSpec({
         preferencesService.saveStringSet(mockPrefStoreName, mockStringSetPrefStoreKey, null)
         preferencesService.start()
 
-        delay(1000)
+        awaitIO()
 
         // Then
         store.contains(mockBoolPrefStoreKey) shouldBe false

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/startup/StartupServiceTests.kt

@@ -4,6 +4,8 @@ import com.onesignal.common.services.ServiceBuilder
 import com.onesignal.common.services.ServiceProvider
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
+import com.onesignal.mocks.IOMockHelper
+import com.onesignal.mocks.IOMockHelper.awaitIO
 import io.kotest.assertions.throwables.shouldThrowUnit
 import io.kotest.core.spec.style.FunSpec
 import io.kotest.matchers.shouldBe
@@ -26,6 +28,8 @@ class StartupServiceTests : FunSpec({
         return serviceBuilder.build()
     }
 
+    listener(IOMockHelper)
+
     beforeAny {
         Logging.logLevel = LogLevel.NONE
     }
@@ -88,7 +92,7 @@ class StartupServiceTests : FunSpec({
         startupService.scheduleStart()
 
         // Then
-        Thread.sleep(10)
+        awaitIO()
         verify(exactly = 1) { mockStartupService1.start() }
         verify(exactly = 1) { mockStartupService2.start() }
     }
@@ -106,7 +110,7 @@ class StartupServiceTests : FunSpec({
         mockStartableService3.start()
 
         // Then
-        Thread.sleep(10)
+        awaitIO()
         coVerifyOrder {
             // service3 will call start() first even though service1 and service2 are scheduled first
             mockStartableService3.start()

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/session/internal/outcomes/OutcomeEventsControllerTests.kt

@@ -4,6 +4,8 @@ import com.onesignal.common.exceptions.BackendException
 import com.onesignal.common.threading.Waiter
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
+import com.onesignal.mocks.IOMockHelper
+import com.onesignal.mocks.IOMockHelper.awaitIO
 import com.onesignal.mocks.MockHelper
 import com.onesignal.session.internal.influence.IInfluenceManager
 import com.onesignal.session.internal.influence.Influence
@@ -32,10 +34,12 @@ import io.mockk.just
 import io.mockk.mockk
 import io.mockk.runs
 import io.mockk.spyk
-import kotlinx.coroutines.delay
 import org.json.JSONArray
 
 class OutcomeEventsControllerTests : FunSpec({
+
+    listener(IOMockHelper)
+
     beforeAny {
         Logging.logLevel = LogLevel.NONE
     }
@@ -595,7 +599,7 @@ class OutcomeEventsControllerTests : FunSpec({
         // When
         outcomeEventsController.start()
 
-        delay(1000)
+        awaitIO()
 
         // Then
         coVerify(exactly = 1) {
@@ -687,7 +691,7 @@ class OutcomeEventsControllerTests : FunSpec({
         // When
         outcomeEventsController.start()
 
-        delay(1000)
+        awaitIO()
 
         // Then
         coVerify(exactly = 1) {
@@ -763,7 +767,7 @@ class OutcomeEventsControllerTests : FunSpec({
 
         // When
         outcomeEventsController.start()
-        delay(1000)
+        awaitIO()
 
         // Then
         coVerify(exactly = 1) {

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

@@ -5,6 +5,8 @@ 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.IOMockHelper
+import com.onesignal.mocks.IOMockHelper.awaitIO
 import com.onesignal.mocks.MockHelper
 import com.onesignal.user.internal.operations.ExecutorMocks
 import com.onesignal.user.internal.operations.LoginUserOperation
@@ -16,7 +18,6 @@ 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 {
@@ -76,6 +77,9 @@ private class Mocks {
 }
 
 class RecoverFromDroppedLoginBugTests : FunSpec({
+
+    listener(IOMockHelper)
+
     beforeAny {
         Logging.logLevel = LogLevel.NONE
     }
@@ -100,7 +104,7 @@ class RecoverFromDroppedLoginBugTests : FunSpec({
         // When
         mocks.operationRepo.start()
         // give operation repo some time to fully initialize
-        delay(200)
+        awaitIO()
 
         mocks.recovery.start()
         withTimeout(1_000) { mocks.operationRepo.awaitInitialized() }