Skip to content

Commit ee1fa0d

Browse files
committed
fix unit tests
1 parent 5b846b9 commit ee1fa0d

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigResolverTest.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2517,26 +2517,27 @@ public void getFragmentSamplingRate_validMetadata_notSaveMetadataInCache() {
25172517

25182518
@Test
25192519
public void getFragmentSamplingRate_invalidAndroidMetadataBundle_returnDefaultValue() {
2520+
Float defaultValue = ConfigurationConstants.FragmentSamplingRate.getInstance().getDefault();
25202521
when(mockRemoteConfigManager.getFloat(FRAGMENT_SAMPLING_RATE_FRC_KEY))
25212522
.thenReturn(Optional.absent());
25222523
when(mockDeviceCacheManager.getFloat(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
25232524
.thenReturn(Optional.absent());
25242525

2525-
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0f);
2526+
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
25262527

25272528
// Case #1: Android Metadata bundle value is too high.
25282529
Bundle bundle = new Bundle();
25292530
bundle.putFloat("fragment_sampling_percentage", 200.00f);
25302531
testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
25312532

2532-
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0f);
2533+
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
25332534

25342535
// Case #2: Android Metadata bundle value is too low.
25352536
bundle = new Bundle();
25362537
bundle.putFloat("fragment_sampling_percentage", -1.00f);
25372538
testConfigResolver.setMetadataBundle(new ImmutableBundle(bundle));
25382539

2539-
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0f);
2540+
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
25402541
}
25412542

25422543
@Test
@@ -2618,6 +2619,7 @@ public void getFragmentSamplingRate_validRemoteConfig_returnRemoteConfigValue()
26182619

26192620
@Test
26202621
public void getFragmentSamplingRate_invalidRemoteConfig_returnDefaultValue() {
2622+
Float defaultValue = ConfigurationConstants.FragmentSamplingRate.getInstance().getDefault();
26212623
// Mock behavior that device cache doesn't have session sampling rate value.
26222624
when(mockDeviceCacheManager.getFloat(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
26232625
.thenReturn(Optional.absent());
@@ -2626,14 +2628,14 @@ public void getFragmentSamplingRate_invalidRemoteConfig_returnDefaultValue() {
26262628
when(mockRemoteConfigManager.getFloat(FRAGMENT_SAMPLING_RATE_FRC_KEY))
26272629
.thenReturn(Optional.of(1.01f));
26282630

2629-
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0f);
2631+
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
26302632
verify(mockDeviceCacheManager, never()).setValue(any(), any());
26312633

26322634
// Case #2: Firebase Remote Config value is too low.
26332635
when(mockRemoteConfigManager.getFloat(FRAGMENT_SAMPLING_RATE_FRC_KEY))
26342636
.thenReturn(Optional.of(-0.1f));
26352637

2636-
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0f);
2638+
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
26372639
verify(mockDeviceCacheManager, never()).setValue(any(), any());
26382640
}
26392641

@@ -2671,6 +2673,7 @@ public void getFragmentSamplingRate_validCache_returnCacheValue() {
26712673

26722674
@Test
26732675
public void getFragmentSamplingRate_invalidCache_returnDefaultValue() {
2676+
Float defaultValue = ConfigurationConstants.FragmentSamplingRate.getInstance().getDefault();
26742677
// Mock behavior that remote config doesn't have session sampling rate value.
26752678
when(mockRemoteConfigManager.getFloat(FRAGMENT_SAMPLING_RATE_FRC_KEY))
26762679
.thenReturn(Optional.absent());
@@ -2679,13 +2682,13 @@ public void getFragmentSamplingRate_invalidCache_returnDefaultValue() {
26792682
when(mockDeviceCacheManager.getFloat(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
26802683
.thenReturn(Optional.of(10.0f));
26812684

2682-
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0f);
2685+
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
26832686

26842687
// Case #2: Device Cache value is too low.
26852688
when(mockDeviceCacheManager.getFloat(FRAGMENT_SAMPLING_RATE_CACHE_KEY))
26862689
.thenReturn(Optional.of(-1.0f));
26872690

2688-
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(1.0f);
2691+
assertThat(testConfigResolver.getFragmentSamplingRate()).isEqualTo(defaultValue);
26892692
}
26902693

26912694
@Test

firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigurationConstantsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public void getInstance_LogSourceName_validateConstants() {
259259
public void getInstance_FragmentSamplingRate_validateConstants() {
260260
FragmentSamplingRate configFlag = FragmentSamplingRate.getInstance();
261261

262-
assertThat(configFlag.getDefault()).isEqualTo(1.0f);
262+
assertThat(configFlag.getDefault()).isEqualTo(0.0f);
263263
assertThat(configFlag.getDeviceCacheFlag())
264264
.isEqualTo("com.google.firebase.perf.FragmentSamplingRate");
265265
assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_fragment_sampling_rate");

0 commit comments

Comments
 (0)