get tests building

nbransby · nbransby · commit f9d77ba857fc · 2023-08-27T22:03:41.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -107,10 +107,6 @@ subprojects {
     afterEvaluate  {
 
         dependencies {
-            "jvmMainApi"("dev.gitlive:firebase-java-sdk:0.1.1")
-            "jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.0") {
-                exclude("com.google.android.gms")
-            }
             "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
             "androidMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
             "androidMainImplementation"(platform("com.google.firebase:firebase-bom:31.4.0"))
@@ -119,7 +115,13 @@ subprojects {
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
             "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
             if (this@afterEvaluate.name != "firebase-crashlytics") {
+                "jvmMainApi"("dev.gitlive:firebase-java-sdk:0.1.1")
+                "jvmMainApi"("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.0") {
+                    exclude("com.google.android.gms")
+                }
                 "jsTestImplementation"(kotlin("test-js"))
+                "jvmTestImplementation"(kotlin("test-junit"))
+                "jvmTestImplementation"("junit:junit:4.13.2")
             }
             "androidAndroidTestImplementation"(kotlin("test-junit"))
             "androidAndroidTestImplementation"("junit:junit:4.13.2")
diff --git a/firebase-app/package.json b/firebase-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gitlive/firebase-app",
-  "version": "1.8.2",
+  "version": "1.9.2",
   "description": "Wrapper around firebase for usage in Kotlin Multiplatform projects",
   "main": "firebase-app.js",
   "scripts": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/GitLiveApp/firebase-kotlin-sdk",
   "dependencies": {
-    "@gitlive/firebase-common": "1.8.2",
+    "@gitlive/firebase-common": "1.9.2",
     "firebase": "9.19.1",
     "kotlin": "1.8.20",
     "kotlinx-coroutines-core": "1.6.4"
diff --git a/firebase-app/src/jvmTest/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/jvmTest/kotlin/dev/gitlive/firebase/firebase.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -35,7 +35,7 @@ android {
         getByName("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
-        getByName("androidTest"){
+        getByName("androidTest") {
             java.srcDir(file("src/androidAndroidTest/kotlin"))
             manifest.srcFile("src/androidAndroidTest/AndroidManifest.xml")
         }
@@ -139,6 +139,7 @@ kotlin {
                 api("com.google.firebase:firebase-auth")
             }
         }
+
         val jvmMain by getting {
             kotlin.srcDir("src/androidMain/kotlin")
         }
diff --git a/firebase-auth/src/jvmTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/jvmTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.auth
+
+
+actual val emulatorHost: String = "10.0.2.2"
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -23,7 +23,10 @@ android {
         getByName("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
-        getByName("androidTest").java.srcDir(file("src/androidAndroidTest/kotlin"))
+        getByName("androidTest") {
+            java.srcDir(file("src/androidAndroidTest/kotlin"))
+            manifest.srcFile("src/androidAndroidTest/AndroidManifest.xml")
+        }
     }
     testOptions {
         unitTests.apply {
@@ -105,6 +108,7 @@ kotlin {
 
         val commonTest by getting {
             dependencies {
+                implementation(project(":test-utils"))
             }
         }
 
diff --git a/firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt b/firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt
@@ -10,6 +10,8 @@ import kotlinx.serialization.builtins.ListSerializer
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
+import dev.gitlive.firebase.nativeAssertEquals
+import dev.gitlive.firebase.nativeMapOf
 
 @Serializable
 data class TestData(val map: Map<String, String>, val bool: Boolean = false, val nullableBool: Boolean? = null)
diff --git a/firebase-config/src/jvmTest/kotlin/dev/gitlive/firebase/remoteconfig/RemoteConfig.kt b/firebase-config/src/jvmTest/kotlin/dev/gitlive/firebase/remoteconfig/RemoteConfig.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.remoteconfig
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
diff --git a/firebase-crashlytics/build.gradle.kts b/firebase-crashlytics/build.gradle.kts
@@ -22,7 +22,7 @@ android {
         getByName("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
-        getByName("androidTest"){
+        getByName("androidTest") {
             java.srcDir(file("src/androidAndroidTest/kotlin"))
             manifest.srcFile("src/androidAndroidTest/AndroidManifest.xml")
         }
@@ -50,18 +50,18 @@ kotlin {
         publishAllLibraryVariants()
     }
 
-    jvm {
-        val main by compilations.getting {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-        val test by compilations.getting {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
+//    jvm {
+//        val main by compilations.getting {
+//            kotlinOptions {
+//                jvmTarget = "17"
+//            }
+//        }
+//        val test by compilations.getting {
+//            kotlinOptions {
+//                jvmTarget = "17"
+//            }
+//        }
+//    }
 
     if (supportIosTarget) {
         ios()
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -56,6 +56,11 @@ kotlin {
                 jvmTarget = "17"
             }
         }
+        val test by compilations.getting {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
     }
 
     if (supportIosTarget) {
diff --git a/firebase-database/src/jvmTest/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/jvmTest/kotlin/dev/gitlive/firebase/database/database.kt
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.database
+
+
+actual val emulatorHost: String = "10.0.2.2"
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend () -> Unit) = kotlinx.coroutines.test.runTest { test() }
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -116,6 +116,12 @@ kotlin {
             }
         }
 
+        val commonTest by getting {
+            dependencies {
+                implementation(project(":test-utils"))
+            }
+        }
+
         val androidMain by getting {
             dependencies {
                 api("com.google.firebase:firebase-firestore")
@@ -126,12 +132,6 @@ kotlin {
             kotlin.srcDir("src/androidMain/kotlin")
         }
 
-        val jvmTest by getting {
-            dependencies {
-                implementation(kotlin("test-junit"))
-            }
-            kotlin.srcDir("src/androidAndroidTest/kotlin")
-        }
 
         if (supportIosTarget) {
             val iosMain by getting
diff --git a/firebase-firestore/src/jvmTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/jvmTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.firestore
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.runBlocking
+
+actual val emulatorHost: String = "10.0.2.2"
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend CoroutineScope.() -> Unit) = runBlocking { test() }
diff --git a/firebase-perf/src/jvmTest/kotlin/dev/gitlive/firebase/perf/performance.kt b/firebase-perf/src/jvmTest/kotlin/dev/gitlive/firebase/perf/performance.kt
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.perf
+
+import kotlinx.coroutines.CoroutineScope
+
+actual val emulatorHost: String = "10.0.2.2"
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend CoroutineScope.() -> Unit) = kotlinx.coroutines.test.runTest { test() }
diff --git a/firebase-storage/src/jvmTest/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/jvmTest/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.storage
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.runBlocking
+
+actual val emulatorHost: String = "10.0.2.2"
+
+actual val context: Any = Unit
+
+actual fun runTest(test: suspend CoroutineScope.() -> Unit) = runBlocking { test() }
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -81,6 +81,10 @@ kotlin {
             }
         }
 
+        val jvmMain by getting {
+            kotlin.srcDir("src/androidMain/kotlin")
+        }
+
         if (supportIosTarget) {
             val iosMain by getting
             val iosSimulatorArm64Main by getting
@@ -90,6 +94,10 @@ kotlin {
             iosSimulatorArm64Test.dependsOn(iosTest)
         }
 
-        val jsMain by getting
+        val jsMain by getting {
+            dependencies {
+                implementation(kotlin("test-js"))
+            }
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ android {`
`35`	`35`	`getByName("main") {`
`36`	`36`	`manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`37`	`37`	`}`
`38`		`- getByName("androidTest"){`
	`38`	`+ getByName("androidTest") {`
`39`	`39`	`java.srcDir(file("src/androidAndroidTest/kotlin"))`
`40`	`40`	`manifest.srcFile("src/androidAndroidTest/AndroidManifest.xml")`
`41`	`41`	`}`
`@@ -139,6 +139,7 @@ kotlin {`
`139`	`139`	`api("com.google.firebase:firebase-auth")`
`140`	`140`	`}`
`141`	`141`	`}`
	`142`	`+`
`142`	`143`	`val jvmMain by getting {`
`143`	`144`	`kotlin.srcDir("src/androidMain/kotlin")`
`144`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,10 @@ android {`
`23`	`23`	`getByName("main") {`
`24`	`24`	`manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`25`	`25`	`}`
`26`		`- getByName("androidTest").java.srcDir(file("src/androidAndroidTest/kotlin"))`
	`26`	`+ getByName("androidTest") {`
	`27`	`+ java.srcDir(file("src/androidAndroidTest/kotlin"))`
	`28`	`+ manifest.srcFile("src/androidAndroidTest/AndroidManifest.xml")`
	`29`	`+ }`
`27`	`30`	`}`
`28`	`31`	`testOptions {`
`29`	`32`	`unitTests.apply {`
`@@ -105,6 +108,7 @@ kotlin {`
`105`	`108`
`106`	`109`	`val commonTest by getting {`
`107`	`110`	`dependencies {`
	`111`	`+ implementation(project(":test-utils"))`
`108`	`112`	`}`
`109`	`113`	`}`
`110`	`114`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,11 @@ kotlin {`
`56`	`56`	`jvmTarget = "17"`
`57`	`57`	`}`
`58`	`58`	`}`
	`59`	`+ val test by compilations.getting {`
	`60`	`+ kotlinOptions {`
	`61`	`+ jvmTarget = "17"`
	`62`	`+ }`
	`63`	`+ }`
`59`	`64`	`}`
`60`	`65`
`61`	`66`	`if (supportIosTarget) {`