Cleanup

Author: mrwillis21

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

@@ -332,7 +332,7 @@ public void testFinalizeSessionWithNativeEvent_createsCrashlyticsReportWithNativ
     String byteBackedSessionName = "byte";
     BytesBackedNativeSessionFile byteSession =
         new BytesBackedNativeSessionFile(byteBackedSessionName, testBytes);
-    when(dataCapture.captureReportData()).thenReturn(makeTestNativeReport());
+    when(dataCapture.captureReportData()).thenReturn(makeIncompleteReport());
 
     reportManager.finalizeSessionWithNativeEvent("id", Arrays.asList(byteSession));
 
@@ -447,7 +447,7 @@ public void testRemoveAllReports_deletesPersistedReports() {
     verify(reportPersistence).deleteAllReports();
   }
 
-  private static CrashlyticsReport makeTestNativeReport() {
+  private static CrashlyticsReport makeIncompleteReport() {
     return CrashlyticsReport.builder()
         .setSdkVersion("sdkVersion")
         .setGmpAppId("gmpAppId")

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java

@@ -307,19 +307,7 @@ public void testFinalizeReports_removesLowPriorityReportsFirst() throws IOExcept
 
   @Test
   public void testFinalizeReports_prioritizesNativeAndNonnativeFatals() throws IOException {
-    byte[] testContents = {0, 2, 20, 10};
-    CrashlyticsReport.FilesPayload filesPayload =
-        CrashlyticsReport.FilesPayload.builder()
-            .setOrgId("orgId")
-            .setFiles(
-                ImmutableList.from(
-                    CrashlyticsReport.FilesPayload.File.builder()
-                        .setContents(testContents)
-                        .setFilename("bytes")
-                        .build()))
-            .build();
-
-    CrashlyticsReport report = makeTestNativeReport().withNdkPayload(filesPayload);
+    CrashlyticsReport report = makeTestNativeReport();
     reportPersistence =
         new CrashlyticsReportPersistence(
             folder.newFolder(), getSettingsMock(4, VERY_LARGE_UPPER_LIMIT));
@@ -332,11 +320,8 @@ public void testFinalizeReports_prioritizesNativeAndNonnativeFatals() throws IOE
     reportPersistence.finalizeSessionWithNativeEvent("testSession6native", report);
     reportPersistence.finalizeReports("skippedSession", 0L);
 
-    final List<CrashlyticsReportWithSessionId> finalizedReports =
-        reportPersistence.loadFinalizedReports();
-    assertEquals(4, finalizedReports.size());
     Set<String> reportNames = new HashSet<>();
-    for (CrashlyticsReportWithSessionId finalizedReport : finalizedReports) {
+    for (CrashlyticsReportWithSessionId finalizedReport : reportPersistence.loadFinalizedReports()) {
       reportNames.add(finalizedReport.getSessionId());
     }
     assertEquals(
@@ -431,19 +416,7 @@ public void testLoadFinalizedReports_reportWithUserId_returnsReportWithProperUse
 
   @Test
   public void testFinalizeSessionWithNativeEvent_writesNativeSessions() {
-    byte[] testContents = {0, 2, 20, 10};
-    CrashlyticsReport.FilesPayload filesPayload =
-        CrashlyticsReport.FilesPayload.builder()
-            .setOrgId("orgId")
-            .setFiles(
-                ImmutableList.from(
-                    CrashlyticsReport.FilesPayload.File.builder()
-                        .setContents(testContents)
-                        .setFilename("bytes")
-                        .build()))
-            .build();
-
-    CrashlyticsReport report = makeTestNativeReport().withNdkPayload(filesPayload);
+    CrashlyticsReport report = makeTestNativeReport();
     List<CrashlyticsReportWithSessionId> finalizedReports =
         reportPersistence.loadFinalizedReports();
 
@@ -453,9 +426,7 @@ public void testFinalizeSessionWithNativeEvent_writesNativeSessions() {
 
     finalizedReports = reportPersistence.loadFinalizedReports();
     assertEquals(1, finalizedReports.size());
-    assertEquals(
-        report.withNdkPayload(filesPayload).withOrganizationId("orgId"),
-        finalizedReports.get(0).getReport());
+    assertEquals(report, finalizedReports.get(0).getReport());
   }
 
   @Test
@@ -651,27 +622,34 @@ private static void persistReportWithEvent(
     reportPersistence.persistEvent(testEvent, sessionId, isHighPriority);
   }
 
-  private static CrashlyticsReport makeTestReport(String sessionId) {
+  private static CrashlyticsReport.Builder makeIncompleteReport() {
     return CrashlyticsReport.builder()
         .setSdkVersion("sdkVersion")
         .setGmpAppId("gmpAppId")
         .setPlatform(1)
         .setInstallationUuid("installationId")
         .setBuildVersion("1")
-        .setDisplayVersion("1.0.0")
-        .setSession(makeTestSession(sessionId))
-        .build();
+        .setDisplayVersion("1.0.0");
+  }
+
+  private static CrashlyticsReport makeTestReport(String sessionId) {
+    return makeIncompleteReport().setSession(makeTestSession(sessionId)).build();
   }
 
   private static CrashlyticsReport makeTestNativeReport() {
-    return CrashlyticsReport.builder()
-        .setSdkVersion("sdkVersion")
-        .setGmpAppId("gmpAppId")
-        .setPlatform(1)
-        .setInstallationUuid("installationId")
-        .setBuildVersion("1")
-        .setDisplayVersion("1.0.0")
-        .build();
+    byte[] testContents = {0, 2, 20, 10};
+    CrashlyticsReport.FilesPayload filesPayload =
+            CrashlyticsReport.FilesPayload.builder()
+                    .setOrgId("orgId")
+                    .setFiles(
+                            ImmutableList.from(
+                                    CrashlyticsReport.FilesPayload.File.builder()
+                                            .setContents(testContents)
+                                            .setFilename("bytes")
+                                            .build()))
+                    .build();
+
+    return makeIncompleteReport().setNdkPayload(filesPayload).build();
   }
 
   private static CrashlyticsReport.Session makeTestSession(String sessionId) {

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

@@ -30,16 +30,20 @@ class BytesBackedNativeSessionFile implements NativeSessionFile {
     this.bytes = bytes;
   }
 
+  @Override
+  @NonNull
   public String getName() {
     return this.name;
   }
 
   @Override
+  @Nullable
   public InputStream getStream() {
     return isEmpty() ? null : new ByteArrayInputStream(bytes);
   }
 
   @Override
+  @Nullable
   public CrashlyticsReport.FilesPayload.File asFilePayload() {
     return isEmpty()
         ? null

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

@@ -15,6 +15,8 @@
 package com.google.firebase.crashlytics.internal.common;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -34,11 +36,14 @@ class FileBackedNativeSessionFile implements NativeSessionFile {
     this.file = file;
   }
 
+  @Override
+  @NonNull
   public String getName() {
     return this.name;
   }
 
   @Override
+  @Nullable
   public InputStream getStream() {
     if (!file.exists() || !file.isFile()) {
       return null;
@@ -51,11 +56,12 @@ public InputStream getStream() {
   }
 
   @Override
+  @Nullable
   public CrashlyticsReport.FilesPayload.File asFilePayload() {
     byte[] bytes = asBytes();
     return bytes != null
         ? CrashlyticsReport.FilesPayload.File.builder()
-            .setContents(asBytes())
+            .setContents(bytes)
             .setFilename(name)
             .build()
         : null;

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

@@ -49,7 +49,7 @@ private static void gzipInputStream(@Nullable InputStream input, @NonNull File o
     if (input == null) {
       return;
     }
-    byte[] buffer = new byte[1024];
+    byte[] buffer = new byte[8192];
     GZIPOutputStream gos = null;
     try {
       gos = new GZIPOutputStream(new FileOutputStream(output));