Skip to content

Commit e587d7d

Browse files
authored
Minor RC cleanup (#6722)
* Cleanup developer mode variables * Fix README link * Use fully qualified namespace in test to avoid errors * Fix whitespace
1 parent 5728580 commit e587d7d

File tree

3 files changed

+26
-30
lines changed

3 files changed

+26
-30
lines changed

FirebaseRemoteConfig/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ Objective-C and Swift.
66
Firebase Remote Config is a cloud service that lets you change the appearance
77
and behavior of your app without requiring users to download an app update.
88

9-
Please visit [our developer site]
10-
(https://firebase.google.com/docs/remote-config/) for integration instructions,
11-
documentation, support information, and terms of service.
9+
Please visit [our developer site](https://firebase.google.com/docs/remote-config/)
10+
for integration instructions, documentation, support information, and terms of service.

FirebaseRemoteConfig/Sources/FIRRemoteConfig.m

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,11 @@
3434
NSString *const FIRRemoteConfigErrorDomain = @"com.google.remoteconfig.ErrorDomain";
3535
/// Remote Config Error Info End Time Seconds;
3636
NSString *const FIRRemoteConfigThrottledEndTimeInSecondsKey = @"error_throttled_end_time_seconds";
37-
/// Remote Config Developer Mode Key
38-
static NSString *const kRemoteConfigDeveloperKey = @"_rcn_developer";
3937
/// Minimum required time interval between fetch requests made to the backend.
4038
static NSString *const kRemoteConfigMinimumFetchIntervalKey = @"_rcn_minimum_fetch_interval";
4139
/// Timeout value for waiting on a fetch response.
4240
static NSString *const kRemoteConfigFetchTimeoutKey = @"_rcn_fetch_timeout";
4341

44-
@interface FIRRemoteConfigSettings () {
45-
BOOL _developerModeEnabled;
46-
}
47-
@end
48-
4942
@implementation FIRRemoteConfigSettings
5043

5144
- (instancetype)init {

FirebaseRemoteConfig/Tests/Unit/RCNUserDefaultsManagerTests.m

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020

2121
static NSTimeInterval RCNUserDefaultsSampleTimeStamp = 0;
2222

23+
static NSString* const AppName = @"testApp";
24+
static NSString* const FQNamespace1 = @"testNamespace1:testApp";
25+
static NSString* const FQNamespace2 = @"testNamespace2:testApp";
26+
2327
@interface RCNUserDefaultsManagerTests : XCTestCase
2428

2529
@end
@@ -36,9 +40,9 @@ - (void)setUp {
3640

3741
- (void)testUserDefaultsEtagWriteAndRead {
3842
RCNUserDefaultsManager* manager =
39-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
43+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
4044
bundleID:[NSBundle mainBundle].bundleIdentifier
41-
namespace:@"testNamespace1"];
45+
namespace:FQNamespace1];
4246
[manager setLastETag:@"eTag1"];
4347
XCTAssertEqualObjects([manager lastETag], @"eTag1");
4448

@@ -48,9 +52,9 @@ - (void)testUserDefaultsEtagWriteAndRead {
4852

4953
- (void)testUserDefaultsLastFetchTimeWriteAndRead {
5054
RCNUserDefaultsManager* manager =
51-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
55+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
5256
bundleID:[NSBundle mainBundle].bundleIdentifier
53-
namespace:@"testNamespace1"];
57+
namespace:FQNamespace1];
5458
[manager setLastFetchTime:RCNUserDefaultsSampleTimeStamp];
5559
XCTAssertEqual([manager lastFetchTime], RCNUserDefaultsSampleTimeStamp);
5660

@@ -60,9 +64,9 @@ - (void)testUserDefaultsLastFetchTimeWriteAndRead {
6064

6165
- (void)testUserDefaultsLastETagUpdateTimeWriteAndRead {
6266
RCNUserDefaultsManager* manager =
63-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
67+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
6468
bundleID:[NSBundle mainBundle].bundleIdentifier
65-
namespace:@"testNamespace1"];
69+
namespace:FQNamespace1];
6670
[manager setLastETagUpdateTime:RCNUserDefaultsSampleTimeStamp];
6771
XCTAssertEqual([manager lastETagUpdateTime], RCNUserDefaultsSampleTimeStamp);
6872

@@ -72,9 +76,9 @@ - (void)testUserDefaultsLastETagUpdateTimeWriteAndRead {
7276

7377
- (void)testUserDefaultsLastFetchStatusWriteAndRead {
7478
RCNUserDefaultsManager* manager =
75-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
79+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
7680
bundleID:[NSBundle mainBundle].bundleIdentifier
77-
namespace:@"testNamespace1"];
81+
namespace:FQNamespace1];
7882
[manager setLastFetchStatus:@"Success"];
7983
XCTAssertEqualObjects([manager lastFetchStatus], @"Success");
8084

@@ -84,9 +88,9 @@ - (void)testUserDefaultsLastFetchStatusWriteAndRead {
8488

8589
- (void)testUserDefaultsisClientThrottledWriteAndRead {
8690
RCNUserDefaultsManager* manager =
87-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
91+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
8892
bundleID:[NSBundle mainBundle].bundleIdentifier
89-
namespace:@"testNamespace1"];
93+
namespace:FQNamespace1];
9094
[manager setIsClientThrottledWithExponentialBackoff:YES];
9195
XCTAssertEqual([manager isClientThrottledWithExponentialBackoff], YES);
9296

@@ -96,9 +100,9 @@ - (void)testUserDefaultsisClientThrottledWriteAndRead {
96100

97101
- (void)testUserDefaultsThrottleEndTimeWriteAndRead {
98102
RCNUserDefaultsManager* manager =
99-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
103+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
100104
bundleID:[NSBundle mainBundle].bundleIdentifier
101-
namespace:@"testNamespace1"];
105+
namespace:FQNamespace1];
102106
[manager setThrottleEndTime:RCNUserDefaultsSampleTimeStamp - 7.0];
103107
XCTAssertEqual([manager throttleEndTime], RCNUserDefaultsSampleTimeStamp - 7.0);
104108

@@ -108,9 +112,9 @@ - (void)testUserDefaultsThrottleEndTimeWriteAndRead {
108112

109113
- (void)testUserDefaultsCurrentThrottlingRetryIntervalWriteAndRead {
110114
RCNUserDefaultsManager* manager =
111-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
115+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
112116
bundleID:[NSBundle mainBundle].bundleIdentifier
113-
namespace:@"testNamespace1"];
117+
namespace:FQNamespace1];
114118
[manager setCurrentThrottlingRetryIntervalSeconds:RCNUserDefaultsSampleTimeStamp - 1.0];
115119
XCTAssertEqual([manager currentThrottlingRetryIntervalSeconds],
116120
RCNUserDefaultsSampleTimeStamp - 1.0);
@@ -122,14 +126,14 @@ - (void)testUserDefaultsCurrentThrottlingRetryIntervalWriteAndRead {
122126

123127
- (void)testUserDefaultsForMultipleNamespaces {
124128
RCNUserDefaultsManager* manager1 =
125-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
129+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
126130
bundleID:[NSBundle mainBundle].bundleIdentifier
127-
namespace:@"testNamespace1"];
131+
namespace:FQNamespace1];
128132

129133
RCNUserDefaultsManager* manager2 =
130-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
134+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
131135
bundleID:[NSBundle mainBundle].bundleIdentifier
132-
namespace:@"testNamespace2"];
136+
namespace:FQNamespace2];
133137

134138
/// Last ETag.
135139
[manager1 setLastETag:@"eTag1ForNamespace1"];
@@ -172,9 +176,9 @@ - (void)testUserDefaultsForMultipleNamespaces {
172176

173177
- (void)testUserDefaultsReset {
174178
RCNUserDefaultsManager* manager =
175-
[[RCNUserDefaultsManager alloc] initWithAppName:@"TESTING"
179+
[[RCNUserDefaultsManager alloc] initWithAppName:AppName
176180
bundleID:[NSBundle mainBundle].bundleIdentifier
177-
namespace:@"testNamespace1"];
181+
namespace:FQNamespace1];
178182
[manager setLastETag:@"testETag"];
179183
[manager resetUserDefaults];
180184
XCTAssertNil([manager lastETag]);

0 commit comments

Comments
 (0)