From 5ca4d66f103ec7eac7b484704d565b4df9f88f8a Mon Sep 17 00:00:00 2001 From: samedson Date: Thu, 3 Oct 2024 10:45:49 -0400 Subject: [PATCH 1/3] Fix Performance Unit Test Warnings around UserDefaults --- .../Configurations/FPRConfigurationsTest.m | 42 +++++++++++-------- .../Tests/Unit/FPRNetworkTraceTest.m | 4 +- .../Tests/Unit/Gauges/FPRGaugeManagerTests.m | 8 +++- .../Unit/Instruments/FIRHTTPMetricTests.m | 4 +- .../Tests/Unit/Timer/FIRTraceTest.m | 4 +- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m b/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m index 8489223e1e4..286d273335c 100644 --- a/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m +++ b/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m @@ -14,6 +14,8 @@ #import +#import + #import "FirebasePerformance/Sources/Common/FPRConstants.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h" @@ -30,6 +32,10 @@ @interface FPRConfigurationsTest : XCTestCase @implementation FPRConfigurationsTest +- (GULUserDefaults * _Nonnull)makeEmptyUserDefaults { + return [[GULUserDefaults alloc] init]; +} + /** Validates if instance creation works. */ - (void)testInstanceCreation { XCTAssertNotNil([[FPRConfigurations alloc] initWithSources:FPRConfigurationSourceNone]); @@ -78,7 +84,7 @@ - (void)testOverridesForDiagnosticsEnabled { FPRConfigurations *configurations = [[FPRConfigurations alloc] initWithSources:FPRConfigurationSourceRemoteConfig]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configurations.userDefaults = userDefaults; XCTAssertFalse(configurations.diagnosticsEnabled); @@ -101,7 +107,7 @@ - (void)testTraceSamplingRateRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -126,7 +132,7 @@ - (void)testNetworkRequestSamplingRateRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -151,7 +157,7 @@ - (void)testSessionSamplingRateRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -176,7 +182,7 @@ - (void)testSessionSamplingRatePlistOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -205,7 +211,7 @@ - (void)testLogSourceRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; [configFlags resetCache]; @@ -239,7 +245,7 @@ - (void)testDisabledSDKVersionsConfigResolveSuccessful { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSSet *versionSet = @@ -269,7 +275,7 @@ - (void)testDisabledSDKVersionsDisablesSDK { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; @@ -299,7 +305,7 @@ - (void)testSDKEnabledFlag { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; @@ -325,7 +331,7 @@ - (void)testPlistOverridesSDKEnabledFlag { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; @@ -351,7 +357,7 @@ - (void)testForegroundRateLimitingTraceCountRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -375,7 +381,7 @@ - (void)testBackgroundRateLimitingTraceCountRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -399,7 +405,7 @@ - (void)testForegroundRateLimitingNetworkCountRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString @@ -423,7 +429,7 @@ - (void)testBackgroundRateLimitingNetworkCountRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString @@ -447,7 +453,7 @@ - (void)testRateLimitingDurationRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -477,7 +483,7 @@ - (void)testGaugeCollectionFrequencyRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKeyCPUFg = @@ -526,7 +532,7 @@ - (void)testSessionMaxLengthDurationRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = @@ -549,7 +555,7 @@ - (void)testPrewarmDetectionRemoteConfigOverrides { configurations.remoteConfigFlags = configFlags; configFlags.lastFetchedTime = [NSDate date]; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = diff --git a/FirebasePerformance/Tests/Unit/FPRNetworkTraceTest.m b/FirebasePerformance/Tests/Unit/FPRNetworkTraceTest.m index c913dac3aaf..9956735c75d 100644 --- a/FirebasePerformance/Tests/Unit/FPRNetworkTraceTest.m +++ b/FirebasePerformance/Tests/Unit/FPRNetworkTraceTest.m @@ -14,6 +14,8 @@ #import +#import + #import "FirebasePerformance/Sources/AppActivity/FPRSessionManager.h" #import "FirebasePerformance/Sources/Common/FPRConstants.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h" @@ -141,7 +143,7 @@ - (void)testTraceCreationWhenSDKFlagEnabled { [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; configurations.remoteConfigFlags = configFlags; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *userDefaults = [[GULUserDefaults alloc] init]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; diff --git a/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m b/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m index c31ced38799..ec414bf6151 100644 --- a/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m +++ b/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m @@ -14,6 +14,8 @@ #import +#import + #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h" #import "FirebasePerformance/Sources/Configurations/FPRRemoteConfigFlags+Private.h" @@ -47,6 +49,10 @@ - (void)tearDown { [performance setDataCollectionEnabled:NO]; } +- (GULUserDefaults * _Nonnull)makeEmptyUserDefaults { + return [[GULUserDefaults alloc] init]; +} + /* Verify if the instance creation works. */ - (void)testInstanceCreation { XCTAssertNotNil([[FPRGaugeManager alloc] initWithGauges:FPRGaugeNone]); @@ -91,7 +97,7 @@ - (void)testGaugeCollectionDisabledWhenSDKFlagDisabled { [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; configurations.remoteConfigFlags = configFlags; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; diff --git a/FirebasePerformance/Tests/Unit/Instruments/FIRHTTPMetricTests.m b/FirebasePerformance/Tests/Unit/Instruments/FIRHTTPMetricTests.m index 7139976b4c6..c837c477a44 100644 --- a/FirebasePerformance/Tests/Unit/Instruments/FIRHTTPMetricTests.m +++ b/FirebasePerformance/Tests/Unit/Instruments/FIRHTTPMetricTests.m @@ -14,6 +14,8 @@ #import +#import + #import "FirebasePerformance/Sources/Common/FPRConstants.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations+Private.h" #import "FirebasePerformance/Sources/Configurations/FPRConfigurations.h" @@ -118,7 +120,7 @@ - (void)testMetricCreationWhenSDKFlagEnabled { [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; configurations.remoteConfigFlags = configFlags; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *userDefaults = [[GULUserDefaults alloc] init]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; diff --git a/FirebasePerformance/Tests/Unit/Timer/FIRTraceTest.m b/FirebasePerformance/Tests/Unit/Timer/FIRTraceTest.m index fd57a2bf503..bd187089d16 100644 --- a/FirebasePerformance/Tests/Unit/Timer/FIRTraceTest.m +++ b/FirebasePerformance/Tests/Unit/Timer/FIRTraceTest.m @@ -14,6 +14,8 @@ #import +#import + #import "FirebasePerformance/Sources/AppActivity/FPRAppActivityTracker.h" #import "FirebasePerformance/Sources/AppActivity/FPRSessionManager.h" #import "FirebasePerformance/Sources/Common/FPRConstants.h" @@ -99,7 +101,7 @@ - (void)testTraceCreationWhenSDKFlagEnabled { [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; configurations.remoteConfigFlags = configFlags; - NSUserDefaults *userDefaults = [[NSUserDefaults alloc] init]; + GULUserDefaults *userDefaults = [[GULUserDefaults alloc] init]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; From 6c292213e977e60773c81d537566669a50181a4c Mon Sep 17 00:00:00 2001 From: samedson Date: Thu, 3 Oct 2024 10:47:07 -0400 Subject: [PATCH 2/3] Fixup --- .../Tests/Unit/Gauges/FPRGaugeManagerTests.m | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m b/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m index ec414bf6151..214b1b38daf 100644 --- a/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m +++ b/FirebasePerformance/Tests/Unit/Gauges/FPRGaugeManagerTests.m @@ -49,10 +49,6 @@ - (void)tearDown { [performance setDataCollectionEnabled:NO]; } -- (GULUserDefaults * _Nonnull)makeEmptyUserDefaults { - return [[GULUserDefaults alloc] init]; -} - /* Verify if the instance creation works. */ - (void)testInstanceCreation { XCTAssertNotNil([[FPRGaugeManager alloc] initWithGauges:FPRGaugeNone]); @@ -97,7 +93,7 @@ - (void)testGaugeCollectionDisabledWhenSDKFlagDisabled { [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig]; configurations.remoteConfigFlags = configFlags; - GULUserDefaults *_Nonnull userDefaults = [self makeEmptyUserDefaults]; + GULUserDefaults *_Nonnull userDefaults = [[GULUserDefaults alloc] init]; configFlags.userDefaults = userDefaults; NSString *configKey = [NSString stringWithFormat:@"%@.%@", kFPRConfigPrefix, @"fpr_enabled"]; From c8358af11499f9ae190178b2389f5d4ba672e56d Mon Sep 17 00:00:00 2001 From: samedson Date: Thu, 3 Oct 2024 10:55:09 -0400 Subject: [PATCH 3/3] Style --- .../Tests/Unit/Configurations/FPRConfigurationsTest.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m b/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m index 286d273335c..4d87cbdb29b 100644 --- a/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m +++ b/FirebasePerformance/Tests/Unit/Configurations/FPRConfigurationsTest.m @@ -32,7 +32,7 @@ @interface FPRConfigurationsTest : XCTestCase @implementation FPRConfigurationsTest -- (GULUserDefaults * _Nonnull)makeEmptyUserDefaults { +- (GULUserDefaults *_Nonnull)makeEmptyUserDefaults { return [[GULUserDefaults alloc] init]; }