Skip to content

Commit ba8623f

Browse files
samedsonsamedson
authored
Fix Performance Unit Test Warnings around UserDefaults (#13787)
1 parent 8738b84 commit ba8623f

File tree

5 files changed

+36
-22
lines changed

5 files changed

+36
-22
lines changed

‎FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#import <XCTest/XCTest.h>
1616

17+
#import <GoogleUtilities/GULUserDefaults.h>
18+
1719
#import "FirebasePerformance/Sources/Common/FPRConstants.h"
1820

1921
#import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
@@ -30,6 +32,10 @@ @interface FPRConfigurationsTest : XCTestCase
3032

3133
@implementation FPRConfigurationsTest
3234

35+
- (GULUserDefaults *_Nonnull)makeEmptyUserDefaults {
36+
return [[GULUserDefaults alloc] init];
37+
}
38+
3339
/** Validates if instance creation works. */
3440
- (void)testInstanceCreation {
3541
XCTAssertNotNil([[FPRConfigurations alloc] initWithSources:FPRConfigurationSourceNone]);
@@ -78,7 +84,7 @@ - (void)testOverridesForDiagnosticsEnabled {
7884
FPRConfigurations *configurations =
7985
[[FPRConfigurations alloc] initWithSources:FPRConfigurationSourceRemoteConfig];
8086

81-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
87+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
8288
configurations.userDefaults = userDefaults;
8389

8490
XCTAssertFalse(configurations.diagnosticsEnabled);
@@ -101,7 +107,7 @@ - (void)testTraceSamplingRateRemoteConfigOverrides {
101107
configurations.remoteConfigFlags = configFlags;
102108
configFlags.lastFetchedTime = [NSDate date];
103109

104-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
110+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
105111
configFlags.userDefaults = userDefaults;
106112

107113
[configFlags resetCache];
@@ -126,7 +132,7 @@ - (void)testNetworkRequestSamplingRateRemoteConfigOverrides {
126132
configurations.remoteConfigFlags = configFlags;
127133
configFlags.lastFetchedTime = [NSDate date];
128134

129-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
135+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
130136
configFlags.userDefaults = userDefaults;
131137

132138
[configFlags resetCache];
@@ -151,7 +157,7 @@ - (void)testSessionSamplingRateRemoteConfigOverrides {
151157
configurations.remoteConfigFlags = configFlags;
152158
configFlags.lastFetchedTime = [NSDate date];
153159

154-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
160+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
155161
configFlags.userDefaults = userDefaults;
156162

157163
[configFlags resetCache];
@@ -176,7 +182,7 @@ - (void)testSessionSamplingRatePlistOverrides {
176182
configurations.remoteConfigFlags = configFlags;
177183
configFlags.lastFetchedTime = [NSDate date];
178184

179-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
185+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
180186
configFlags.userDefaults = userDefaults;
181187

182188
[configFlags resetCache];
@@ -205,7 +211,7 @@ - (void)testLogSourceRemoteConfigOverrides {
205211
configurations.remoteConfigFlags = configFlags;
206212
configFlags.lastFetchedTime = [NSDate date];
207213

208-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
214+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
209215
configFlags.userDefaults = userDefaults;
210216

211217
[configFlags resetCache];
@@ -239,7 +245,7 @@ - (void)testDisabledSDKVersionsConfigResolveSuccessful {
239245
configurations.remoteConfigFlags = configFlags;
240246
configFlags.lastFetchedTime = [NSDate date];
241247

242-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
248+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
243249
configFlags.userDefaults = userDefaults;
244250

245251
NSSet<NSString *> *versionSet =
@@ -269,7 +275,7 @@ - (void)testDisabledSDKVersionsDisablesSDK {
269275
configurations.remoteConfigFlags = configFlags;
270276
configFlags.lastFetchedTime = [NSDate date];
271277

272-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
278+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
273279
configFlags.userDefaults = userDefaults;
274280

275281
NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];
@@ -299,7 +305,7 @@ - (void)testSDKEnabledFlag {
299305
configurations.remoteConfigFlags = configFlags;
300306
configFlags.lastFetchedTime = [NSDate date];
301307

302-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
308+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
303309
configFlags.userDefaults = userDefaults;
304310

305311
NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];
@@ -325,7 +331,7 @@ - (void)testPlistOverridesSDKEnabledFlag {
325331
configurations.remoteConfigFlags = configFlags;
326332
configFlags.lastFetchedTime = [NSDate date];
327333

328-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
334+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
329335
configFlags.userDefaults = userDefaults;
330336

331337
NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];
@@ -351,7 +357,7 @@ - (void)testForegroundRateLimitingTraceCountRemoteConfigOverrides {
351357
configurations.remoteConfigFlags = configFlags;
352358
configFlags.lastFetchedTime = [NSDate date];
353359

354-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
360+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
355361
configFlags.userDefaults = userDefaults;
356362

357363
NSString *configKey =
@@ -375,7 +381,7 @@ - (void)testBackgroundRateLimitingTraceCountRemoteConfigOverrides {
375381
configurations.remoteConfigFlags = configFlags;
376382
configFlags.lastFetchedTime = [NSDate date];
377383

378-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
384+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
379385
configFlags.userDefaults = userDefaults;
380386

381387
NSString *configKey =
@@ -399,7 +405,7 @@ - (void)testForegroundRateLimitingNetworkCountRemoteConfigOverrides {
399405
configurations.remoteConfigFlags = configFlags;
400406
configFlags.lastFetchedTime = [NSDate date];
401407

402-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
408+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
403409
configFlags.userDefaults = userDefaults;
404410

405411
NSString *configKey = [NSString
@@ -423,7 +429,7 @@ - (void)testBackgroundRateLimitingNetworkCountRemoteConfigOverrides {
423429
configurations.remoteConfigFlags = configFlags;
424430
configFlags.lastFetchedTime = [NSDate date];
425431

426-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
432+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
427433
configFlags.userDefaults = userDefaults;
428434

429435
NSString *configKey = [NSString
@@ -447,7 +453,7 @@ - (void)testRateLimitingDurationRemoteConfigOverrides {
447453
configurations.remoteConfigFlags = configFlags;
448454
configFlags.lastFetchedTime = [NSDate date];
449455

450-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
456+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
451457
configFlags.userDefaults = userDefaults;
452458

453459
NSString *configKey =
@@ -477,7 +483,7 @@ - (void)testGaugeCollectionFrequencyRemoteConfigOverrides {
477483
configurations.remoteConfigFlags = configFlags;
478484
configFlags.lastFetchedTime = [NSDate date];
479485

480-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
486+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
481487
configFlags.userDefaults = userDefaults;
482488

483489
NSString *configKeyCPUFg =
@@ -526,7 +532,7 @@ - (void)testSessionMaxLengthDurationRemoteConfigOverrides {
526532
configurations.remoteConfigFlags = configFlags;
527533
configFlags.lastFetchedTime = [NSDate date];
528534

529-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
535+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
530536
configFlags.userDefaults = userDefaults;
531537

532538
NSString *configKey =
@@ -549,7 +555,7 @@ - (void)testPrewarmDetectionRemoteConfigOverrides {
549555
configurations.remoteConfigFlags = configFlags;
550556
configFlags.lastFetchedTime = [NSDate date];
551557

552-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
558+
GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults];
553559
configFlags.userDefaults = userDefaults;
554560

555561
NSString *configKey =

‎FirebasePerformance/Tests/Unit/FPRNetworkTraceTest.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#import <XCTest/XCTest.h>
1616

17+
#import <GoogleUtilities/GULUserDefaults.h>
18+
1719
#import "FirebasePerformance/Sources/AppActivity/FPRSessionManager.h"
1820
#import "FirebasePerformance/Sources/Common/FPRConstants.h"
1921
#import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
@@ -141,7 +143,7 @@ - (void)testTraceCreationWhenSDKFlagEnabled {
141143
[[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
142144
configurations.remoteConfigFlags = configFlags;
143145

144-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
146+
GULUserDefaults *userDefaults = [[GULUserDefaults alloc] init];
145147
configFlags.userDefaults = userDefaults;
146148

147149
NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];

‎FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#import <XCTest/XCTest.h>
1616

17+
#import <GoogleUtilities/GULUserDefaults.h>
18+
1719
#import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
1820
#import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h"
1921
#import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h"
@@ -91,7 +93,7 @@ - (void)testGaugeCollectionDisabledWhenSDKFlagDisabled {
9193
[[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
9294
configurations.remoteConfigFlags = configFlags;
9395

94-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
96+
GULUserDefaults *_Nonnull userDefaults = [[GULUserDefaults alloc] init];
9597
configFlags.userDefaults = userDefaults;
9698

9799
NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];

‎FirebasePerformance/Tests/Unit/Instruments/FIRHTTPMetricTests.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#import <XCTest/XCTest.h>
1616

17+
#import <GoogleUtilities/GULUserDefaults.h>
18+
1719
#import "FirebasePerformance/Sources/Common/FPRConstants.h"
1820
#import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h"
1921
#import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h"
@@ -118,7 +120,7 @@ - (void)testMetricCreationWhenSDKFlagEnabled {
118120
[[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
119121
configurations.remoteConfigFlags = configFlags;
120122

121-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
123+
GULUserDefaults *userDefaults = [[GULUserDefaults alloc] init];
122124
configFlags.userDefaults = userDefaults;
123125

124126
NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];

‎FirebasePerformance/Tests/Unit/Timer/FIRTraceTest.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
#import <XCTest/XCTest.h>
1616

17+
#import <GoogleUtilities/GULUserDefaults.h>
18+
1719
#import "FirebasePerformance/Sources/AppActivity/FPRAppActivityTracker.h"
1820
#import "FirebasePerformance/Sources/AppActivity/FPRSessionManager.h"
1921
#import "FirebasePerformance/Sources/Common/FPRConstants.h"
@@ -99,7 +101,7 @@ - (void)testTraceCreationWhenSDKFlagEnabled {
99101
[[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
100102
configurations.remoteConfigFlags = configFlags;
101103

102-
NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init];
104+
GULUserDefaults *userDefaults = [[GULUserDefaults alloc] init];
103105
configFlags.userDefaults = userDefaults;
104106

105107
NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"];

0 commit comments

Comments
 (0)