Merge branch 'feature/kotlin-2.0' into feature/api-validation

Daeda88 · Daeda88 · commit 28fc8d497a42 · 2024-06-11T21:59:34.000+02:00
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -117,3 +117,25 @@ jobs:
         with:
           name: "Firebase Debug Log"
           path: "**/firebase-debug.log"
+  build-jvm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup test environment
+        uses: ./.github/actions/setup_test_action
+        timeout-minutes: 10
+      - name: Run JVM Tests
+        run: ./gradlew cleanTest jvmTest
+      - name: Upload JVM test artifact
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: "JVM Test Report HTML"
+          path: |
+            **/build/reports/tests/jvmTest/
+      - name: Upload Firebase Debug Log
+        uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: "Firebase Debug Log"
+          path: "**/firebase-debug.log"
diff --git a/firebase-app/src/jvmTest/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/jvmTest/kotlin/dev/gitlive/firebase/firebase.kt
@@ -6,7 +6,7 @@
 
 package dev.gitlive.firebase
 
-actual val context: Any = Unit
+actual val context: Any = testContext
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
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
@@ -6,9 +6,11 @@
 
 package dev.gitlive.firebase.auth
 
+import dev.gitlive.firebase.testContext
+
 actual val emulatorHost: String = "10.0.2.2"
 
-actual val context: Any = Unit
+actual val context: Any = testContext
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
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
@@ -6,7 +6,9 @@
 
 package dev.gitlive.firebase.remoteconfig
 
-actual val context: Any = Unit
+import dev.gitlive.firebase.testContext
+
+actual val context: Any = testContext
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
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
@@ -6,9 +6,14 @@
 
 package dev.gitlive.firebase.database
 
-actual val emulatorHost: String = "10.0.2.2"
+import dev.gitlive.firebase.testContext
 
-actual val context: Any = Unit
+actual val emulatorHost: String = "localhost"
+
+actual val context: Any = testContext
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidTest
diff --git a/firebase-firestore/api/android/firebase-firestore.api b/firebase-firestore/api/android/firebase-firestore.api
@@ -125,7 +125,7 @@ public final class dev/gitlive/firebase/firestore/DocumentSnapshot {
 
 public final class dev/gitlive/firebase/firestore/DoubleAsTimestampSerializer : kotlinx/serialization/KSerializer {
 	public static final field INSTANCE Ldev/gitlive/firebase/firestore/DoubleAsTimestampSerializer;
-	public static final field serverTimestamp D
+	public static final field SERVER_TIMESTAMP D
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Double;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
diff --git a/firebase-firestore/api/jvm/firebase-firestore.api b/firebase-firestore/api/jvm/firebase-firestore.api
@@ -125,7 +125,7 @@ public final class dev/gitlive/firebase/firestore/DocumentSnapshot {
 
 public final class dev/gitlive/firebase/firestore/DoubleAsTimestampSerializer : kotlinx/serialization/KSerializer {
 	public static final field INSTANCE Ldev/gitlive/firebase/firestore/DoubleAsTimestampSerializer;
-	public static final field serverTimestamp D
+	public static final field SERVER_TIMESTAMP D
 	public fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Double;
 	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
 	public fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
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,11 @@
+package dev.gitlive.firebase.firestore
+
+import dev.gitlive.firebase.testContext
+
+actual val emulatorHost: String = "localhost"
+
+actual val context: Any = testContext
+
+@Suppress("UNCHECKED_CAST")
+actual fun encodedAsMap(encoded: Any?): Map<String, Any?> = encoded as Map<String, Any?>
+actual fun Map<String, Any?>.asEncoded(): Any = this
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
@@ -6,9 +6,11 @@
 
 package dev.gitlive.firebase.perf
 
-actual val emulatorHost: String = "10.0.2.2"
+import dev.gitlive.firebase.testContext
 
-actual val context: Any = Unit
+actual val emulatorHost: String = "localhost"
+
+actual val context: Any = testContext
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
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
@@ -6,9 +6,11 @@
 
 package dev.gitlive.firebase.storage
 
-actual val emulatorHost: String = "10.0.2.2"
+import dev.gitlive.firebase.testContext
 
-actual val context: Any = Unit
+actual val emulatorHost: String = "localhost"
+
+actual val context: Any = testContext
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
diff --git a/test-utils/api/jvm/test-utils.api b/test-utils/api/jvm/test-utils.api
@@ -1,4 +1,5 @@
-public final class dev/gitlive/firebase/TestUtilsAndroid {
+public final class dev/gitlive/firebase/TestUtilsJvm {
+	public static final fun getTestContext ()Landroid/app/Application;
 	public static final fun nativeAssertEquals (Ljava/lang/Object;Ljava/lang/Object;)V
 	public static final fun nativeListOf ([Ljava/lang/Object;)Ljava/lang/Object;
 	public static final fun nativeMapOf ([Lkotlin/Pair;)Ljava/lang/Object;
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -109,14 +109,17 @@ kotlin {
             }
         }
 
-        getByName("jvmMain") {
-            kotlin.srcDir("src/androidMain/kotlin")
-        }
-
         getByName("jsMain") {
             dependencies {
                 implementation(kotlin("test-js"))
             }
         }
+
+        getByName("jvmMain") {
+            dependencies {
+                val coroutinesVersion: String by project
+                api("org.jetbrains.kotlinx:kotlinx-coroutines-swing:$coroutinesVersion")
+            }
+        }
     }
 }
diff --git a/test-utils/src/jvmMain/kotlin/dev/gitlive/firebase/TestUtils.kt b/test-utils/src/jvmMain/kotlin/dev/gitlive/firebase/TestUtils.kt
@@ -0,0 +1,33 @@
+@file:JvmName("TestUtilsJvm")
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.gitlive.firebase
+
+import android.app.Application
+import com.google.firebase.FirebasePlatform
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.runBlocking
+import kotlin.time.Duration.Companion.minutes
+
+val testContext = Application().apply {
+    FirebasePlatform.initializeFirebasePlatform(object : FirebasePlatform() {
+        val storage = mutableMapOf<String, String>()
+        override fun store(key: String, value: String) = storage.set(key, value)
+        override fun retrieve(key: String) = storage[key]
+        override fun clear(key: String) {
+            storage.remove(key)
+        }
+        override fun log(msg: String) = println(msg)
+    })
+}
+
+actual fun runTest(test: suspend CoroutineScope.() -> Unit) = kotlinx.coroutines.test.runTest(timeout = 5.minutes) { test() }
+actual fun runBlockingTest(action: suspend CoroutineScope.() -> Unit) = runBlocking(block = action)
+
+actual fun nativeMapOf(vararg pairs: Pair<Any, Any?>): Any = mapOf(*pairs)
+actual fun nativeListOf(vararg elements: Any?): Any = listOf(*elements)
+actual fun nativeAssertEquals(expected: Any?, actual: Any?) {
+    kotlin.test.assertEquals(expected, actual)
+}
