Skip to content

Commit a2409b4

Browse files
[FIAM] Replace hardcoded SDK version with Config.OLDEST_SDK (#7059)
Tests will use the Config.OLDEST_SDK instead of a hardcoded SDK if the corresponding hardcoded SDK would be below our intended minSdk. I'll also need to re-evaluate whether these tests are necessary to keep around, or if they are irrelevant when bumping the minSdk. Related to cl/770033566 --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 parent 8b33282 commit a2409b4

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/AnalyticsEventsManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.robolectric.junit.rules.ExpectedLogMessagesRule;
4444

4545
@RunWith(RobolectricTestRunner.class)
46-
@Config(manifest = Config.NONE, sdk = 22, qualifiers = "es")
46+
@Config(manifest = Config.NONE, sdk = Config.OLDEST_SDK, qualifiers = "es")
4747
public class AnalyticsEventsManagerTest {
4848

4949
@Rule public final ExpectedLogMessagesRule logged = new ExpectedLogMessagesRule();

firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ApiClientTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@
4949
import org.mockito.Mock;
5050
import org.mockito.MockitoAnnotations;
5151
import org.robolectric.RobolectricTestRunner;
52+
import org.robolectric.RuntimeEnvironment;
5253
import org.robolectric.annotation.Config;
5354

5455
@RunWith(RobolectricTestRunner.class)
55-
@Config(manifest = Config.NONE, sdk = 22, qualifiers = "es")
56+
@Config(manifest = Config.NONE, sdk = Config.OLDEST_SDK, qualifiers = "es")
5657
public class ApiClientTest {
5758

5859
public static final String TIME_ZONE = "Europe/London";
@@ -210,7 +211,8 @@ public void getFiams_signalsContainsPlatformVersion() {
210211
fetchEligibleCampaignsRequestArgcaptor.getValue().getClientSignals();
211212

212213
// sdk version set in roboelectric annotation above
213-
assertThat(clientSignals.getPlatformVersion()).isEqualTo("22");
214+
assertThat(clientSignals.getPlatformVersion())
215+
.isEqualTo(String.valueOf(RuntimeEnvironment.getApiLevel()));
214216
}
215217

216218
@Test

0 commit comments

Comments
 (0)