cleanup

Author: paulb777

FirebaseRemoteConfig/Sources/FIRRemoteConfig.m

@@ -623,7 +623,7 @@ - (void)setConfigSettings:(FIRRemoteConfigSettings *)configSettings {
     self->_settings.minimumFetchInterval = configSettings.minimumFetchInterval;
     self->_settings.fetchTimeout = configSettings.fetchTimeout;
     /// The NSURLSession needs to be recreated whenever the fetch timeout may be updated.
-//    [self->_configFetch recreateNetworkSession];
+    //    [self->_configFetch recreateNetworkSession];
     FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000067",
                 @"Successfully set configSettings. Developer Mode: %@, Minimum Fetch Interval:%f, "
                 @"Fetch timeout:%f",

FirebaseRemoteConfig/Sources/Private/FIRRemoteConfig_Private.h

@@ -17,8 +17,8 @@
 #import <FirebaseRemoteConfig/FIRRemoteConfig.h>
 
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
-#import <FirebaseRemoteConfig/RCNConfigSettings.h>
 #import <FirebaseRemoteConfig/RCNConfigFetch.h>
+#import <FirebaseRemoteConfig/RCNConfigSettings.h>
 
 @class FIROptions;
 @class RCNConfigContent;

FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h

@@ -53,8 +53,12 @@ typedef void (^RCNConfigFetcherCompletion)(NSData *data, NSURLResponse *response
 /// Add the ability to update NSURLSession's timeout after a session has already been created.
 - (void)recreateNetworkSession;
 
+/// Provide fetchSession for tests to override.
 @property(nonatomic, readwrite, strong, nonnull) NSURLSession *fetchSession;
 
+/// Flag for tests to disable network accesses.
+@property(nonatomic, readwrite) BOOL testWithoutNetwork;
+
 NS_ASSUME_NONNULL_END
 
 @end

FirebaseRemoteConfig/Sources/RCNFetch.m

@@ -109,6 +109,9 @@ - (instancetype)initWithContent:(RCNConfigContent *)content
 
 /// Force a new NSURLSession creation for updated config.
 - (void)recreateNetworkSession {
+  if (self.testWithoutNetwork) {
+    return;
+  }
   if (_fetchSession) {
     [_fetchSession invalidateAndCancel];
   }
@@ -202,7 +205,7 @@ - (NSString *)FIRAppNameFromFullyQualifiedNamespace {
 /// requests to work.(b/14751422).
 - (void)refreshInstallationsTokenWithCompletionHandler:
     (FIRRemoteConfigFetchCompletion)completionHandler {
-  if (YES) {
+  if (self.testWithoutNetwork) {
     [self doFetchCall:completionHandler];
     return;
   }

FirebaseRemoteConfig/Tests/HermeticAPI/APITests.swift

@@ -32,7 +32,8 @@ class APITests: XCTestCase {
     let settings = RemoteConfigSettings()
     settings.minimumFetchInterval = 0
     config.configSettings = settings
-    config.configFetch.fetchSession = URLSessionMock.init()
+    config.configFetch.fetchSession = URLSessionMock()
+    config.configFetch.testWithoutNetwork = true
     FakeConsole.config = ["Key1": "Value1"]
 
     // Uncomment for verbose debug logging.

FirebaseRemoteConfig/Tests/HermeticAPI/FakeConsole.swift

@@ -23,13 +23,13 @@ class FakeConsole {
   static func get() -> [String: AnyHashable] {
     if config.count == 0 {
       last = config
-      return [ RCNFetchResponseKeyState : RCNFetchResponseKeyStateEmptyConfig ]
+      return [RCNFetchResponseKeyState: RCNFetchResponseKeyStateEmptyConfig]
     }
     var state = RCNFetchResponseKeyStateNoChange
     if last != config {
       state = RCNFetchResponseKeyStateUpdate
     }
     last = config
-    return [ RCNFetchResponseKeyState : state, RCNFetchResponseKeyEntries : config]
+    return [RCNFetchResponseKeyState: state, RCNFetchResponseKeyEntries: config]
   }
 }

FirebaseRemoteConfig/Tests/HermeticAPI/URLSessionPartialMock.swift

@@ -45,10 +45,10 @@ class URLSessionMock: URLSession {
       etag = String(NSDate().timeIntervalSince1970)
     }
     let jsonData = try! JSONSerialization.data(withJSONObject: consoleValues)
-    let response = HTTPURLResponse.init(url: URL.init(fileURLWithPath: "fakeURL"),
-                                        statusCode: 200,
-                                        httpVersion: nil,
-                                        headerFields: ["etag": etag])
+    let response = HTTPURLResponse(url: URL(fileURLWithPath: "fakeURL"),
+                                   statusCode: 200,
+                                   httpVersion: nil,
+                                   headerFields: ["etag": etag])
     return URLSessionDataTaskMock {
       completionHandler(jsonData, response, nil)
     }