Merge branch 'main' at 94df73a into FixFirestoreCanPageThroughItemsTestCrash to pick up #430, which will fix some of the integration test failures by setting the minSdkVersion of the messaging test to 16 (was 26).

Author: dconeybe

.github/workflows/cpp-packaging.yml

@@ -677,7 +677,7 @@ jobs:
       with:
         python-version: '3.7'
     - name: Use expanded matrix
-      if: github.event_name == 'schedule' || github.event.inputs.use_expanded_matrix == '1'
+      if: github.event.inputs.use_expanded_matrix == '1'
       run: |
         echo "USE_EXPANDED_MATRIX=1" >> $GITHUB_ENV
     - name: Generate token for GitHub API

.github/workflows/integration_tests.yml

@@ -191,7 +191,7 @@ jobs:
           fetch-depth: 0
           submodules: false
       - name: Use expanded matrix
-        if: github.event_name == 'schedule' || github.event.inputs.use_expanded_matrix == '1' || needs.check_trigger.outputs.requested_tests == 'full'
+        if: github.event.inputs.use_expanded_matrix == '1' || needs.check_trigger.outputs.requested_tests == 'full'
         run: |
           echo "EXPANDED_MATRIX_PARAM=-e=1" >> $GITHUB_ENV
       - name: Set auto-diff option if specified.

firestore/integration_test_internal/src/android/snapshot_metadata_android_test.cc

@@ -3,6 +3,7 @@
 #include "android/firestore_integration_test_android.h"
 #include "firebase_test_framework.h"
 #include "firestore/src/include/firebase/firestore/snapshot_metadata.h"
+#include "firestore/src/jni/declaration.h"
 #include "firestore/src/jni/env.h"
 #include "firestore_integration_test.h"
 #include "gmock/gmock.h"
@@ -14,30 +15,33 @@ namespace firestore {
 using SnapshotMetadataAndroidTest = FirestoreAndroidIntegrationTest;
 
 using jni::Class;
+using jni::Constructor;
 using jni::Env;
 using jni::Local;
 
 TEST_F(SnapshotMetadataAndroidTest, Converts) {
-  SKIP_TEST_ON_ANDROID;  // TODO(b/183294303): Fix this test on Android.
-
   Env env;
-
-  Local<Class> clazz =
-      env.FindClass("com/google/firebase/firestore/SnapshotMetadata");
-  jmethodID ctor = env.GetMethodId(clazz, "<init>", "(ZZ)V");
-
-  auto java_metadata = env.New<SnapshotMetadataInternal>(
-      clazz, ctor, /*has_pending_writes=*/true, /*is_from_cache=*/false);
-  SnapshotMetadata result = java_metadata.ToPublic(env);
-  EXPECT_TRUE(result.has_pending_writes());
-  EXPECT_FALSE(result.is_from_cache());
-
-  java_metadata = env.New<SnapshotMetadataInternal>(
-      clazz, ctor, /*has_pending_writes=*/false,
-      /*is_from_cache=*/true);
-  result = java_metadata.ToPublic(env);
-  EXPECT_FALSE(result.has_pending_writes());
-  EXPECT_TRUE(result.is_from_cache());
+  Constructor<SnapshotMetadataInternal> ctor("(ZZ)V");
+  loader().LoadClass("com/google/firebase/firestore/SnapshotMetadata", ctor);
+  ASSERT_TRUE(loader().ok());
+
+  {
+    auto java_metadata =
+        env.New(ctor, /*has_pending_writes=*/true, /*is_from_cache=*/false);
+    SnapshotMetadata result = java_metadata.ToPublic(env);
+    EXPECT_TRUE(env.ok());
+    EXPECT_TRUE(result.has_pending_writes());
+    EXPECT_FALSE(result.is_from_cache());
+  }
+
+  {
+    auto java_metadata =
+        env.New(ctor, /*has_pending_writes=*/false, /*is_from_cache=*/true);
+    SnapshotMetadata result = java_metadata.ToPublic(env);
+    EXPECT_TRUE(env.ok());
+    EXPECT_FALSE(result.has_pending_writes());
+    EXPECT_TRUE(result.is_from_cache());
+  }
 }
 
 }  // namespace firestore

