Add tests

Author: jakeouellette

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

@@ -14,18 +14,70 @@
 
 package com.google.firebase.crashlytics.internal.common;
 
-import org.junit.Test;
-
+import android.content.Context;
+import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import org.junit.Test;
+import org.mockito.internal.util.collections.Sets;
+
+public class NativeSessionFileGzipperTest extends CrashlyticsTestCase {
+  byte[] testContents = {0, 2, 20, 10};
+  File testFile;
+  File missingFile;
+  File gzipDir;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    final Context context = getContext();
+    testFile = new File(context.getFilesDir(), "testFile");
+    try (FileOutputStream fout = new FileOutputStream(testFile);
+        ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
+      stream.write(testContents);
+      stream.writeTo(fout);
+    }
+    File baseDirectory = context.getFilesDir();
+    missingFile = new File(baseDirectory, "missingFile");
+    gzipDir = new File(baseDirectory, "gzip");
+    gzipDir.mkdirs();
+  }
 
-public class NativeSessionFileGzipperTest {
+  @Test
+  public void testProcessNativeSessions_putsFilesInCorrectLocation() throws IOException {
+    String fileBackedSessionName = "file";
+    String byteBackedSessionName = "byte";
+    FileBackedNativeSessionFile fileSession =
+        new FileBackedNativeSessionFile(fileBackedSessionName, testFile);
+    BytesBackedNativeSessionFile byteSession =
+        new BytesBackedNativeSessionFile(byteBackedSessionName, testContents);
+    List<NativeSessionFile> files = Arrays.asList(fileSession, byteSession);
+    NativeSessionFileGzipper.processNativeSessions(gzipDir, files);
+
+    assertEquals(
+        Sets.newSet(
+            new File(gzipDir, fileBackedSessionName), new File(gzipDir, byteBackedSessionName)),
+        Sets.newSet(gzipDir.listFiles()));
+  }
 
   @Test
-  public void testProcessNativeSessions_processesNativeSessions() {
+  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(directory, files);
-    // FIXME:
-
+    //    NativeSessionFileGzipper.processNativeSessions(gzipDir, files);
+    //
+    //    assertEquals(Sets.newSet(
+    //            new File(gzipDir, byteBackedSessionName)),
+    //            Sets.newSet(gzipDir.listFiles()));
   }
 }

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

@@ -40,6 +40,9 @@ public String getName() {
 
   @Override
   public InputStream getStream() {
+    if (!file.exists() || !file.isFile()) {
+      return null;
+    }
     try {
       return new FileInputStream(file);
     } catch (FileNotFoundException f) {
@@ -61,14 +64,15 @@ public CrashlyticsReport.FilesPayload.File asFilePayload() {
   private byte[] asBytes() {
     final byte[] readBuffer = new byte[8192];
     final ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    try (InputStream stream = new FileInputStream(file)) {
+    try (InputStream stream = getStream()) {
+      if (stream == null) {
+        return null;
+      }
       int read;
       while ((read = stream.read(readBuffer)) > 0) {
         bos.write(readBuffer, 0, read);
       }
       return bos.toByteArray();
-    } catch (FileNotFoundException e) {
-      return null;
     } catch (IOException e) {
       return null;
     }

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

@@ -26,8 +26,7 @@
 /** Copies {@link NativeSessionFile} into gzipped files within a provided path. */
 class NativeSessionFileGzipper {
 
-  static void processNativeSessions(File nativeSessionDirectory, List<NativeSessionFile> streams)
-      throws IOException {
+  static void processNativeSessions(File nativeSessionDirectory, List<NativeSessionFile> streams) {
 
     for (NativeSessionFile stream : streams) {
       InputStream inputStream = null;