Removed reflection from Crashlytics smoke tests.

Author: mrichards

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java

@@ -84,6 +84,7 @@ public class FirebaseCrashlytics {
 
     final ExecutorService crashHandlerExecutor =
         ExecutorUtils.buildSingleThreadExecutorService("Crashlytics Exception Handler");
+
     final CrashlyticsCore core =
         new CrashlyticsCore(
             app,
@@ -156,7 +157,8 @@ public Void call() throws Exception {
     return new FirebaseCrashlytics(core);
   }
 
-  private final CrashlyticsCore core;
+  // package-private for smoke tests
+  final CrashlyticsCore core;
 
   private FirebaseCrashlytics(@NonNull CrashlyticsCore core) {
     this.core = core;

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java

@@ -19,6 +19,7 @@
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.Tasks;
 import com.google.firebase.FirebaseApp;
@@ -76,10 +77,12 @@ public class CrashlyticsCore {
   private boolean didCrashOnPreviousExecution;
 
   private CrashlyticsController controller;
-
   private final IdManager idManager;
-  private final BreadcrumbSource breadcrumbSource;
+
+  @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+  public final BreadcrumbSource breadcrumbSource;
   private final AnalyticsEventLogger analyticsEventLogger;
+
   private final ExecutorService crashHandlerExecutor;
   private final CrashlyticsBackgroundWorker backgroundWorker;
 

smoke-tests/src/main/java/com/google/firebase/testing/CrashlyticsTest.java renamed to smoke-tests/src/main/java/com/google/firebase/crashlytics/CrashlyticsTest.java

@@ -12,23 +12,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.firebase.testing;
+package com.google.firebase.crashlytics;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import android.os.Bundle;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.firebase.analytics.FirebaseAnalytics;
-import com.google.firebase.crashlytics.FirebaseCrashlytics;
 
 import androidx.test.runner.AndroidJUnit4;
 import com.google.firebase.crashlytics.internal.breadcrumbs.BreadcrumbSource;
+import com.google.firebase.crashlytics.internal.common.CrashlyticsCore;
 import java.lang.reflect.Field;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+/**
+ * This class is in the com.google.firebase.crashlytics package to access FirebaseCrashlytics's
+ * package-private fields.
+ **/
 @RunWith(AndroidJUnit4.class)
 public final class CrashlyticsTest {
 
@@ -37,15 +41,7 @@ public void analyticsIntegration() {
     // Validates that Firebase Analytics and Crashlytics interoperability is working, by confirming
     // that events sent to Firebase Analytics are received by the Crashlytics breadcrumb handler.
     try {
-      // need to use reflection to get the breadcrumb handler.
-      FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
-      Field coreField = crashlytics.getClass().getDeclaredField("core");
-      coreField.setAccessible(true);
-      Object core = coreField.get(crashlytics);
-      Field breadcrumbSourceField = core.getClass().getDeclaredField("breadcrumbSource");
-      breadcrumbSourceField.setAccessible(true);
-      BreadcrumbSource breadcrumbSource = (BreadcrumbSource)breadcrumbSourceField.get(core);
-
+      BreadcrumbSource breadcrumbSource = FirebaseCrashlytics.getInstance().core.breadcrumbSource;
       final CountDownLatch eventReceivedLatch = new CountDownLatch(1);
       breadcrumbSource.registerBreadcrumbHandler(breadcrumbHandler -> {
         eventReceivedLatch.countDown();

smoke-tests/src/main/java/com/google/firebase/testing/TestSuite.java

@@ -14,6 +14,7 @@
 
 package com.google.firebase.testing;
 
+import com.google.firebase.crashlytics.CrashlyticsTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;