Fixed broken tests.

Author: alda-optimizely

OptimizelySDKDatafileManager/OptimizelySDKDatafileManager/OPTLYDatafileManager.h

@@ -15,10 +15,10 @@
  ***************************************************************************/
 
 #import <Foundation/Foundation.h>
-#import <OptimizelySDKCore/OPTLYErrorHandler.h>
-#import <OptimizelySDKCore/OPTLYLogger.h>
 #import <OptimizelySDKShared/OPTLYDatafileManager.h>
+#import <OptimizelySDKCore/OPTLYErrorHandler.h>
 #import <OptimizelySDKShared/OPTLYHTTPRequestManager.h>
+#import <OptimizelySDKCore/OPTLYLogger.h>
 #import "OPTLYDatafileManagerBuilder.h"
 
 @protocol OPTLYErrorHandler, OPTLYLogger;

OptimizelySDKDatafileManager/OptimizelySDKDatafileManagerTests/OPTLYDatafileManagerTest.m

@@ -18,25 +18,18 @@
 #import "OPTLYTestHelper.h"
 #import <OHHTTPStubs/OHHTTPStubs.h>
 #import <OptimizelySDKShared/OPTLYDataStore.h>
-#import <OptimizelySDKShared/OPTLYFileManager.h>
-
-
-@interface OptimizelySDKDatafileManagerTests : XCTestCase
-@end
-
-@implementation OptimizelySDKDatafileManagerTests
-
-@property NSString *baseDir;
-
-@end
+#import "OPTLYDatafileManager.h"
 
 static NSString *const kProjectId = @"6372300739";
 static NSString *const kDatamodelDatafileName = @"datafile_6372300739";
 
-@interface OPTLYDatafileManagerTest : XCTestCase
-
-@property OPTLYDataStore *dataStore;
+@interface OPTLYDatafileManager(test)
+- (void)saveDatafile:(NSData *)datafile;
+@end
 
+@interface OPTLYDatafileManagerTest : XCTestCase
+@property (nonatomic, strong) OPTLYDatafileManager *datafileManager;
+@property (nonatomic, strong) OPTLYDataStore *dataStore;
 @end
 
 @implementation OPTLYDatafileManagerTest
@@ -130,12 +123,12 @@ - (void)testSaveDatafileMethod {
     XCTAssertTrue(fileExists, @"save Datafile did not save the datafile to disk");
     NSError *error;
     NSData *savedData = [self.dataStore getFile:kProjectId
-                                      type:OPTLYDataStoreDataTypeDatafile
-                                     error:&error];
+                                           type:OPTLYDataStoreDataTypeDatafile
+                                          error:&error];
     XCTAssertNil(error);
     XCTAssertNotNil(savedData);
     XCTAssertNotEqual(datafile, savedData, @"we should not be referencing the same object. Saved data should be a new NSData object created from disk.");
-    XCTAssertEqualObjects(datafile, savedData, @"retrieved saved data from disk should be equivilent to the datafile we wanted to save to disk");
+    XCTAssertEqualObjects(datafile, savedData, @"retrieved saved data from disk should be equivalent to the datafile we wanted to save to disk");
 }
 
 - (void)testDatafileManagerDownloadDatafileSavesDatafile {

OptimizelySDKUserProfile/OptimizelySDKUserProfileTests/OptimizelySDKUserProfileTests.m

@@ -48,13 +48,9 @@ - (void)setUp {
     }];
     [self.userProfile save:kUserId1 experiment:kExperimentKey1 variation:kVariationKey1];
     [self.userProfile save:kUserId2 experiment:kExperimentKey2 variation:kVariationKey2];
-<<<<<<< HEAD
     [self.userProfile save:kUserId3 experiment:kExperimentKey3a variation:kVariationKey3a];
     [self.userProfile save:kUserId3 experiment:kExperimentKey3b variation:kVariationKey3b];
     [self.userProfile save:kUserId3 experiment:kExperimentKey3c variation:kVariationKey3c];
-=======
-    [self.userProfile save:kUserId3 experiment:kExperimentKey3 variation:kVariationKey3];
->>>>>>> User profile feature.
     [super setUp];
 }
 
@@ -69,11 +65,7 @@ - (void)testUserProfileInitWithBuilderBlock
     XCTAssert([self.userProfile.logger isKindOfClass:[OPTLYLoggerDefault class]]);
 }
 
-<<<<<<< HEAD
 - (void)testSaveUserData
-=======
-- (void)testSave
->>>>>>> User profile feature.
 {
     NSDictionary *userData = [self.userProfile.dataStore getUserDataForType:OPTLYDataStoreDataTypeUserProfile];
     NSArray *users = [userData allKeys];