From 5a0586eac4a7575df81f7517da2be17ba809fb09 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 13 Jun 2025 19:31:32 -0400 Subject: [PATCH 1/3] [Storage] Replace hardcoded SDK version with Config.OLDEST_SDK Tests will use the Config.OLDEST_SDK instead of a hardcoded SDK if the corresponding hardcoded SDK would be below our inteded minSdk. As a pending work is re-evaluate whether these tests are necessary to keep around, or if they are irrelevant when bumping the minSdk. Related to cl/769913191 --- .../com/google/firebase/storage/AdaptiveStreamBufferTest.java | 3 +-- .../test/java/com/google/firebase/storage/DependencyTest.java | 3 +-- .../java/com/google/firebase/storage/StorageReferenceTest.java | 3 +-- .../com/google/firebase/storage/StreamProgressWrapperTest.java | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java index fd9a10ff7b5..fd0fff7f9e5 100644 --- a/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java +++ b/firebase-storage/src/test/java/com/google/firebase/storage/AdaptiveStreamBufferTest.java @@ -16,7 +16,6 @@ import static org.junit.Assert.assertArrayEquals; -import android.os.Build; import com.google.firebase.storage.internal.AdaptiveStreamBuffer; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -30,7 +29,7 @@ /** Tests for {@link AdaptiveStreamBuffer}. */ @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1) +@Config(sdk = Config.OLDEST_SDK) public class AdaptiveStreamBufferTest { @Rule public RetryRule retryRule = new RetryRule(3); diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java index 1c1ef9b56ce..97d1759d3d1 100644 --- a/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java +++ b/firebase-storage/src/test/java/com/google/firebase/storage/DependencyTest.java @@ -14,7 +14,6 @@ package com.google.firebase.storage; -import android.os.Build; import com.google.android.gms.tasks.Task; import java.lang.reflect.Method; import java.util.ArrayList; @@ -29,7 +28,7 @@ /** Tests for {@link FirebaseStorage}. */ @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1) +@Config(sdk = Config.OLDEST_SDK) public class DependencyTest { @Rule public RetryRule retryRule = new RetryRule(3); diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java index c55a943f5c3..0847db6d878 100644 --- a/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java +++ b/firebase-storage/src/test/java/com/google/firebase/storage/StorageReferenceTest.java @@ -16,7 +16,6 @@ import static com.google.firebase.common.testutil.Assert.assertThrows; -import android.os.Build; import androidx.test.core.app.ApplicationProvider; import com.google.android.gms.tasks.Task; import com.google.firebase.FirebaseApp; @@ -38,7 +37,7 @@ /** Tests for {@link FirebaseStorage}. */ @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1) +@Config(sdk = Config.OLDEST_SDK) public class StorageReferenceTest { @Rule public RetryRule retryRule = new RetryRule(3); diff --git a/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java b/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java index 196162d5a89..4a35ec47847 100644 --- a/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java +++ b/firebase-storage/src/test/java/com/google/firebase/storage/StreamProgressWrapperTest.java @@ -16,7 +16,6 @@ import static com.google.firebase.common.testutil.Assert.assertThrows; -import android.os.Build; import com.google.firebase.storage.StreamDownloadTask.StreamProgressWrapper; import com.google.firebase.storage.network.MockInputStreamHelper; import java.io.ByteArrayInputStream; @@ -35,7 +34,7 @@ /** Tests for {@link StreamProgressWrapper}. */ @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.LOLLIPOP_MR1) +@Config(sdk = Config.OLDEST_SDK) @SuppressWarnings("ResultOfMethodCallIgnored") public class StreamProgressWrapperTest { From 87a55a3bc107fed88079608e6fd6a9c9a9b88f12 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Fri, 13 Jun 2025 23:27:02 -0400 Subject: [PATCH 2/3] Add robolectric properties file --- firebase-storage/src/test/resources/robolectric.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 firebase-storage/src/test/resources/robolectric.properties diff --git a/firebase-storage/src/test/resources/robolectric.properties b/firebase-storage/src/test/resources/robolectric.properties new file mode 100644 index 00000000000..5ea997b0f25 --- /dev/null +++ b/firebase-storage/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=23 \ No newline at end of file From 3a8d4ac480b3192d3c00edbb47a8c9d0f89c36a2 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazo Paz Date: Wed, 18 Jun 2025 12:10:35 -0400 Subject: [PATCH 3/3] robolectric file is not necessary --- firebase-storage/src/test/resources/robolectric.properties | 1 - 1 file changed, 1 deletion(-) delete mode 100644 firebase-storage/src/test/resources/robolectric.properties diff --git a/firebase-storage/src/test/resources/robolectric.properties b/firebase-storage/src/test/resources/robolectric.properties deleted file mode 100644 index 5ea997b0f25..00000000000 --- a/firebase-storage/src/test/resources/robolectric.properties +++ /dev/null @@ -1 +0,0 @@ -sdk=23 \ No newline at end of file