clean up the datafile manager tests a little bit

Author: wangjoshuah

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.m

@@ -129,7 +129,7 @@ - (NSData *)getSavedDatafile {
     NSData *datafile = [self.dataStore getFile:self.projectId
                        type:OPTLYDataStoreDataTypeDatafile
                       error:&error];
-    if (error != nil ) {
+    if (error != nil) {
         [self.errorHandler handleError:error];
     }
     return datafile;

OptimizelySDKDatafileManager/OptimizelySDKDatafileManagerTests/OPTLYDatafileManagerTest.m

@@ -26,6 +26,8 @@
 static NSTimeInterval kDatafileDownloadInteval = 5; // in seconds
 static NSString *const kLastModifiedDate = @"Mon, 28 Nov 2016 06:10:59 GMT";
 static NSData *kDatafileData;
+static NSDictionary *const kCDNResponseHeaders =@{@"Content-Type":@"application/json",
+                                                  @"Last-Modified":kLastModifiedDate};
 
 @interface OPTLYDatafileManager(test)
 @property (nonatomic, strong) NSTimer *datafileDownloadTimer;
@@ -148,6 +150,8 @@ - (void)testDatafileManagerDownloadDatafileSavesDatafile {
 
     // make sure we were able to save the datafile
     [self waitForExpectationsWithTimeout:2 handler:nil];
+    
+    // clean up stub
     [OHHTTPStubs removeStub:stub];
 }
 
@@ -242,8 +246,7 @@ - (void)test304Response
     } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
         return [OHHTTPStubsResponse responseWithData:kDatafileData
                                           statusCode:200
-                                             headers:@{@"Content-Type":@"application/json",
-                                                       @"Last-Modified":kLastModifiedDate}];
+                                             headers:kCDNResponseHeaders];
     }];
 }
 
@@ -258,14 +261,12 @@ - (void)test304Response
         if ([request.allHTTPHeaderFields objectForKey:@"If-Modified-Since"] != nil) {
             return [OHHTTPStubsResponse responseWithData:nil
                                               statusCode:304
-                                                 headers:@{@"Content-Type":@"application/json",
-                                                           @"Last-Modified":kLastModifiedDate}];
+                                                 headers:kCDNResponseHeaders];
         }
         else {
             return [OHHTTPStubsResponse responseWithData:kDatafileData
                                               statusCode:200
-                                                 headers:@{@"Content-Type":@"application/json",
-                                                           @"Last-Modified":kLastModifiedDate}];
+                                                 headers:kCDNResponseHeaders];
 
         }
     }];
@@ -281,8 +282,7 @@ - (void)test304Response
     } withStubResponse:^OHHTTPStubsResponse *(NSURLRequest *request) {
         return [OHHTTPStubsResponse responseWithData:nil
                                           statusCode:400
-                                             headers:@{@"Content-Type":@"application/json",
-                                                       @"Last-Modified":kLastModifiedDate}];
+                                             headers:kCDNResponseHeaders];
     }];
 }