put tests in common test module

nbransby · nbransby · commit 878e04eb8360 · 2020-05-10T20:38:36.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -131,22 +131,22 @@ subprojects {
 
         dependencies {
             "commonMainImplementation"(kotlin("stdlib-common"))
-            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5-native-mt")
+            "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5")
             "jsMainImplementation"(kotlin("stdlib-js"))
-            "jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.4")
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
-            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.4")
-            "iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5-native-mt")
-            "iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.5-native-mt")
+            "jsMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.3.5")
+            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5")
+            "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.5")
+            "iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5")
+            "iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.5")
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
-            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5-native-mt")
-            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.5-native-mt")
+            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.5")
+            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.5")
             "jsTestImplementation"(kotlin("test-js"))
             "androidAndroidTestImplementation"(kotlin("test-junit"))
             "androidAndroidTestImplementation"("junit:junit:4.12")
             "androidAndroidTestImplementation"("androidx.test:core:1.2.0")
-            "androidAndroidTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
+            "androidAndroidTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5")
             "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.1")
             "androidAndroidTestImplementation"("androidx.test:runner:1.1.0")
         }
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -26,7 +26,7 @@
     "@gitlive/firebase-common": "0.1.0",
     "firebase": "7.14.0",
     "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.4"
+    "kotlinx-coroutines-core": "1.3.5"
   }
 }
 
diff --git a/firebase-auth/package.json b/firebase-auth/package.json
@@ -26,7 +26,7 @@
     "@gitlive/firebase-app": "0.1.0",
     "firebase": "7.14.0",
     "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.4"
+    "kotlinx-coroutines-core": "1.3.5"
   }
 }
 
diff --git a/firebase-auth/src/androidAndroidTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/androidAndroidTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -5,38 +5,9 @@
 @file:JvmName("tests")
 package dev.gitlive.firebase.auth
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
-import dev.gitlive.firebase.Firebase
-import dev.gitlive.firebase.FirebaseOptions
-import dev.gitlive.firebase.initialize
 import kotlinx.coroutines.runBlocking
-import org.junit.Before
-import org.junit.runner.RunWith
-import kotlin.test.assertEquals
 
-val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
+actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
 
-@RunWith(AndroidJUnit4::class)
-@SmallTest
-class FirebaseAuthTest {
-
-    @Before
-    fun initializeFirebase() {
-        Firebase.initialize(context, FirebaseOptions(
-            applicationId ="fir-kotlin-sdk",
-            apiKey = "AIzaSyDft_DSsVA7KPJj_GItUvMLjk6wbOdGBOs",
-            databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
-            storageBucket = "fir-kotlin-sdk.appspot.com",
-            projectId ="fir-kotlin-sdk"
-        ))
-
-    }
-
-    @org.junit.Test
-    fun testSignInWithUsernameAndPassword() = runBlocking {
-        val result = Firebase.auth.signInWithEmailAndPassword("test@test.com", "test123")
-        assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
-    }
-}
+actual fun runTest(test: suspend () -> Unit) = runBlocking { test() }
diff --git a/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/androidMain/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -22,7 +22,7 @@ actual class FirebaseAuth internal constructor(val android: com.google.firebase.
         get() = android.currentUser?.let { FirebaseUser(it) }
 
     actual suspend fun signInWithEmailAndPassword(email: String, password: String) =
-        AuthResult(android.signInWithCustomToken(email).await())
+        AuthResult(android.signInWithEmailAndPassword(email, password).await())
         //AuthResult(android.signInWithEmailAndPassword(email, password).await())
 
     actual suspend fun signInWithCustomToken(token: String) =
diff --git a/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/commonTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -8,29 +8,31 @@ import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.initialize
 import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.promise
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-//expect val context: Any
+expect val context: Any
+expect fun runTest(test: suspend () -> Unit)
 
 class FirebaseAuthTest {
 
     @BeforeTest
     fun initializeFirebase() {
-        Firebase.initialize(null, FirebaseOptions(
-            applicationId ="fir-kotlin-sdk",
-            apiKey = "AIzaSyDft_DSsVA7KPJj_GItUvMLjk6wbOdGBOs",
-            databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
-            storageBucket = "fir-kotlin-sdk.appspot.com",
-            projectId ="fir-kotlin-sdk"
-        ))
-
+        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"
+            )
+        )
     }
 
     @Test
