Move Firebase cleanup into function instead of AfterTest

Author: michaelprichardson

firebase-database/build.gradle.kts

@@ -106,14 +106,14 @@ kotlin {
         nodejs {
             testTask {
                 useMocha {
-                    timeout = "5s"
+                    timeout = "15s"
                 }
             }
         }
         browser {
             testTask {
                 useMocha {
-                    timeout = "5s"
+                    timeout = "15s"
                 }
             }
         }

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

@@ -12,7 +12,7 @@ expect fun runTest(test: suspend () -> Unit)
 class FirebaseDatabaseTest {
 
     @Serializable
-    data class DatabaseTest(val prop: String, val likes: Int = 0)
+    data class DatabaseTest(val title: String, val likes: Int = 0)
 
     @BeforeTest
     fun initializeFirebase() {
@@ -34,51 +34,56 @@ class FirebaseDatabaseTest {
             }
     }
 
-    @AfterTest
-    fun tearDown() {
-        Firebase
-            .takeIf { Firebase.apps(context).isNotEmpty() }
-            ?.apply { app.delete() }
-    }
-
     @Test
     fun testBasicIncrementTransaction() = runTest {
-        val data = DatabaseTest("post1", 2)
+        val data = DatabaseTest("PostOne", 2)
         val userRef = Firebase.database.reference("users/user_1/post_id_1")
         setupDatabase(userRef, data, DatabaseTest.serializer())
 
         // Check database before transaction
         val userDocBefore = userRef.valueEvents.first().value(DatabaseTest.serializer())
-        assertEquals(data.prop, userDocBefore.prop)
+        assertEquals(data.title, userDocBefore.title)
         assertEquals(data.likes, userDocBefore.likes)
 
         // Run transaction
-        userRef.runTransaction(DatabaseTest.serializer()) { DatabaseTest(data.prop, it.likes + 1) }
+        val transactionSnapshot = userRef.runTransaction(DatabaseTest.serializer()) { DatabaseTest(data.title, it.likes + 1) }
+        val userDocAfter = transactionSnapshot.value(DatabaseTest.serializer())
 
         // Check the database after transaction
-        val userDocAfter = userRef.valueEvents.first().value(DatabaseTest.serializer())
-        assertEquals(data.prop, userDocAfter.prop)
-        assertEquals(data.likes, userDocAfter.likes + 1)
+        assertEquals(data.title, userDocAfter.title)
+        assertEquals(data.likes + 1, userDocAfter.likes)
+
+        // cleanUp Firebase
+        cleanUp()
     }
 
     @Test
     fun testBasicDecrementTransaction() = runTest {
-        val data = DatabaseTest("post2", 2)
+        val data = DatabaseTest("PostTwo", 2)
         val userRef = Firebase.database.reference("users/user_1/post_id_2")
         setupDatabase(userRef, data, DatabaseTest.serializer())
 
         // Check database before transaction
         val userDocBefore = userRef.valueEvents.first().value(DatabaseTest.serializer())
-        assertEquals(data.prop, userDocBefore.prop)
+        assertEquals(data.title, userDocBefore.title)
         assertEquals(data.likes, userDocBefore.likes)
 
         // Run transaction
-        userRef.runTransaction(DatabaseTest.serializer()) { DatabaseTest(data.prop, it.likes - 1) }
+        val transactionSnapshot = userRef.runTransaction(DatabaseTest.serializer()) { DatabaseTest(data.title, it.likes - 1) }
+        val userDocAfter = transactionSnapshot.value(DatabaseTest.serializer())
 
         // Check the database after transaction
-        val userDocAfter = userRef.valueEvents.first().value(DatabaseTest.serializer())
-        assertEquals(data.prop, userDocAfter.prop)
-        assertEquals(data.likes, userDocAfter.likes - 1)
+        assertEquals(data.title, userDocAfter.title)
+        assertEquals(data.likes - 1, userDocAfter.likes)
+
+        // cleanUp Firebase
+        cleanUp()
+    }
+
+    private fun cleanUp() {
+        Firebase
+            .takeIf { Firebase.apps(context).isNotEmpty() }
+            ?.apply { app.delete() }
     }
 
     private suspend fun <T> setupDatabase(ref: DatabaseReference, data: T, strategy: SerializationStrategy<T>) {