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/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

@@ -5,6 +5,7 @@ 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
@@ -89,9 +90,9 @@ class StartupServiceTests : FunSpec({
 
         // When
         startupService.scheduleStart()
+        awaitIO()
 
         // Then
-        Thread.sleep(10)
         verify(exactly = 1) { mockStartupService1.start() }
         verify(exactly = 1) { mockStartupService2.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() }