messaging/integration_test/build.gradle

@@ -50,7 +50,7 @@ android {
 
   defaultConfig {
     applicationId 'com.google.firebase.cpp.messaging.testapp'
-    minSdkVersion 26
+    minSdkVersion 16
     targetSdkVersion 28
     versionCode 1
     versionName '1.0'

testing/test_framework/src/firebase_test_framework.cc

@@ -15,6 +15,9 @@
 #include "firebase_test_framework.h"  // NOLINT
 
 #include <cstdio>
+#include <cstring>
+#include <string>
+#include <vector>
 
 #include "firebase/future.h"
 
@@ -294,7 +297,72 @@ std::ostream& operator<<(std::ostream& os, const Variant& v) {
 }
 }  // namespace firebase
 
+namespace {
+
+std::vector<std::string> ArgcArgvToVector(int argc, char* argv[]) {
+  std::vector<std::string> args_vector;
+  for (int i = 0; i < argc; ++i) {
+    args_vector.push_back(argv[i]);
+  }
+  return args_vector;
+}
+
+char** VectorToArgcArgv(const std::vector<std::string>& args_vector,
+                        int* argc) {
+  char** argv = new char*[args_vector.size()];
+  for (int i = 0; i < args_vector.size(); ++i) {
+    const char* arg = args_vector[i].c_str();
+    char* arg_copy = new char[std::strlen(arg) + 1];
+    std::strcpy(arg_copy, arg);
+    argv[i] = arg_copy;
+  }
+  *argc = static_cast<int>(args_vector.size());
+  return argv;
+}
+
+/**
+ * Makes changes to argc and argv before passing them to `InitGoogleTest`.
+ *
+ * This function is a convenience function for developers to edit during
+ * development/debugging to customize the the arguments specified to googletest
+ * when directly specifying command-line arguments is not available, such as on
+ * Android and iOS. For example, to debug a specific test, add the
+ * --gtest_filter argument, and to list all tests add the --gtest_list_tests
+ * argument.
+ *
+ * @param argc A pointer to the `argc` that will be specified to
+ * `InitGoogleTest`; the integer to which this pointer points will be updated
+ * with the new length of `argv`.
+ * @param argv The `argv` that contains the arguments that would have otherwise
+ * been specified to `InitGoogleTest()`; they will not be modified.
+ *
+ * @return The new `argv` to be specified to `InitGoogleTest()`.
+ */
+char** EditMainArgsForGoogleTest(int* argc, char* argv[]) {
+  // Put the args into a vector of strings because modifying string objects in
+  // a vector is far easier than modifying a char** array.
+  const std::vector<std::string> original_args = ArgcArgvToVector(*argc, argv);
+  std::vector<std::string> modified_args(original_args);
+
+  // Add elements to the `modified_args` vector to specify to googletest.
+  // e.g. modified_args.push_back("--gtest_list_tests");
+  // e.g. modified_args.push_back("--gtest_filter=MyTestFixture.MyTest");
+
+  // Avoid the memory leaks documented below if there were no arg changes.
+  if (modified_args == original_args) {
+    return argv;
+  }
+
+  // Create a new `argv` with the elements from the `modified_args` vector and
+  // write the new count back to `argc`. The memory leaks produced by
+  // `VectorToArgcArgv` acceptable because they last for the entire application.
+  return VectorToArgcArgv(modified_args, argc);
+}
+
+}  // namespace
+
 extern "C" int common_main(int argc, char* argv[]) {
+  argv = EditMainArgsForGoogleTest(&argc, argv);
   ::testing::InitGoogleTest(&argc, argv);
   firebase_test_framework::FirebaseTest::SetArgs(argc, argv);
   app_framework::SetLogLevel(app_framework::kDebug);