Better test cleanup

Author: Daeda88

build.gradle.kts

@@ -115,8 +115,6 @@ subprojects {
             "androidMainImplementation"(platform("com.google.firebase:firebase-bom:$firebaseBoMVersion"))
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
-            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
             if (this@afterEvaluate.name != "firebase-crashlytics") {
                 "jvmMainApi"("dev.gitlive:firebase-java-sdk:0.1.1")
                 "jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion") {

firebase-app/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -9,6 +9,5 @@ import androidx.test.platform.app.InstrumentationRegistry
 
 actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
 
-actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest

firebase-app/src/androidMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -35,7 +35,7 @@ actual class FirebaseApp internal constructor(val android: com.google.firebase.F
     actual val options: FirebaseOptions
         get() = android.options.run { FirebaseOptions(applicationId, apiKey, databaseUrl, gaTrackingId, storageBucket, projectId) }
 
-    actual fun delete() = android.delete()
+    actual suspend fun delete() = android.delete()
 }
 
 actual fun Firebase.apps(context: Any?) = com.google.firebase.FirebaseApp.getApps(context as Context)

firebase-app/src/androidUnitTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -9,8 +9,6 @@ import org.junit.Ignore
 
 actual val context: Any = ""
 
-actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
-
 // Tests are to be run on AndroidInstrumentedTests.
 // Kotlin 1.8 does not allow us to remove the commonTest dependency from AndroidUnitTest
 // Therefore we just wont run them

firebase-app/src/commonMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -19,7 +19,7 @@ object Firebase
 expect class FirebaseApp {
     val name: String
     val options: FirebaseOptions
-    fun delete()
+    suspend fun delete()
 }
 
 /** Returns the default firebase app instance. */

firebase-app/src/commonTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -4,23 +4,15 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 expect val context: Any
-expect fun runTest(test: suspend () -> Unit)
 expect annotation class IgnoreForAndroidUnitTest()
 
 @IgnoreForAndroidUnitTest
 class FirebaseAppTest {
     @Test
-    fun testInitialize() {
+    fun testInitialize() = runTest {
         Firebase.initialize(
             context,
-            FirebaseOptions(
-                applicationId = "1:846484016111:ios:dd1f6688bad7af768c841a",
-                apiKey = "AIzaSyCK87dcMFhzCz_kJVs2cT2AVlqOTLuyWV0",
-                databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
-                storageBucket = "fir-kotlin-sdk.appspot.com",
-                projectId = "fir-kotlin-sdk",
-                gcmSenderId = "846484016111"
-            )
+            firebaseOptions
         )
 
         assertEquals(1, Firebase.apps(context).size)

firebase-app/src/iosMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -33,7 +33,11 @@ actual class FirebaseApp internal constructor(val ios: FIRApp) {
     actual val options: FirebaseOptions
         get() = ios.options.run { FirebaseOptions(bundleID, APIKey!!, databaseURL!!, trackingID, storageBucket, projectID) }
 
-    actual fun delete() { }
+    actual suspend fun delete() {
+        val deleted = CompletableDeferred<Unit>()
+        ios.deleteApp { deleted.complete(Unit) }
+        deleted.await()
+    }
 }
 
 actual fun Firebase.apps(context: Any?) = FIRApp.allApps()

firebase-app/src/iosTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -4,22 +4,7 @@
 
 package dev.gitlive.firebase
 
-import kotlinx.coroutines.*
-import platform.Foundation.*
-
 actual val context: Any = Unit
 
-actual fun runTest(test: suspend () -> Unit) = runBlocking {
-    val testRun = MainScope().async { test() }
-    while (testRun.isActive) {
-        NSRunLoop.mainRunLoop.runMode(
-            NSDefaultRunLoopMode,
-            beforeDate = NSDate.create(timeInterval = 1.0, sinceDate = NSDate())
-        )
-        yield()
-    }
-    testRun.await()
-}
-
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest

firebase-app/src/jsMain/kotlin/dev/gitlive/firebase/firebase.kt

@@ -34,7 +34,7 @@ actual class FirebaseApp internal constructor(val js: JsFirebaseApp) {
             FirebaseOptions(appId, apiKey, databaseURL, gaTrackingId, storageBucket, projectId, messagingSenderId, authDomain)
         }
 
-    actual fun delete() {
+    actual suspend fun delete() {
         deleteApp(js)
     }
 }

firebase-app/src/jsTest/kotlin/dev/gitlive/firebase/firebase.kt

@@ -4,14 +4,7 @@
 
 package dev.gitlive.firebase
 
-import kotlinx.coroutines.test.runTest
-import kotlin.time.Duration.Companion.minutes
-
 actual val context: Any = Unit
 
-actual fun runTest(test: suspend () -> Unit) {
-    runTest(timeout = 5.minutes) { test() }
-}
-
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest