Fix more tests (#6072)

Author: mrober

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

@@ -128,6 +128,11 @@ public CoreBuilder setNativeComponent(CrashlyticsNativeComponent nativeComponent
       return this;
     }
 
+    public CoreBuilder setFileStore(FileStore fileStore) {
+      this.fileStore = fileStore;
+      return this;
+    }
+
     public CrashlyticsCore build() {
       return new CrashlyticsCore(
           app,
@@ -230,7 +235,8 @@ public void testOnPreExecute_buildIdNotRequiredAndDoesNotExist() {
   }
 
   public void testOnPreExecute_didCrashOnPreviousExecution() throws Exception {
-    final CrashlyticsCore crashlyticsCore = builder().build();
+    // Use the same file store for core as the crash marker.
+    CrashlyticsCore crashlyticsCore = builder().setFileStore(fileStore).build();
     setupBuildIdRequired(String.valueOf(false));
     setupAppData(BUILD_ID);
     setupCrashMarker();

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

@@ -17,6 +17,7 @@
 import static java.util.Arrays.stream;
 
 import android.content.Context;
+import androidx.test.filters.SdkSuppress;
 import com.google.firebase.crashlytics.internal.CrashlyticsTestCase;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -59,6 +60,7 @@ protected void tearDown() throws Exception {
   }
 
   @Test
+  @SdkSuppress(minSdkVersion = 24) // streams
   public void testProcessNativeSessions_putsFilesInCorrectLocation() {
     String fileBackedSessionName = "file";
     String byteBackedSessionName = "byte";
@@ -78,6 +80,7 @@ public void testProcessNativeSessions_putsFilesInCorrectLocation() {
   }
 
   @Test
+  @SdkSuppress(minSdkVersion = 24) // streams
   public void testProcessNativeSessionsWhenDataIsNull_putsFilesInCorrectLocation() {
     String fileBackedSessionName = "file";
     String byteBackedSessionName = "byte";