EnumIntegrationTest.kt: fix withNullAppended bug

Author: dconeybe

firebase-dataconnect/src/androidTest/kotlin/com/google/firebase/dataconnect/EnumIntegrationTest.kt

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-@file:OptIn(ExperimentalFirebaseDataConnect::class)
-
 package com.google.firebase.dataconnect
 
 import com.google.firebase.dataconnect.testutil.DataConnectIntegrationTestBase
 import com.google.firebase.dataconnect.testutil.property.arbitrary.dataConnect
+import com.google.firebase.dataconnect.testutil.withNullAppended
 import io.kotest.assertions.assertSoftly
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.assertions.withClue
@@ -185,11 +184,6 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     @Serializable data class Item(val value: N5ekmae3jn)
   }
 
-  @Serializable
-  private data class GetNonNullableByKeySubsetData(val item: Item?) {
-    @Serializable data class Item(val value: N5ekmae3jnSubset)
-  }
-
   //////////////////////////////////////////////////////////////////////////////////////////////////
   // Tests for EnumNullable table.
   //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -234,12 +228,9 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
       val insertVariables = InsertNullableVariables(enumValue)
       val key = dataConnect.mutation(insertVariables).execute().data.key
       val queryVariables = GetNullableByKeyVariables(key)
-      val queryRef =
-        dataConnect
-          .query(queryVariables)
-          .withDataDeserializer(serializer<GetNullableByKeySubsetData>())
+      val queryRef = dataConnect.query(queryVariables)
       val queryResult = queryRef.execute().data
-      withClue(queryResult) { queryResult.item?.value shouldBe enumValue }
+      withClue(queryResult) { queryResult?.item?.value shouldBe enumValue }
     }
   }
 
@@ -319,11 +310,6 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     @Serializable data class Item(val value: N5ekmae3jn?)
   }
 
-  @Serializable
-  private data class GetNullableByKeySubsetData(val item: Item?) {
-    @Serializable data class Item(val value: N5ekmae3jnSubset?)
-  }
-
   //////////////////////////////////////////////////////////////////////////////////////////////////
   // Tests for EnumNonNullableTableDefault table.
   //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -420,11 +406,6 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     @Serializable data class Item(val value: List<N5ekmae3jn?>)
   }
 
-  @Serializable
-  private data class GetNonNullableListOfNonNullableByKeySubsetData(val item: Item?) {
-    @Serializable data class Item(val value: List<N5ekmae3jnSubset?>?)
-  }
-
   //////////////////////////////////////////////////////////////////////////////////////////////////
   // Tests for EnumNonNullableListOfNullable table.
   //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -739,13 +720,6 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     N3HWNCRWBP,
   }
 
-  @Suppress("SpellCheckingInspection")
-  private enum class N5ekmae3jnSubset {
-    DPSKD6HR3A,
-    XGWGVMYTHJ,
-    QJX7C7RD5T
-  }
-
   @Suppress("SpellCheckingInspection", "unused")
   enum class S7yayynb25 {
     XJ27ZAXKD3,
@@ -759,20 +733,6 @@ class EnumIntegrationTest : DataConnectIntegrationTestBase() {
     /** The default number of iterations to use in property-based tests. */
     const val NUM_ITERATIONS = 10
 
-    fun <T> List<T>.withNullAppended(): List<T?> =
-      buildList(size + 1) {
-        addAll(this)
-        add(null)
-      }
-
-    fun N5ekmae3jn.toN5ekmae3jnSubsetOrNull(): N5ekmae3jnSubset? =
-      when (this) {
-        N5ekmae3jn.DPSKD6HR3A -> N5ekmae3jnSubset.DPSKD6HR3A
-        N5ekmae3jn.XGWGVMYTHJ -> N5ekmae3jnSubset.XGWGVMYTHJ
-        N5ekmae3jn.QJX7C7RD5T -> N5ekmae3jnSubset.QJX7C7RD5T
-        else -> null
-      }
-
     fun FirebaseDataConnect.mutation(
       variables: InsertNonNullableVariables
     ): MutationRef<InsertData, InsertNonNullableVariables> =

firebase-dataconnect/testutil/src/main/kotlin/com/google/firebase/dataconnect/testutil/WithNullAppended.kt

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.dataconnect.testutil
+
+/**
+ * Creates and returns a new [List] that contains all of the elements in the receiving [List] but
+ * with a `null` element added to the end.
+ */
+@JvmName("withNullAppendedCollection")
+fun <T> Collection<T>.withNullAppended(): List<T?> =
+  buildList(size + 1) {
+    addAll(this@withNullAppended)
+    add(null)
+  }
+
+/**
+ * Creates and returns a new [List] that contains all of the elements in the receiving [Iterable]
+ * but with a `null` element added to the end.
+ */
+@JvmName("withNullAppendedIterable")
+fun <T> Iterable<T>.withNullAppended(): List<T?> = buildList {
+  addAll(this@withNullAppended)
+  add(null)
+}

firebase-dataconnect/testutil/src/test/kotlin/com/google/firebase/dataconnect/testutil/WithNullAppendedUnitTest.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.dataconnect.testutil
+
+import com.google.firebase.dataconnect.testutil.property.arbitrary.dataConnect
+import io.kotest.matchers.shouldBe
+import io.kotest.property.Arb
+import io.kotest.property.arbitrary.list
+import io.kotest.property.checkAll
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class WithNullAppendedUnitTest {
+
+  @Test
+  fun `Iterable withNullAppended on an empty iterable`() {
+    val iterable: Iterable<Nothing> = emptyList()
+    iterable.withNullAppended() shouldBe listOf(null)
+  }
+
+  @Test
+  fun `Iterable withNullAppended on a non-empty iterable`() = runTest {
+    checkAll(NUM_ITERATIONS, Arb.list(Arb.dataConnect.string(), 1..100)) { list ->
+      val iterable: Iterable<String> = list
+      val expected = List(list.size + 1) { if (it < list.size) list[it] else null }
+      iterable.withNullAppended() shouldBe expected
+    }
+  }
+
+  @Test
+  fun `Collection withNullAppended on an empty collection`() {
+    val collection: Collection<Nothing> = emptyList()
+    collection.withNullAppended() shouldBe listOf(null)
+  }
+
+  @Test
+  fun `Collection withNullAppended on a non-empty collection`() = runTest {
+    checkAll(NUM_ITERATIONS, Arb.list(Arb.dataConnect.string(), 1..100)) { list ->
+      val collection: Collection<String> = list
+      val expected = List(list.size + 1) { if (it < list.size) list[it] else null }
+      collection.withNullAppended() shouldBe expected
+    }
+  }
+
+  private companion object {
+
+    const val NUM_ITERATIONS = 100
+  }
+}