Crashlytics ndk datatransport

firebase-crashlytics/src/androidTest/assets/firebase_settings.json

@@ -8,6 +8,7 @@
   "app": {
     "status": "activated",
     "report_upload_variant": 2,
+    "native_report_upload_variant": 2,
     "update_required": true
   },
   "fabric": {

firebase-crashlytics/src/androidTest/assets/firebase_settings_new.json

@@ -8,6 +8,7 @@
   "app": {
     "status": "new",
     "report_upload_variant": 2,
+    "native_report_upload_variant": 2,
     "update_required": true
   },
   "fabric": {

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

@@ -0,0 +1,62 @@
+// Copyright 2020 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.common;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
+import java.io.IOException;
+import org.junit.Test;
+
+public class BytesBackedNativeSessionFileTest {
+  byte[] testBytes = {0, 2, 20, 10};
+  byte[] emptyBytes = {};
+
+  @Test
+  public void testAsStream_convertsToStream() throws IOException {
+    BytesBackedNativeSessionFile nativeSessionFile =
+        new BytesBackedNativeSessionFile("file", testBytes);
+    byte[] readBytes = new byte[4];
+    nativeSessionFile.getStream().read(readBytes);
+    assertArrayEquals(testBytes, readBytes);
+  }
+
+  @Test
+  public void testAsStreamWhenEmpty_returnsNull() {
+    BytesBackedNativeSessionFile nativeSessionFile =
+        new BytesBackedNativeSessionFile("file", emptyBytes);
+    assertNull(nativeSessionFile.getStream());
+  }
+
+  @Test
+  public void testAsFilePayload_convertsToFilePayload() {
+    BytesBackedNativeSessionFile nativeSessionFile =
+        new BytesBackedNativeSessionFile("file", testBytes);
+    CrashlyticsReport.FilesPayload.File filesPayload = nativeSessionFile.asFilePayload();
+    assertNotNull(filesPayload);
+    assertArrayEquals(testBytes, filesPayload.getContents());
+    assertEquals("file", filesPayload.getFilename());
+  }
+
+  @Test
+  public void testAsFilePayloadWhenEmpty_convertsToNull() {
+    BytesBackedNativeSessionFile nativeSessionFile =
+        new BytesBackedNativeSessionFile("file", emptyBytes);
+    assertNull(nativeSessionFile.asFilePayload());
+  }
+}

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

@@ -67,6 +67,7 @@
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
+import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 
@@ -116,7 +117,10 @@ protected void setUp() throws Exception {
     when(mockFileStore.getFilesDirPath()).thenReturn(testFilesDirectory.getPath());
 
     final SettingsData testSettingsData =
-        new TestSettingsData(3, CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY);
+        new TestSettingsData(
+            3,
+            DataTransportState.REPORT_UPLOAD_VARIANT_LEGACY,
+            DataTransportState.REPORT_UPLOAD_VARIANT_LEGACY);
     appSettingsData = testSettingsData.appData;
     sessionSettingsData = testSettingsData.sessionData;
 
@@ -563,6 +567,16 @@ public void testLargestFileNameFirst() {
     assertTrue(Arrays.equals(expectedOrder, testOrder));
   }
 
+  @Test
+  public void testFinalizePreviousNativeSession_finalizesPreviousNativeSession() {
+    final CrashlyticsController controller = createController();
+  }
+
+  @Test
+  public void testGetNativeSessionFiles_getsNativeSessionFiles() {
+    // FIXME:
+  }
+
   // TODO: There's only ever one open session now that we can close sessions while offline.
   // Is that the behavior we want?
   /*

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

@@ -610,7 +610,10 @@ private Task<CrashlyticsCore> startCoreAsync(CrashlyticsCore crashlyticsCore) {
 
     SettingsController mockSettingsController = mock(SettingsController.class);
     final SettingsData settings =
-        new TestSettingsData(3, CrashlyticsController.REPORT_UPLOAD_VARIANT_LEGACY);
+        new TestSettingsData(
+            3,
+            DataTransportState.REPORT_UPLOAD_VARIANT_LEGACY,
+            DataTransportState.REPORT_UPLOAD_VARIANT_LEGACY);
     when(mockSettingsController.getSettings()).thenReturn(settings);
     when(mockSettingsController.getAppSettings()).thenReturn(Tasks.forResult(settings.appData));
 

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

@@ -0,0 +1,108 @@
+// Copyright 2020 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.common;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import android.content.Context;
+import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
+import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import org.junit.Test;
+
+public class FileBackedNativeSessionFileTest extends CrashlyticsTestCase {
+  byte[] testContents = {0, 2, 20, 10};
+  byte[] emptyContents = {};
+  File testFile;
+  File emptyFile;
+  File missingFile;
+
+  @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);
+    }
+    emptyFile = new File(context.getFilesDir(), "emptyFile");
+    emptyFile.createNewFile();
+    missingFile = new File(context.getFilesDir(), "missingFile");
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    super.tearDown();
+    testFile.delete();
+    emptyFile.delete();
+  }
+
+  @Test
+  public void testAsStream_convertsToStream() throws IOException {
+    FileBackedNativeSessionFile nativeSessionFile =
+        new FileBackedNativeSessionFile("file", testFile);
+    byte[] readBytes = new byte[4];
+    nativeSessionFile.getStream().read(readBytes);
+    assertArrayEquals(testContents, readBytes);
+  }
+
+  @Test
+  public void testAsStreamWhenEmpty_returnsEmpty() throws IOException {
+    FileBackedNativeSessionFile nativeSessionFile =
+        new FileBackedNativeSessionFile("file", emptyFile);
+    byte[] readBytes = new byte[0];
+    nativeSessionFile.getStream().read(readBytes);
+    assertArrayEquals(emptyContents, readBytes);
+  }
+
+  @Test
+  public void testAsStreamWhenMissing_returnsNull() {
+    FileBackedNativeSessionFile nativeSessionFile =
+        new FileBackedNativeSessionFile("file", missingFile);
+    assertNull(nativeSessionFile.getStream());
+  }
+
+  @Test
+  public void testAsFilePayload_convertsToFilePayload() {
+    FileBackedNativeSessionFile nativeSessionFile =
+        new FileBackedNativeSessionFile("file", testFile);
+    CrashlyticsReport.FilesPayload.File filesPayload = nativeSessionFile.asFilePayload();
+    assertNotNull(filesPayload);
+    assertArrayEquals(testContents, filesPayload.getContents());
+    assertEquals("file", filesPayload.getFilename());
+  }
+
+  @Test
+  public void testAsFilePayloadWhenEmpty_returnsEmptyPayload() {
+    FileBackedNativeSessionFile nativeSessionFile =
+        new FileBackedNativeSessionFile("file", emptyFile);
+    CrashlyticsReport.FilesPayload.File filesPayload = nativeSessionFile.asFilePayload();
+    assertNotNull(filesPayload);
+    assertArrayEquals(emptyContents, filesPayload.getContents());
+    assertEquals("file", filesPayload.getFilename());
+  }
+
+  @Test
+  public void testAsFilePayloadWhenMissing_convertsToNull() {
+    FileBackedNativeSessionFile nativeSessionFile =
+        new FileBackedNativeSessionFile("file", missingFile);
+    assertNull(nativeSessionFile.asFilePayload());
+  }
+}

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

@@ -0,0 +1,81 @@
+// Copyright 2020 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.common;
+
+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();
+  }
+
+  @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 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()));
+  }
+}