Merge branch 'main' into dconeybe/ApkSizeSdkParseErrorMessage

Author: dconeybe

firebase-dataconnect/emulator/emulator.sh

@@ -37,9 +37,10 @@ function parse_args {
 
   local OPTIND=1
   local OPTERR=0
-  while getopts ":c:p:v:hw" arg ; do
+  while getopts ":c:p:v:hwg" arg ; do
     case "$arg" in
       c) emulator_binary="${OPTARG}" ;;
+      g) emulator_binary="gradle" ;;
       p) postgresql_string="${OPTARG}" ;;
       v) preview_flags="${OPTARG}" ;;
       w) wipe_and_restart_postgres_pod=1 ;;
@@ -58,13 +59,26 @@ function parse_args {
         exit 2
         ;;
       *)
-        echo "INTERNAL ERROR: unknown argument: $arg" >&2
-        exit 1
+        log_error_and_exit "INTERNAL ERROR: unknown argument: $arg"
         ;;
     esac
   done
 
-  export DATACONNECT_EMULATOR_BINARY_PATH="${emulator_binary}"
+  if [[ $emulator_binary != "gradle" ]] ; then
+    export DATACONNECT_EMULATOR_BINARY_PATH="${emulator_binary}"
+  else
+    run_command "${SCRIPT_DIR}/../../gradlew" -p "${SCRIPT_DIR}/../.." --configure-on-demand :firebase-dataconnect:connectors:downloadDebugDataConnectExecutable
+    local gradle_emulator_binaries=("${SCRIPT_DIR}"/../connectors/build/intermediates/dataconnect/debug/executable/*)
+    if [[ ${#gradle_emulator_binaries[@]} -ne 1 ]]; then
+      log_error_and_exit "expected exactly 1 emulator binary from gradle, but got ${#gradle_emulator_binaries[@]}: ${gradle_emulator_binaries[*]}"
+    fi
+    local gradle_emulator_binary="${gradle_emulator_binaries[@]}"
+    if [[ ! -e $gradle_emulator_binary ]] ; then
+      log_error_and_exit "emulator binary from gradle does not exist: ${gradle_emulator_binary}"
+    fi
+    export DATACONNECT_EMULATOR_BINARY_PATH="${gradle_emulator_binary}"
+  fi
+
   export FIREBASE_DATACONNECT_POSTGRESQL_STRING="${postgresql_string}"
   export DATA_CONNECT_PREVIEW="${preview_flags}"
 
@@ -90,8 +104,12 @@ function print_help {
   echo
   echo "Options:"
   echo "  -c <data_connect_emulator_binary_path>"
-  echo "    Uses the Data Connect Emulator binary at the given path. If not specified, "
-  echo "    or if specified as the empty string, then the emulator binary is downloaded."
+  echo "    Uses the Data Connect Emulator binary at the given path. A value of \"gradle\" "
+  echo "    will use the same binary as the Gradle build. If not specified, or if specified "
+  echo "    as the empty string, then the emulator binary is downloaded."
+  echo
+  echo "  -g"
+  echo "    Shorthand for: -c gradle"
   echo
   echo "  -p <postgresql_connection_string>"
   echo "    Uses the given string to connect to the PostgreSQL server. If not specified "
@@ -116,4 +134,9 @@ function log {
   echo "${LOG_PREFIX}$*"
 }
 
+function log_error_and_exit {
+  echo "${LOG_PREFIX}ERROR: $*" >&2
+  exit 1
+}
+
 main "$@"

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

@@ -41,7 +41,6 @@ import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
@@ -446,8 +445,18 @@ class QuerySubscriptionIntegrationTest : DataConnectIntegrationTestBase() {
       schema.getPerson(personId).withDataDeserializer(serializer<GetPersonDataNoName2>())
 
     turbineScope {
-      val noName1Flow = noName1Query.subscribe().flow.distinctUntilChanged().testIn(backgroundScope)
-      val noName2Flow = noName2Query.subscribe().flow.distinctUntilChanged().testIn(backgroundScope)
+      val noName1Flow =
+        noName1Query
+          .subscribe()
+          .flow
+          .distinctUntilChanged(::areEquivalentQuerySubscriptionResults)
+          .testIn(backgroundScope)
+      val noName2Flow =
+        noName2Query
+          .subscribe()
+          .flow
+          .distinctUntilChanged(::areEquivalentQuerySubscriptionResults)
+          .testIn(backgroundScope)
       withClue("noName1Flow-0") { noName1Flow.awaitPersonWithName("Name0") }
       withClue("noName2Flow-0") { noName2Flow.awaitPersonWithName("Name0") }
 
@@ -636,5 +645,37 @@ class QuerySubscriptionIntegrationTest : DataConnectIntegrationTestBase() {
       val person = withClue("data.person") { data.person.shouldNotBeNull() }
       withClue("person.name") { person.name shouldBe name }
     }
+
+    /**
+     * Returns `true` if, and only if, the receiver is a non-null instance of
+     * [DataConnectOperationException] that indicates that the failure is due to decoding of the
+     * server response failed.
+     */
+    fun Throwable?.isDecodingServerResponseFailed(): Boolean =
+      this is DataConnectOperationException && this.response.errors.isEmpty()
+
+    /**
+     * Returns `true` if, and only if, the receiver's result is a failure that indicates that
+     * decoding of the server response failed.
+     */
+    fun QuerySubscriptionResult<*, *>.isDecodingServerResponseFailed(): Boolean =
+      result.exceptionOrNull().isDecodingServerResponseFailed()
+
+    /**
+     * Checks if two [QuerySubscriptionResult] instances are "equivalent"; that is, they are both
+     * equal when compared using the `==` operator, or they are both failures due to decoding of the
+     * server response failed.
+     *
+     * This is useful when testing flows because the same decoding failure can happen more than once
+     * in a row based on other asynchronous operations but testing for "distinctness" will consider
+     * those two failures as "distinct" when the test wants them to be treated as "equal".
+     *
+     * See https://github.com/firebase/firebase-android-sdk/pull/7210 for a full explanation.
+     */
+    fun areEquivalentQuerySubscriptionResults(
+      old: QuerySubscriptionResult<*, *>,
+      new: QuerySubscriptionResult<*, *>
+    ): Boolean =
+      (old == new) || (old.isDecodingServerResponseFailed() && new.isDecodingServerResponseFailed())
   }
 }