Skip to content

Commit 09caffd

Browse files
squarezwpaulb777
squarezw
authored and
paulb777
committed
fixed "expiclitlySet" typo. (#3853)
1 parent e42c75f commit 09caffd

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

‎Example/Core/Tests/FIRAppTest.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ - (void)testAnalyticsSetByGlobalDataCollectionSwitch {
651651
// Test that the global data collection switch triggers setting Analytics when no explicit flag is
652652
// set.
653653
id optionsMock = OCMClassMock([FIROptions class]);
654-
OCMStub([optionsMock isAnalyticsCollectionExpicitlySet]).andReturn(NO);
654+
OCMStub([optionsMock isAnalyticsCollectionExplicitlySet]).andReturn(NO);
655655

656656
// We need to use the default app name since Analytics only associates with the default app.
657657
FIRApp *defaultApp = [[FIRApp alloc] initInstanceWithName:kFIRDefaultAppName options:optionsMock];
@@ -670,7 +670,7 @@ - (void)testAnalyticsSetByGlobalDataCollectionSwitch {
670670
- (void)testAnalyticsNotSetByGlobalDataCollectionSwitch {
671671
// Test that the global data collection switch doesn't override an explicitly set Analytics flag.
672672
id optionsMock = OCMClassMock([FIROptions class]);
673-
OCMStub([optionsMock isAnalyticsCollectionExpicitlySet]).andReturn(YES);
673+
OCMStub([optionsMock isAnalyticsCollectionExplicitlySet]).andReturn(YES);
674674
FIRApp *app = [[FIRApp alloc] initInstanceWithName:@"testAnalyticsNotSet" options:optionsMock];
675675

676676
id configurationMock = OCMClassMock([FIRAnalyticsConfiguration class]);

‎Example/Core/Tests/FIROptionsTest.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -510,50 +510,50 @@ - (void)testAnalyticsCollectionExplicitlySet {
510510
NSDictionary *optionsDictionary = @{};
511511
FIROptions *options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
512512
NSDictionary *analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
513-
XCTAssertFalse([options isAnalyticsCollectionExpicitlySet]);
513+
XCTAssertFalse([options isAnalyticsCollectionExplicitlySet]);
514514

515515
// Test deactivation flag.
516516
optionsDictionary = @{kFIRIsAnalyticsCollectionDeactivated : @YES};
517517
options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
518518
analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
519-
XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
519+
XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
520520

521521
// If "deactivated" == NO, that doesn't mean it's explicitly set / enabled so it should be treated
522522
// as if it's not set.
523523
optionsDictionary = @{kFIRIsAnalyticsCollectionDeactivated : @NO};
524524
options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
525525
analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
526-
XCTAssertFalse([options isAnalyticsCollectionExpicitlySet]);
526+
XCTAssertFalse([options isAnalyticsCollectionExplicitlySet]);
527527

528528
// Test the collection enabled flag.
529529
optionsDictionary = @{kFIRIsAnalyticsCollectionEnabled : @YES};
530530
options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
531531
analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
532-
XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
532+
XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
533533

534534
optionsDictionary = @{kFIRIsAnalyticsCollectionEnabled : @NO};
535535
options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
536536
analyticsOptions = [options analyticsOptionsDictionaryWithInfoDictionary:@{}];
537-
XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
537+
XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
538538

539539
// Test the old measurement flag.
540540
options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
541541
analyticsOptions =
542542
[options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @YES}];
543-
XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
543+
XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
544544

545545
options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{}];
546546
analyticsOptions =
547547
[options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
548-
XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
548+
XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
549549

550550
// For good measure, a combination of all 3 (even if they conflict).
551551
optionsDictionary =
552552
@{kFIRIsAnalyticsCollectionDeactivated : @YES, kFIRIsAnalyticsCollectionEnabled : @YES};
553553
options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
554554
analyticsOptions =
555555
[options analyticsOptionsDictionaryWithInfoDictionary:@{kFIRIsMeasurementEnabled : @NO}];
556-
XCTAssertTrue([options isAnalyticsCollectionExpicitlySet]);
556+
XCTAssertTrue([options isAnalyticsCollectionExplicitlySet]);
557557
}
558558

559559
- (void)testModifyingOptionsThrows {

‎Firebase/Core/FIRApp.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ - (void)setDataCollectionDefaultEnabled:(BOOL)dataCollectionDefaultEnabled {
352352
}
353353

354354
// Check if the Analytics flag is explicitly set. If so, no further actions are necessary.
355-
if ([self.options isAnalyticsCollectionExpicitlySet]) {
355+
if ([self.options isAnalyticsCollectionExplicitlySet]) {
356356
return;
357357
}
358358

‎Firebase/Core/FIROptions.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ - (BOOL)isMeasurementEnabled {
399399
return [value boolValue];
400400
}
401401

402-
- (BOOL)isAnalyticsCollectionExpicitlySet {
402+
- (BOOL)isAnalyticsCollectionExplicitlySet {
403403
// If it's de-activated, it classifies as explicity set. If not, it's not a good enough indication
404404
// that the developer wants FirebaseAnalytics enabled so continue checking.
405405
if (self.isAnalyticsCollectionDeactivated) {

‎Firebase/Core/Private/FIROptionsInternal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ extern NSString *const kServiceInfoFileType;
6565
* Indicates whether or not Analytics collection was explicitly enabled via a plist flag or at
6666
* runtime.
6767
*/
68-
@property(nonatomic, readonly) BOOL isAnalyticsCollectionExpicitlySet;
68+
@property(nonatomic, readonly) BOOL isAnalyticsCollectionExplicitlySet;
6969

7070
/**
7171
* Whether or not Analytics Collection was enabled. Analytics Collection is enabled unless

‎Metrics/Tests/MetricsTests/example_report.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3404,7 +3404,7 @@
34043404
"coverage": 0.8181818181818182
34053405
},
34063406
{
3407-
"name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
3407+
"name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
34083408
"coverage": 1
34093409
},
34103410
{
@@ -4837,7 +4837,7 @@
48374837
"coverage": 0.8181818181818182
48384838
},
48394839
{
4840-
"name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
4840+
"name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
48414841
"coverage": 1
48424842
},
48434843
{
@@ -11611,7 +11611,7 @@
1161111611
"coverage": 0.8181818181818182
1161211612
},
1161311613
{
11614-
"name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
11614+
"name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
1161511615
"coverage": 1
1161611616
},
1161711617
{
@@ -15694,7 +15694,7 @@
1569415694
"coverage": 0.8181818181818182
1569515695
},
1569615696
{
15697-
"name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
15697+
"name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
1569815698
"coverage": 1
1569915699
},
1570015700
{
@@ -21414,7 +21414,7 @@
2141421414
"coverage": 0.8181818181818182
2141521415
},
2141621416
{
21417-
"name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
21417+
"name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
2141821418
"coverage": 1
2141921419
},
2142021420
{
@@ -25941,7 +25941,7 @@
2594125941
"coverage": 0.8181818181818182
2594225942
},
2594325943
{
25944-
"name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
25944+
"name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
2594525945
"coverage": 1
2594625946
},
2594725947
{
@@ -37299,7 +37299,7 @@
3729937299
"coverage": 0.8181818181818182
3730037300
},
3730137301
{
37302-
"name": "-[FIROptions isAnalyticsCollectionExpicitlySet]",
37302+
"name": "-[FIROptions isAnalyticsCollectionExplicitlySet]",
3730337303
"coverage": 1
3730437304
},
3730537305
{

0 commit comments

Comments
 (0)