Adjusted tests to not use skip variable.

Added granular ios test skip

Author: Reedyuk

firebase-app/build.gradle.kts

@@ -58,7 +58,7 @@ kotlin {
     }
 
     val supportIosTarget = project.property("skipIosTarget") != "true"
-    val runIosTests = project.property("skipIosTests") != "true"
+    val runIosTests = project.property("firebase-app.skipIosTests") != "true"
 
     if (supportIosTarget) {
 

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

@@ -10,16 +10,10 @@ import kotlin.test.*
 
 expect val emulatorHost: String
 expect val context: Any
-expect fun runTest(skip: Boolean = false, test: suspend () -> Unit)
-expect val currentPlatform: Platform
-
-enum class Platform { Android, IOS, JS }
+expect fun runTest(test: suspend () -> Unit)
 
 class FirebaseAuthTest {
 
-    // Skip the tests on iOS simulator due keychain exceptions
-    private val skip = currentPlatform == Platform.IOS
-
     @BeforeTest
     fun initializeFirebase() {
         Firebase
@@ -41,14 +35,14 @@ class FirebaseAuthTest {
     }
 
     @Test
-    fun testSignInWithUsernameAndPassword() = runTest(skip) {
+    fun testSignInWithUsernameAndPassword() = runTest {
         val uid = getTestUid("[email protected]", "test123")
         val result = Firebase.auth.signInWithEmailAndPassword("[email protected]", "test123")
         assertEquals(uid, result.user!!.uid)
     }
 
     @Test
-    fun testCreateUserWithEmailAndPassword() = runTest(skip) {
+    fun testCreateUserWithEmailAndPassword() = runTest {
         val email = "test+${Random.nextInt(100000)}@test.com"
         val createResult = Firebase.auth.createUserWithEmailAndPassword(email, "test123")
         assertNotEquals(null, createResult.user?.uid)
@@ -63,7 +57,7 @@ class FirebaseAuthTest {
     }
 
     @Test
-    fun testFetchSignInMethods() = runTest(skip) {
+    fun testFetchSignInMethods() = runTest {
         val email = "test+${Random.nextInt(100000)}@test.com"
         var signInMethodResult = Firebase.auth.fetchSignInMethodsForEmail(email)
         assertEquals(emptyList(), signInMethodResult)
@@ -75,7 +69,7 @@ class FirebaseAuthTest {
     }
 
     @Test
-    fun testSendEmailVerification() = runTest(skip) {
+    fun testSendEmailVerification() = runTest {
         val email = "test+${Random.nextInt(100000)}@test.com"
         val createResult = Firebase.auth.createUserWithEmailAndPassword(email, "test123")
         assertNotEquals(null, createResult.user?.uid)
@@ -85,7 +79,7 @@ class FirebaseAuthTest {
     }
 
     @Test
-    fun sendPasswordResetEmail() = runTest(skip) {
+    fun sendPasswordResetEmail() = runTest {
         val email = "test+${Random.nextInt(100000)}@test.com"
         val createResult = Firebase.auth.createUserWithEmailAndPassword(email, "test123")
         assertNotEquals(null, createResult.user?.uid)
@@ -96,7 +90,7 @@ class FirebaseAuthTest {
     }
 
     @Test
-    fun testSignInWithCredential() = runTest(skip) {
+    fun testSignInWithCredential() = runTest {
         val uid = getTestUid("[email protected]", "test123")
         val credential = EmailAuthProvider.credential("[email protected]", "test123")
         val result = Firebase.auth.signInWithCredential(credential)

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

@@ -11,14 +11,7 @@ actual val emulatorHost: String = "localhost"
 
 actual val context: Any = Unit
 
-actual val currentPlatform: Platform = Platform.IOS
-
-actual fun runTest(skip: Boolean, test: suspend () -> Unit) = runBlocking {
-    if (skip) {
-        NSLog("Skip the test.")
-        return@runBlocking
-    }
-
+actual fun runTest(test: suspend () -> Unit) = runBlocking {
     val testRun = MainScope().async { test() }
     while (testRun.isActive) {
         NSRunLoop.mainRunLoop.runMode(

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

@@ -11,15 +11,8 @@ actual val emulatorHost: String = "localhost"
 
 actual val context: Any = Unit
 
-actual val currentPlatform: Platform = Platform.JS
-
-actual fun runTest(skip: Boolean, test: suspend () -> Unit) = GlobalScope
+actual fun runTest(test: suspend () -> Unit) = GlobalScope
     .promise {
-        if (skip) {
-            console.log("Skip the test.")
-            return@promise
-        }
-
         try {
             test()
         } catch (e: dynamic) {

firebase-common/build.gradle.kts

@@ -47,7 +47,7 @@ kotlin {
     }
 
     val supportIosTarget = project.property("skipIosTarget") != "true"
-    val runIosTests = project.property("skipIosTests") != "true"
+    val runIosTests = project.property("firebase-common.skipIosTests") != "true"
 
     if (supportIosTarget) {
         ios()

firebase-config/build.gradle.kts

@@ -70,7 +70,7 @@ kotlin {
     }
 
     val supportIosTarget = project.property("skipIosTarget") != "true"
-    val runIosTests = project.property("skipIosTests") != "true"
+    val runIosTests = project.property("firebase-config.skipIosTests") != "true"
 
     if (supportIosTarget) {
         fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {

firebase-database/build.gradle.kts

@@ -57,7 +57,7 @@ kotlin {
     }
 
     val supportIosTarget = project.property("skipIosTarget") != "true"
-    val runIosTests = project.property("skipIosTests") != "true"
+    val runIosTests = project.property("firebase-database.skipIosTests") != "true"
 
     if (supportIosTarget) {
         fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {

firebase-firestore/build.gradle.kts

@@ -60,7 +60,7 @@ kotlin {
     }
 
     val supportIosTarget = project.property("skipIosTarget") != "true"
-    val runIosTests = project.property("skipIosTests") != "true"
+    val runIosTests = project.property("firebase-firestore.skipIosTests") != "true"
 
     if (supportIosTarget) {
         fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {

firebase-functions/build.gradle.kts

@@ -52,7 +52,7 @@ kotlin {
     }
 
     val supportIosTarget = project.property("skipIosTarget") != "true"
-    val runIosTests = project.property("skipIosTests") != "true"
+    val runIosTests = project.property("firebase-functions.skipIosTests") != "true"
 
     if (supportIosTarget) {
         fun nativeTargetConfig(): KotlinNativeTarget.() -> Unit = {

gradle.properties

@@ -17,8 +17,16 @@ org.gradle.parallel=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 testOptions.unitTests.isIncludeAndroidResources=true
 
+# Set to true to skip tests and even compilation of the iOS target.
 skipIosTarget=false
-skipIosTests=false
+# Skip iOS Tests
+firebase-app.skipIosTests=false
+firebase-auth.skipIosTests=false
+firebase-common.skipIosTests=false
+firebase-database.skipIosTests=false
+firebase-firestore.skipIosTests=false
+firebase-functions.skipIosTests=false
+firebase-config.skipIosTests=false
 
 # Versions:
 firebase-app.version=1.4.2