Changes from code review.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYBuilderTest.m

@@ -68,7 +68,7 @@ - (void)testBuilderCanAssignErrorHandler {
     XCTAssertNotNil(customOptimizely);
     XCTAssertNotNil(customOptimizely.errorHandler);
     XCTAssertNotEqual(errorHandler, defaultOptimizely.errorHandler, @"Default OPTLYBuilder should create its own Error Handler");
-    XCTAssertEqual(errorHandler, customOptimizely.errorHandler, @"Should be same object with custom Builder");
+    XCTAssertEqual(errorHandler, customOptimizely.errorHandler, @"This module should be the same as that created in the OPLTYManager builder.");
 }
 
 - (void)testBuilderCanAssignEventDispatcher {
@@ -121,7 +121,7 @@ - (void)testBuilderCanAssignDatafileManager {
 
     XCTAssertNotNil(customOptimizely);
     XCTAssertNotNil(customOptimizely.datafileManager);
-    XCTAssertEqualObjects(datafileManager, customOptimizely.datafileManager, @"Should be same object with custom Builder");
+    XCTAssertEqualObjects(datafileManager, customOptimizely.datafileManager, @"This module should be the same as that created in the OPLTYManager builder.");
 }
 
 - (void)testInitializationWithoutBuilder {

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.m

@@ -22,6 +22,7 @@
 #import <OptimizelySDKShared/OPTLYDataStore.h>
 #import "OPTLYDatafileManager.h"
 
+// default datafile download interval is 2 minutes
 NSTimeInterval const kDefaultDatafileFetchInterval_s = 120;
 
 @interface OPTLYDatafileManager ()

OptimizelySDKDatafileManager/OptimizelySDKDatafileManagerTests/OPTLYDatafileManagerTest.m

@@ -23,20 +23,14 @@
 
 static NSString *const kProjectId = @"6372300739";
 static NSString *const kDatamodelDatafileName = @"datafile_6372300739";
-static NSTimeInterval kDatafileDownloadInteval = 5;
-<<<<<<< HEAD
+static NSTimeInterval kDatafileDownloadInteval = 5; // in seconds
 static NSString *const kLastModifiedDate = @"Mon, 28 Nov 2016 06:10:59 GMT";
 
 @interface OPTLYDatafileManager(test)
 @property (nonatomic, strong) NSTimer *datafileDownloadTimer;
-- (void)downloadDatafile:(NSString *)projectId completionHandler:(OPTLYHTTPRequestManagerResponse)completion;
-=======
-
-@interface OPTLYDatafileManager(test)
-@property (nonatomic, strong) NSTimer *datafileDownloadTimer;
->>>>>>> Added a timer to the datafile manager to periodically download the datafile. Also moved the datafile manager protocol to core as the core should have a basic datafile downloader (the network classes will be moved to core as well in another commit.). Cleaned up the headers and was being more deligent about alphabetizing imports and initializing modules.
 - (void)saveDatafile:(NSData *)datafile;
 - (nullable NSString *)getLastModifiedDate:(nonnull NSString *)projectId;
+- (void)downloadDatafile:(NSString *)projectId completionHandler:(OPTLYHTTPRequestManagerResponse)completion;
 @end
 
 @interface OPTLYDatafileManagerTest : XCTestCase
@@ -154,7 +148,7 @@ - (void)testDatafileManagerDownloadDatafileSavesDatafile {
     [self waitForExpectationsWithTimeout:2 handler:nil];    
 }
 
-// timer is enabled if the download intervao is > 0
+// timer is enabled if the download interval is > 0
 - (void)testNetworkTimerIsEnabled
 {
     OPTLYDatafileManager *datafileManager = [OPTLYDatafileManager initWithBuilderBlock:^(OPTLYDatafileManagerBuilder * _Nullable builder) {
@@ -178,7 +172,7 @@ - (void)testNetworkTimerIsDisabled
 
     // check that the timer is set correctly
     XCTAssertNil(datafileManager.datafileDownloadTimer, @"Timer should be nil.");
-    XCTAssertFalse(datafileManager.datafileDownloadTimer.valid, @"Timer shoul not be valid.");
+    XCTAssertFalse(datafileManager.datafileDownloadTimer.valid, @"Timer should not be valid.");
 
     datafileManager = [OPTLYDatafileManager initWithBuilderBlock:^(OPTLYDatafileManagerBuilder * _Nullable builder) {
         builder.projectId = kProjectId;

OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerBuilderTest.m

@@ -77,7 +77,7 @@ - (void)testBuilderCanAssignErrorHandler {
     XCTAssertNotNil(customManager);
     XCTAssertNotNil(customManager.errorHandler);
     XCTAssertNotEqual(errorHandler, defaultManager.errorHandler, @"Default OPTLYBuilder should create its own Error Handler");
-    XCTAssertEqual(errorHandler, customManager.errorHandler, @"Should be same object with custom Builder");
+    XCTAssertEqual(errorHandler, customManager.errorHandler, @"This module should be the same as that created in the OPLTYManager builder.");
 }
 
 - (void)testBuilderCanAssignEventDispatcher {