Add tests and serialization of ndkpayload

Author: jakeouellette

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

@@ -65,19 +65,17 @@ public void testProcessNativeSessions_putsFilesInCorrectLocation() throws IOExce
   }
 
   @Test
-  public void testProcessNativeSessionsWhenDataIsNull_putsFilesInCorrectLocation()
-      throws IOException {
-    //    String fileBackedSessionName = "file";
-    //    String byteBackedSessionName = "byte";
-    //    FileBackedNativeSessionFile fileSession =
-    //            new FileBackedNativeSessionFile(fileBackedSessionName, missingFile);
-    //    BytesBackedNativeSessionFile byteSession =
-    //            new BytesBackedNativeSessionFile(byteBackedSessionName, testContents);
-    //    List<NativeSessionFile> files = Arrays.asList(fileSession, byteSession);
-    //    NativeSessionFileGzipper.processNativeSessions(gzipDir, files);
-    //
-    //    assertEquals(Sets.newSet(
-    //            new File(gzipDir, byteBackedSessionName)),
-    //            Sets.newSet(gzipDir.listFiles()));
+  public void testProcessNativeSessionsWhenDataIsNull_putsFilesInCorrectLocation() {
+    String fileBackedSessionName = "file";
+    String byteBackedSessionName = "byte";
+    FileBackedNativeSessionFile fileSession =
+        new FileBackedNativeSessionFile(fileBackedSessionName, missingFile);
+    BytesBackedNativeSessionFile byteSession =
+        new BytesBackedNativeSessionFile(byteBackedSessionName, testContents);
+    List<NativeSessionFile> files = Arrays.asList(fileSession, byteSession);
+    NativeSessionFileGzipper.processNativeSessions(gzipDir, files);
+
+    assertEquals(
+        Sets.newSet(new File(gzipDir, byteBackedSessionName)), Sets.newSet(gzipDir.listFiles()));
   }
 }

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

@@ -375,7 +375,29 @@ public void testLoadFinalizedReports_reportWithUserId_returnsReportWithProperUse
 
   @Test
   public void testFinalizeSessionWithNativeEvent_writesNativeSessions() {
-    // FIXME:
+    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();
+    List<CrashlyticsReport> finalizedReports = reportPersistence.loadFinalizedReports();
+
+    assertEquals(0, finalizedReports.size());
+
+    reportPersistence.finalizeSessionWithNativeEvent("sessionId", report, filesPayload);
+
+    finalizedReports = reportPersistence.loadFinalizedReports();
+    assertEquals(1, finalizedReports.size());
+    assertEquals(
+        report.withNdkPayload(filesPayload).withOrganizationId("orgId"), finalizedReports.get(0));
   }
 
   @Test
@@ -580,6 +602,17 @@ private static CrashlyticsReport makeTestReport(String sessionId) {
         .build();
   }
 
+  private static CrashlyticsReport makeTestNativeReport() {
+    return CrashlyticsReport.builder()
+        .setSdkVersion("sdkVersion")
+        .setGmpAppId("gmpAppId")
+        .setPlatform(1)
+        .setInstallationUuid("installationId")
+        .setBuildVersion("1")
+        .setDisplayVersion("1.0.0")
+        .build();
+  }
+
   private static CrashlyticsReport.Session makeTestSession(String sessionId) {
     return Session.builder()
         .setGenerator("generator")

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java

@@ -97,6 +97,9 @@ private static CrashlyticsReport parseReport(JsonReader jsonReader) throws IOExc
         case "session":
           builder.setSession(parseSession(jsonReader));
           break;
+        case "ndkPayload":
+          builder.setNdkPayload(parseNdkPayload(jsonReader));
+          break;
         default:
           jsonReader.skipValue();
           break;
@@ -157,6 +160,55 @@ private static CrashlyticsReport.Session parseSession(JsonReader jsonReader) thr
     return builder.build();
   }
 
+  private static CrashlyticsReport.FilesPayload parseNdkPayload(JsonReader jsonReader)
+      throws IOException {
+    final CrashlyticsReport.FilesPayload.Builder builder = CrashlyticsReport.FilesPayload.builder();
+
+    jsonReader.beginObject();
+    while (jsonReader.hasNext()) {
+      String name = jsonReader.nextName();
+      switch (name) {
+        case "files":
+          builder.setFiles(parseArray(jsonReader, CrashlyticsReportJsonTransform::parseFile));
+          break;
+        case "orgId":
+          builder.setOrgId(jsonReader.nextString());
+          break;
+        default:
+          jsonReader.skipValue();
+          break;
+      }
+    }
+    jsonReader.endObject();
+
+    return builder.build();
+  }
+
+  private static CrashlyticsReport.FilesPayload.File parseFile(JsonReader jsonReader)
+      throws IOException {
+    final CrashlyticsReport.FilesPayload.File.Builder builder =
+        CrashlyticsReport.FilesPayload.File.builder();
+
+    jsonReader.beginObject();
+    while (jsonReader.hasNext()) {
+      String name = jsonReader.nextName();
+      switch (name) {
+        case "filename":
+          builder.setFilename(jsonReader.nextString());
+          break;
+        case "contents":
+          builder.setContents(Base64.decode(jsonReader.nextString(), Base64.NO_WRAP));
+          break;
+        default:
+          jsonReader.skipValue();
+          break;
+      }
+    }
+    jsonReader.endObject();
+
+    return builder.build();
+  }
+
   private static CrashlyticsReport.Session.User parseUser(JsonReader jsonReader)
       throws IOException {
     final CrashlyticsReport.Session.User.Builder builder = CrashlyticsReport.Session.User.builder();

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistence.java

@@ -169,9 +169,9 @@ public void deleteFinalizedReport(String sessionId) {
 
   public void finalizeSessionWithNativeEvent(
       String sessionId, CrashlyticsReport crashlyticsReport, CrashlyticsReport.FilesPayload files) {
-    CrashlyticsReport report = crashlyticsReport.withNdkPayload(files);
+    crashlyticsReport = crashlyticsReport.withNdkPayload(files);
     final File outputDirectory = prepareDirectory(nativeReportsDirectory);
-    writeTextFile(new File(outputDirectory, sessionId), TRANSFORM.reportToJson(report));
+    writeTextFile(new File(outputDirectory, sessionId), TRANSFORM.reportToJson(crashlyticsReport));
   }
 
   // TODO: Deal with potential runtime exceptions