Fix for ios tests

Daeda88 · Daeda88 · commit 5dd614531b24 · 2023-09-28T00:12:14.000+02:00
diff --git a/firebase-app/src/commonTest/kotlin/dev/gitlive/firebase/firebase.kt b/firebase-app/src/commonTest/kotlin/dev/gitlive/firebase/firebase.kt
@@ -12,7 +12,14 @@ class FirebaseAppTest {
     fun testInitialize() = runTest {
         Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         assertEquals(1, Firebase.apps(context).size)
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
@@ -21,7 +21,14 @@ class FirebaseAuthTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?: Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         auth = Firebase.auth(app).apply {
diff --git a/firebase-config/build.gradle.kts b/firebase-config/build.gradle.kts
@@ -121,6 +121,7 @@ kotlin {
                 optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")
                 if (name.lowercase().contains("ios")) {
                     optIn("kotlinx.cinterop.ExperimentalForeignApi")
+                    optIn("kotlinx.cinterop.BetaInteropApi")
                 }
             }
         }
diff --git a/firebase-config/src/commonTest/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt b/firebase-config/src/commonTest/kotlin/dev/gitlive/firebase/remoteconfig/FirebaseRemoteConfig.kt
@@ -7,10 +7,8 @@ package dev.gitlive.firebase.remoteconfig
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runTest
-import kotlinx.coroutines.test.TestResult
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Ignore
@@ -35,7 +33,14 @@ class FirebaseRemoteConfigTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?: Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         remoteConfig = Firebase.remoteConfig(app)
diff --git a/firebase-crashlytics/src/commonTest/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt b/firebase-crashlytics/src/commonTest/kotlin/dev/gitlive/firebase/crashlytics/crashlytics.kt
@@ -7,12 +7,9 @@ package dev.gitlive.firebase.crashlytics
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runBlockingTest
 import dev.gitlive.firebase.runTest
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.test.TestResult
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -31,7 +28,14 @@ class FirebaseCrashlyticsTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?: Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         crashlytics = Firebase.crashlytics(app)
diff --git a/firebase-database/src/commonTest/kotlin/dev/gitlive/firebase/database/database.kt b/firebase-database/src/commonTest/kotlin/dev/gitlive/firebase/database/database.kt
@@ -28,7 +28,14 @@ class FirebaseDatabaseTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?: Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         database = Firebase.database(app).apply {
diff --git a/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -7,7 +7,6 @@ package dev.gitlive.firebase.firestore
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runBlockingTest
 import dev.gitlive.firebase.runTest
@@ -58,7 +57,14 @@ class FirebaseFirestoreTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?:Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         firestore = Firebase.firestore(app).apply {
diff --git a/firebase-perf/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt b/firebase-perf/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt
@@ -3,7 +3,6 @@ package dev.gitlive.firebase.perf.metrics
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.perf.FirebasePerformance
 import dev.gitlive.firebase.perf.context
@@ -15,7 +14,6 @@ import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 class AndroidTraceTest {
@@ -26,7 +24,14 @@ class AndroidTraceTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?:Firebase.initialize(
             dev.gitlive.firebase.perf.context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         performance = Firebase.performance(app)
diff --git a/firebase-perf/src/commonTest/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt b/firebase-perf/src/commonTest/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt
@@ -1,8 +1,8 @@
 package dev.gitlive.firebase.perf.metrics
 
 import dev.gitlive.firebase.Firebase
+import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.perf.FirebasePerformance
 import dev.gitlive.firebase.perf.IgnoreForAndroidUnitTest
@@ -25,9 +25,17 @@ class TraceTest {
     @BeforeTest
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?: Firebase.initialize(
-                    dev.gitlive.firebase.perf.context,
-                    firebaseOptions
-                )
+            dev.gitlive.firebase.perf.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",
+                gcmSenderId = "846484016111"
+            )
+        )
+
         performance = Firebase.performance(app)
     }
 
diff --git a/firebase-perf/src/commonTest/kotlin/dev/gitlive/firebase/perf/performance.kt b/firebase-perf/src/commonTest/kotlin/dev/gitlive/firebase/perf/performance.kt
@@ -7,12 +7,9 @@ package dev.gitlive.firebase.perf
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runBlockingTest
 import dev.gitlive.firebase.runTest
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.test.TestResult
 import kotlin.test.*
 
 expect val emulatorHost: String
@@ -27,9 +24,17 @@ class FirebasePerformanceTest {
     @BeforeTest
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?: Firebase.initialize(
-                    context,
-                    firebaseOptions
-                )
+            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",
+                gcmSenderId = "846484016111"
+            )
+        )
+
         performance = Firebase.performance(app)
     }
 
diff --git a/firebase-perf/src/jsTest/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt b/firebase-perf/src/jsTest/kotlin/dev/gitlive/firebase/perf/metrics/Trace.kt
@@ -3,7 +3,6 @@ package dev.gitlive.firebase.perf.metrics
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.perf.FirebasePerformance
 import dev.gitlive.firebase.perf.context
@@ -22,7 +21,14 @@ class JsTraceTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?:Firebase.initialize(
             dev.gitlive.firebase.perf.context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         performance = Firebase.performance(app)
diff --git a/firebase-perf/src/jsTest/kotlin/dev/gitlive/firebase/perf/performance.kt b/firebase-perf/src/jsTest/kotlin/dev/gitlive/firebase/perf/performance.kt
@@ -7,7 +7,6 @@ package dev.gitlive.firebase.perf
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
 import dev.gitlive.firebase.runTest
 import kotlin.test.*
@@ -27,7 +26,14 @@ class JsPerformanceTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?:Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         performance = Firebase.performance(app)
diff --git a/firebase-storage/src/commonTest/kotlin/dev/gitlive/firebase/storage/storage.kt b/firebase-storage/src/commonTest/kotlin/dev/gitlive/firebase/storage/storage.kt
@@ -7,9 +7,7 @@ package dev.gitlive.firebase.storage
 import dev.gitlive.firebase.Firebase
 import dev.gitlive.firebase.FirebaseOptions
 import dev.gitlive.firebase.apps
-import dev.gitlive.firebase.firebaseOptions
 import dev.gitlive.firebase.initialize
-import kotlinx.coroutines.CoroutineScope
 import kotlin.test.BeforeTest
 
 expect val emulatorHost: String
@@ -25,7 +23,14 @@ class FirebaseStorageTest {
     fun initializeFirebase() {
         val app = Firebase.apps(context).firstOrNull() ?: Firebase.initialize(
             context,
-            firebaseOptions
+            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",
+                gcmSenderId = "846484016111"
+            )
         )
 
         storage = Firebase.storage(app).apply {
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts
@@ -83,16 +83,20 @@ kotlin {
                 this.apiVersion = apiVersion
                 this.languageVersion = languageVersion
                 progressiveMode = true
+                if (name.lowercase().contains("ios")) {
+                    optIn("kotlinx.cinterop.ExperimentalForeignApi")
+                    optIn("kotlinx.cinterop.BetaInteropApi")
+                }
             }
         }
 
         getByName("commonMain") {
             dependencies {
                 val coroutinesVersion: String by project
-                implementation(project(":firebase-app"))
                 api(kotlin("test"))
                 api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
                 api("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
+
             }
         }
 
diff --git a/test-utils/src/commonMain/kotlin/dev/gitlive/firebase/TestUtils.kt b/test-utils/src/commonMain/kotlin/dev/gitlive/firebase/TestUtils.kt
@@ -15,12 +15,3 @@ expect fun runBlockingTest(action: suspend CoroutineScope.() -> Unit)
 expect fun nativeMapOf(vararg pairs: Pair<String, Any?>): Any
 expect fun nativeListOf(vararg elements: Any): Any
 expect fun nativeAssertEquals(expected: Any?, actual: Any?)
-
-val firebaseOptions = 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",
-    gcmSenderId = "846484016111"
-)

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ kotlin {`
`121`	`121`	`optIn("kotlinx.coroutines.ExperimentalCoroutinesApi")`
`122`	`122`	`if (name.lowercase().contains("ios")) {`
`123`	`123`	`optIn("kotlinx.cinterop.ExperimentalForeignApi")`
	`124`	`+ optIn("kotlinx.cinterop.BetaInteropApi")`
`124`	`125`	`}`
`125`	`126`	`}`
`126`	`127`	`}`