Revert "Merge develop into master (#200)"

This reverts commit f381853.

Author: e7mac

.circleci/config.yml

@@ -45,11 +45,11 @@ - (void)didReceiveRemoteNotification:(NSDictionary *)userInfo
 - (void)leanplum_application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
 @end
 
-@interface LPActionManagerTest : XCTestCase
+@interface ActionManagerTest : XCTestCase
 
 @end
 
-@implementation LPActionManagerTest
+@implementation ActionManagerTest
 
 + (void)setUp
 {

Example/Leanplum-SDK.xcodeproj/project.pbxproj

@@ -48,11 +48,11 @@ + (void)prepareUploadRequestParam:(NSMutableArray *)requestParam
 
 @end
 
-@interface LPAppIconManagerTest : XCTestCase
+@interface AppIconManagerTest : XCTestCase
 
 @end
 
-@implementation LPAppIconManagerTest
+@implementation AppIconManagerTest
 
 + (void)setUp
 {

Example/Tests/Classes/LPActionManagerTest.m renamed to Example/Tests/Classes/ActionManagerTest.m

@@ -7,14 +7,13 @@
 //
 
 #import <XCTest/XCTest.h>
-#import "LPEventCallback.h"
 #import "LPEventCallbackManager.h"
 
-@interface LPEventCallbackManagerTest : XCTestCase
+@interface EventCallbackManagerTest : XCTestCase
 
 @end
 
-@implementation LPEventCallbackManagerTest
+@implementation EventCallbackManagerTest
 
 - (void)setUp {
     [super setUp];

Example/Tests/Classes/LPAppIconManagerTest.m renamed to Example/Tests/Classes/AppIconManagerTest.m

@@ -27,6 +27,7 @@
 #import <OHHTTPStubs/OHHTTPStubs.h>
 #import <OHHTTPStubs/OHPathHelpers.h>
 #import "LeanplumHelper.h"
+#import "LPRequestStorage.h"
 #import "LPEventDataManager.h"
 #import "LPDatabase.h"
 #import "Constants.h"
@@ -35,6 +36,20 @@
 #import "LeanplumReachability+Category.h"
 #import "LPJSON.h"
 
+/**
+ * Expose private class methods
+ */
+@interface LPRequestStorage(UnitTest)
+
+- (void)migrateRequests;
+- (void)saveRequests:(NSMutableArray *)requests;
+- (NSMutableArray *)loadRequests;
+- (NSString *)cacheFilePath;
+- (NSString *)documentsFilePath;
++ (NSString *)itemKeyForIndex:(NSUInteger)index;
+
+@end
+
 @interface LPEventDataManager(UnitTest)
 
 + (void)migrateRequests;
@@ -48,11 +63,11 @@ + (NSOperationQueue *)sendNowQueue;
 
 @end
 
-@interface LPEventDataManagerTest : XCTestCase
+@interface EventDataManagerTest : XCTestCase
 
 @end
 
-@implementation LPEventDataManagerTest
+@implementation EventDataManagerTest
 
 - (void)setUp {
     [super setUp];
@@ -69,6 +84,22 @@ - (NSDictionary *)sampleData
              @"sdkVersion":@"3", @"devMode":@NO, @"time":@"1489007921.162919"};
 }
 
+- (void)test_migrateRequests
+{
+    // Clean up.
+    [[LeanplumRequest sendNowQueue] cancelAllOperations];
+    [[LeanplumRequest sendNowQueue] waitUntilAllOperationsAreFinished];
+    
+    [LPEventDataManager deleteEventsWithLimit:10000];
+    
+    [[LPRequestStorage sharedStorage] popAllRequests];
+    [[LPRequestStorage sharedStorage] pushRequest:[self sampleData]];
+    
+    [LPEventDataManager migrateRequests];
+    NSArray *events = [LPEventDataManager eventsWithLimit:10000];
+    XCTAssertTrue(events.count == 1);
+}
+
 - (void)test_publicEventMethods
 {
     [LPEventDataManager deleteEventsWithLimit:10000];

Example/Tests/Classes/LPEventCallbackManagerTest.m renamed to Example/Tests/Classes/EventCallbackManagerTest.m

@@ -27,8 +27,8 @@
 
 @interface LPVarCache(UnitTest)
 
-- (void)reset;
++ (void)reset;
 
-- (void)initialize;
++ (void)initialize;
 
 @end

Example/Tests/Classes/LPEventDataManagerTest.m renamed to Example/Tests/Classes/EventDataManagerTest.m

@@ -36,11 +36,11 @@
 /**
  * Tests file manager public methods.
  */
-@interface LPFileManagerTest : XCTestCase
+@interface FileManagerTest : XCTestCase
 
 @end
 
-@implementation LPFileManagerTest
+@implementation FileManagerTest
 
 + (void)setUp
 {