-    fun testSignInWithUsernameAndPassword() = GlobalScope.promise {
+    fun testSignInWithUsernameAndPassword() = runTest {
         val result = Firebase.auth.signInWithEmailAndPassword("test@test.com", "test123")
         assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
     }
diff --git a/firebase-auth/src/iosTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/iosTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -4,44 +4,19 @@
 
 package dev.gitlive.firebase.auth
 
-import dev.gitlive.firebase.Firebase
-import dev.gitlive.firebase.FirebaseOptions
-import dev.gitlive.firebase.initialize
 import kotlinx.coroutines.*
 import platform.Foundation.*
-import kotlin.test.BeforeTest
-import kotlin.test.Test
-import kotlin.test.assertEquals
 
-class FirebaseAuthTest {
+actual val context: Any = Unit
 
-    @BeforeTest
-    fun initializeFirebase() {
-        Firebase.initialize(null, 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"
-        ))
+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()
     }
-
-    @Test
-    fun testSignInWithUsernameAndPassword() {
-        val auth = Firebase.auth
-        var done = false
-        lateinit var result: AuthResult
-        //GlobalScope.launch(Dispatchers.Unconfined) {
-        MainScope().launch {
-            result = auth.signInWithEmailAndPassword("test@test.com", "test123")
-            println("Stop the run, cant stop the run")
-            done = true
-        }
-        while (!done) {
-            println("LoopStart")
-            NSRunLoop.mainRunLoop.runMode(NSDefaultRunLoopMode, beforeDate = NSDate.create(timeInterval = 1.0, sinceDate = NSDate()))
-            println("LoopEnd")
-        }
-        assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
-    }
-}
+    testRun.await()
+}
diff --git a/firebase-auth/src/jsTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/jsTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.gitlive.firebase.auth
+
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.promise
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend () -> Unit) = GlobalScope.promise { test() }.unsafeCast<Unit>()
diff --git a/firebase-common/package.json b/firebase-common/package.json
@@ -25,7 +25,7 @@
   "dependencies": {
     "firebase": "7.14.0",
     "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.4",
+    "kotlinx-coroutines-core": "1.3.5",
     "kotlinx-serialization-kotlinx-serialization-runtime": "0.20.0"
   }
 }
diff --git a/firebase-database/package.json b/firebase-database/package.json
@@ -26,7 +26,7 @@
     "@gitlive/firebase-app": "0.1.0",
     "firebase": "7.14.0",
     "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.4"
+    "kotlinx-coroutines-core": "1.3.5"
   }
 }
 
diff --git a/firebase-firestore/package.json b/firebase-firestore/package.json
@@ -26,7 +26,7 @@
     "@gitlive/firebase-app": "0.1.0",
     "firebase": "7.14.0",
     "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.4"
+    "kotlinx-coroutines-core": "1.3.5"
   }
 }
 
diff --git a/firebase-functions/package.json b/firebase-functions/package.json
@@ -26,7 +26,7 @@
     "@gitlive/firebase-app": "0.1.0",
     "firebase": "7.14.0",
     "kotlin": "1.3.72",
-    "kotlinx-coroutines-core": "1.3.4"
+    "kotlinx-coroutines-core": "1.3.5"
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"@gitlive/firebase-common": "0.1.0",`
`27`	`27`	`"firebase": "7.14.0",`
`28`	`28`	`"kotlin": "1.3.72",`
`29`		`- "kotlinx-coroutines-core": "1.3.4"`
	`29`	`+ "kotlinx-coroutines-core": "1.3.5"`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"dependencies": {`
`26`	`26`	`"firebase": "7.14.0",`
`27`	`27`	`"kotlin": "1.3.72",`
`28`		`- "kotlinx-coroutines-core": "1.3.4",`
	`28`	`+ "kotlinx-coroutines-core": "1.3.5",`
`29`	`29`	`"kotlinx-serialization-kotlinx-serialization-runtime": "0.20.0"`
`30`	`30`	`}`
`31`	`31`	`}`