Make raw internal/Disable Android DB test

Author: Daeda88

firebase-common-internal/src/androidMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -1,7 +1,7 @@
 @file:JvmName("AndroidEncodedObject")
 package dev.gitlive.firebase.internal
 
-val EncodedObject.android: Map<String, Any?> get() = raw
+val EncodedObject.android: Map<String, Any?> get() = getRaw()
 
 @PublishedApi
 internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>

firebase-common-internal/src/commonMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -6,13 +6,15 @@ import kotlin.jvm.JvmInline
  * Platform specific object for storing encoded data that can be used for methods that explicitly require an object.
  * This is essentially a [Map] of [String] and [Any]? (as represented by [raw]) but since [encode] gives a platform specific value, this method wraps that.
  */
-sealed interface EncodedObject {
-    val raw: Map<String, Any?>
+sealed interface EncodedObject
+
+internal fun EncodedObject.getRaw(): Map<String, Any?> = when (this) {
+    is EncodedObjectImpl -> raw
 }
 
 @JvmInline
 @PublishedApi
-internal value class EncodedObjectImpl(override val raw: Map<String, Any?>) : EncodedObject
+internal value class EncodedObjectImpl(val raw: Map<String, Any?>) : EncodedObject
 
 @PublishedApi
 internal expect fun Any.asNativeMap(): Map<*, *>?

firebase-common-internal/src/commonTest/kotlin/dev/gitlive/firebase/internal/EncodersTest.kt

@@ -428,12 +428,12 @@ class EncodersTest {
             testDataClass
         ) { encodeDefaults = false }
 
-        nativeAssertEquals(mapOf("map" to nativeMapOf("key" to "value"), "otherMap" to nativeMapOf(1 to 1), "bool" to true, "valueClass" to 42), encodedObject.raw)
+        nativeAssertEquals(mapOf("map" to nativeMapOf("key" to "value"), "otherMap" to nativeMapOf(1 to 1), "bool" to true, "valueClass" to 42), encodedObject.getRaw())
 
         val testMap = mapOf("one" to 1, "two" to null, "three" to false)
-        assertEquals(testMap, encodeAsObject(testMap).raw)
+        assertEquals(testMap, encodeAsObject(testMap).getRaw())
 
-        assertEquals(emptyMap(), encodeAsObject(TestObject).raw)
+        assertEquals(emptyMap(), encodeAsObject(TestObject).getRaw())
 
         assertFailsWith<IllegalArgumentException> {
             encodeAsObject(

firebase-common-internal/src/iosMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -1,6 +1,6 @@
 package dev.gitlive.firebase.internal
 
-val EncodedObject.ios: Map<Any?, *> get() = raw.mapKeys { (key, _) -> key }
+val EncodedObject.ios: Map<Any?, *> get() = getRaw().mapKeys { (key, _) -> key }
 
 @PublishedApi
 internal actual fun Any.asNativeMap(): Map<*, *>? = this as? Map<*, *>

firebase-common-internal/src/jsMain/kotlin/dev/gitlive/firebase/internal/EncodedObject.kt

@@ -3,7 +3,7 @@ package dev.gitlive.firebase.internal
 import kotlin.js.Json
 import kotlin.js.json
 
-val EncodedObject.js: Json get() = json(*raw.entries.map { (key, value) -> key to value }.toTypedArray())
+val EncodedObject.js: Json get() = json(*getRaw().entries.map { (key, value) -> key to value }.toTypedArray())
 
 @PublishedApi
 internal actual fun Any.asNativeMap(): Map<*, *>? {

firebase-database/src/androidInstrumentedTest/kotlin/dev/gitlive/firebase/database/database.kt

@@ -6,9 +6,12 @@
 package dev.gitlive.firebase.database
 
 import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Ignore
 
 actual val emulatorHost: String = "10.0.2.2"
 
 actual val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
+
+actual typealias IgnoreForAndroidTest = Ignore

firebase-database/src/androidUnitTest/kotlin/dev/gitlive/firebase/database/database.kt

@@ -11,3 +11,4 @@ actual val emulatorHost: String = "10.0.2.2"
 
 actual val context: Any = ""
 actual typealias IgnoreForAndroidUnitTest = Ignore
+actual typealias IgnoreForAndroidTest = Ignore

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

@@ -25,6 +25,7 @@ import kotlin.time.Duration.Companion.minutes
 expect val emulatorHost: String
 expect val context: Any
 expect annotation class IgnoreForAndroidUnitTest()
+expect annotation class IgnoreForAndroidTest()
 
 @IgnoreForAndroidUnitTest
 class FirebaseDatabaseTest {
@@ -197,6 +198,8 @@ class FirebaseDatabaseTest {
         assertFalse(valueEvents.first().exists)
     }
 
+    // Ignoring on Android Instrumented Tests due to bug in Firebase: https://github.com/firebase/firebase-android-sdk/issues/5870
+    @IgnoreForAndroidTest
     @Test
     fun testUpdateChildrenOnDisconnect() = runTest {
         setupRealtimeData()

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

@@ -10,3 +10,5 @@ actual val context: Any = Unit
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidTest

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

@@ -6,3 +6,5 @@ actual val context: Any = Unit
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
 actual annotation class IgnoreForAndroidUnitTest
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreForAndroidTest

gradle.properties

@@ -67,6 +67,6 @@ gradlePluginVersion=8.1.3
 kotlinVersion=1.9.21
 coroutinesVersion=1.7.3
 serializationVersion=1.6.0
-firebaseBoMVersion=32.7.0
+firebaseBoMVersion=32.8.1
 apiVersion=1.8
 languageVersion=1.9