Merge branch 'develop'

Author: e7mac

.circleci/config.yml

@@ -0,0 +1,39 @@
+# iOS CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/ios-migrating-from-1-2/ for more details
+#
+version: 2
+jobs:
+  build:
+
+    # Specify the Xcode version to use
+    macos:
+      xcode: "8.3.3"
+
+    steps:
+      - checkout
+
+      # Install CocoaPods
+      - run:
+          name: Build Project
+          command: ./build.sh
+
+      # Build the app and run tests
+      - run:
+          name: Run tests
+          command: fastlane scan
+          environment:
+            SCAN_DEVICE: iPhone 6
+            SCAN_SCHEME: WebTests
+
+      # Collect XML test results data to show in the UI,
+      # and save the same XML files under test-results folder
+      # in the Artifacts tab
+      - store_test_results:
+          path: test_output/report.xml
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: scan-test-results
+      - store_artifacts:
+          path: ~/Library/Logs/scan
+          destination: scan-logs

Example/Leanplum-SDK.xcodeproj/project.pbxproj

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

Example/Tests/Classes/Extensions/LPVarCache+Extensions.h

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

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

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

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

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

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

@@ -27,7 +27,6 @@
 #import <OHHTTPStubs/OHHTTPStubs.h>
 #import <OHHTTPStubs/OHPathHelpers.h>
 #import "LeanplumHelper.h"
-#import "LPRequestStorage.h"
 #import "LPEventDataManager.h"
 #import "LPDatabase.h"
 #import "Constants.h"
@@ -36,20 +35,6 @@
 #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;
@@ -63,11 +48,11 @@ + (NSOperationQueue *)sendNowQueue;
 
 @end
 
-@interface EventDataManagerTest : XCTestCase
+@interface LPEventDataManagerTest : XCTestCase
 
 @end
 
-@implementation EventDataManagerTest
+@implementation LPEventDataManagerTest
 
 - (void)setUp {
     [super setUp];
@@ -84,22 +69,6 @@ - (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/EventDataManagerTest.m renamed to Example/Tests/Classes/LPEventDataManagerTest.m

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

Example/Tests/Classes/FileManagerTest.m renamed to Example/Tests/Classes/LPFileManagerTest.m

@@ -38,18 +38,19 @@
 @interface LPMessageTemplatesClass (Test)
 + (UIImage *)imageFromColor:(UIColor *)color;
 + (UIImage *)dismissImage:(UIColor *)color withSize:(int)size;
++ (NSString *)urlEncodedStringFromString:(NSString *)urlString;
 
 - (void)setupPopupLayout:(BOOL)isFullscreen isPushAskToAsk:(BOOL)isPushAskToAsk;
 - (void)updatePopupLayout;
 - (void)showPopup;
 
 @end
 
-@interface MessageTemplatesTest : XCTestCase
+@interface LPMessageTemplatesClassTest : XCTestCase
 
 @end
 
-@implementation MessageTemplatesTest
+@implementation LPMessageTemplatesClassTest
 
 + (void)setUp
 {
@@ -125,4 +126,11 @@ - (void)test_push_popup_setup
     XCTAssertNotNil(cancelButton);
 }
 
+- (void)test_urlEncodedStringFromString {
+    XCTAssertEqualObjects([LPMessageTemplatesClass urlEncodedStringFromString:@"http://www.leanplum.com"], @"http://www.leanplum.com");
+    XCTAssertEqualObjects([LPMessageTemplatesClass urlEncodedStringFromString:@"http://www.leanplum.com?q=simple_english1&test=2"], @"http://www.leanplum.com?q=simple_english1&test=2");
+    XCTAssertEqualObjects([LPMessageTemplatesClass urlEncodedStringFromString:@"https://ramsey.tfaforms.net/356302?id={}"], @"https://ramsey.tfaforms.net/356302?id=%7B%7D");
+    XCTAssertEqualObjects([LPMessageTemplatesClass urlEncodedStringFromString:@"lomotif://music/月亮"], @"lomotif://music/%E6%9C%88%E4%BA%AE");
+}
+
 @end

Example/Tests/Classes/MessageTemplatesTest.m renamed to Example/Tests/Classes/LPMessageTemplatesClassTest.m

@@ -27,11 +27,11 @@
 #import "NSString+MD5Addition.h"
 #import "Utils.h"
 
-@interface UtilitiesTest : XCTestCase
+@interface LPUtilsTest : XCTestCase
 
 @end
 
-@implementation UtilitiesTest
+@implementation LPUtilsTest
 
 - (void)setUp {
     [super setUp];
@@ -79,11 +79,4 @@ - (void)test_base64EncodedStringFromData {
     XCTAssertEqualObjects(base64String, expectedSring);
 }
 
-- (void)test_urlEncodedStringFromString {
-    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"http://www.leanplum.com"], @"http://www.leanplum.com");
-    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"http://www.leanplum.com?q=simple_english1&test=2"], @"http://www.leanplum.com?q=simple_english1&test=2");
-    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"https://ramsey.tfaforms.net/356302?id={}"], @"https://ramsey.tfaforms.net/356302?id=%7B%7D");
-    XCTAssertEqualObjects([Utils urlEncodedStringFromString:@"lomotif://music/月亮"], @"lomotif://music/%E6%9C%88%E4%BA%AE");
-}
-
 @end