Merge branch 'main' into tomandersen/firestoreClientProvider

Author: tom-andersen

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/CrashlyticsPluginsTest.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2024 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.crashlytics;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.core.app.ApplicationProvider;
+import com.google.firebase.FirebaseApp;
+import com.google.firebase.FirebaseOptions;
+import com.google.firebase.crashlytics.internal.common.CrashlyticsCore;
+import com.google.firebase.crashlytics.internal.common.DataCollectionArbiter;
+import java.lang.reflect.Field;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/** Tests for the internal apis that development platform plugins call. */
+public class CrashlyticsPluginsTest {
+  private static final String APP_ID = "1:1:android:1a";
+  private static final String API_KEY = "API-KEY-API-KEY-API-KEY-API-KEY-API-KEY";
+  private static final String PROJECT_ID = "PROJECT-ID";
+
+  @Before
+  public void setUp() {
+    FirebaseApp.initializeApp(
+        ApplicationProvider.getApplicationContext(),
+        new FirebaseOptions.Builder()
+            .setApplicationId(APP_ID)
+            .setApiKey(API_KEY)
+            .setProjectId(PROJECT_ID)
+            .build());
+  }
+
+  @After
+  public void tearDown() {
+    FirebaseApp.clearInstancesForTest();
+  }
+
+  @Test
+  public void accessCrashlyticsCore() {
+    // Both Flutter and Unity plugins access CrashlyticsCore from FirebaseCrashlytics.core field.
+    CrashlyticsCore core = FirebaseCrashlytics.getInstance().core;
+    assertThat(core).isNotNull();
+
+    // Verify the internal method logFatalException exists without reflection.
+    Runnable logFatalException = () -> core.logFatalException(new Throwable());
+    assertThat(logFatalException).isNotNull();
+
+    // Verify the internal method setInternalKey exists without reflection.
+    Runnable setInternalKey = () -> core.setInternalKey("", "");
+    assertThat(setInternalKey).isNotNull();
+  }
+
+  @Test
+  public void accessDataCollection() throws Exception {
+    // The Unity plugin accesses CrashlyticsCore.dataCollectionArbiter this via reflection.
+    CrashlyticsCore core = FirebaseCrashlytics.getInstance().core;
+    Field field = core.getClass().getDeclaredField("dataCollectionArbiter");
+    field.setAccessible(true); // The dataCollectionArbiter field is private in CrashlyticsCore.
+    DataCollectionArbiter dataCollectionArbiter = (DataCollectionArbiter) field.get(core);
+
+    assertThat(dataCollectionArbiter).isNotNull();
+  }
+}

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsControllerTest.java

@@ -37,10 +37,10 @@
 import com.google.firebase.concurrent.TestOnlyExecutors;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
-import com.google.firebase.crashlytics.internal.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.NativeSessionFileProvider;
 import com.google.firebase.crashlytics.internal.analytics.AnalyticsEventLogger;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreInitializationTest.java

@@ -31,11 +31,11 @@
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
-import com.google.firebase.crashlytics.internal.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.UnavailableAnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.breadcrumbs.DisabledBreadcrumbSource;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import com.google.firebase.crashlytics.internal.settings.Settings;
 import com.google.firebase.crashlytics.internal.settings.SettingsController;

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCoreTest.java

@@ -33,13 +33,13 @@
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponent;
 import com.google.firebase.crashlytics.internal.CrashlyticsNativeComponentDeferredProxy;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
-import com.google.firebase.crashlytics.internal.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.DevelopmentPlatformProvider;
 import com.google.firebase.crashlytics.internal.RemoteConfigDeferredProxy;
 import com.google.firebase.crashlytics.internal.analytics.UnavailableAnalyticsEventLogger;
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbHandler;
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbSource;
 import com.google.firebase.crashlytics.internal.breadcrumbs.DisabledBreadcrumbSource;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.persistence.FileStore;
 import com.google.firebase.crashlytics.internal.settings.Settings;

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/common/SessionReportingCoordinatorTest.java

@@ -34,7 +34,7 @@
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.concurrent.TestOnlyExecutors;
-import com.google.firebase.crashlytics.internal.CrashlyticsWorker;
+import com.google.firebase.crashlytics.internal.concurrency.CrashlyticsWorker;
 import com.google.firebase.crashlytics.internal.metadata.LogFileManager;
 import com.google.firebase.crashlytics.internal.metadata.UserMetadata;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/concurrency/ConcurrencyTesting.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2024 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.crashlytics.internal.concurrency;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/** Convenience methods for use in Crashlytics concurrency tests. */
+class ConcurrencyTesting {
+
+  /** Returns the current thread's name. */
+  static String getThreadName() {
+    return Thread.currentThread().getName();
+  }
+
+  /** Creates a simple executor that runs on a single named thread. */
+  static ExecutorService newNamedSingleThreadExecutor(String name) {
+    return Executors.newSingleThreadExecutor(runnable -> new Thread(runnable, name));
+  }
+
+  /** Convenient sleep method that propagates the interruption, but does not throw. */
+  static void sleep(long millis) {
+    try {
+      Thread.sleep(millis);
+    } catch (InterruptedException ex) {
+      Thread.currentThread().interrupt();
+    }
+  }
+
+  /** Helps to de-flake a test. */
+  static void deflake() {
+    // An easy, but ugly, way to fix a flaky test.
+    sleep(1);
+  }
+
+  private ConcurrencyTesting() {}
+}