Counting on Client (#211)

* refactor sendAllCounts for easy testing

* test sendAndClearCounts and makeParams

* fix nonnull int

Author: gg4race

Example/Tests/Classes/LPCountAggregatorTest.m

@@ -25,6 +25,7 @@
 
 #import <XCTest/XCTest.h>
 #import "LPCountAggregator.h"
+#import "Constants.h"
 
 /**
  * Expose private class methods
@@ -33,6 +34,9 @@ @interface LPCountAggregator(UnitTest)
 
 @property (nonatomic, strong) NSMutableDictionary *counts;
 
+- (NSDictionary *)getAndClearCounts;
+- (NSMutableDictionary *)makeParams:(nonnull NSString *)name withCount:(int) count;
+
 @end
 
 @interface LPCountAggregatorTest : XCTestCase
@@ -96,4 +100,32 @@ - (void)test_incrementCountMultiple {
     XCTAssert([countAggregator.counts[testString] intValue] == 17);
 }
 
+- (void)test_getAndClearCounts {
+    LPCountAggregator *countAggregator = [[LPCountAggregator alloc] init];
+    NSString *testString = @"test";
+    NSString *testString2 = @"test2";
+    countAggregator.enabledCounters = [NSSet setWithObjects:testString, testString2, nil];
+    
+    [countAggregator incrementCount:testString by:2];
+    [countAggregator incrementCount:testString2 by:15];
+    
+    NSDictionary *previousCounts = [countAggregator getAndClearCounts];
+    
+    //test counts is empty after clearing
+    XCTAssert([countAggregator.counts count] == 0);
+    //test counts transferred to previousCounts
+    XCTAssert([previousCounts[testString] intValue] == 2);
+    XCTAssert([previousCounts[testString2] intValue] == 15);
+}
+
+- (void)test_makeParams {
+    LPCountAggregator *countAggregator = [[LPCountAggregator alloc] init];
+    NSString *testString = @"test";
+    NSMutableDictionary *params = [countAggregator makeParams:testString withCount:2];
+
+    XCTAssert([params[LP_PARAM_TYPE] isEqualToString:@"SDK_COUNT"]);
+    XCTAssert([params[LP_PARAM_MESSAGE] isEqualToString:testString]);
+    XCTAssert([params[LP_PARAM_COUNT] intValue] == 2);
+}
+
 @end

Leanplum-SDK/Classes/Managers/LPCountAggregator.m

@@ -75,13 +75,19 @@ - (NSDictionary *)getAndClearCounts {
     return previousCounts;
 }
 
+- (NSMutableDictionary *)makeParams:(nonnull NSString *)name withCount:(int) count {
+    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+    params[LP_PARAM_TYPE] = @"SDK_COUNT";
+    params[LP_PARAM_MESSAGE] = name;
+    params[LP_PARAM_COUNT] = [NSNumber numberWithInt:count];
+    return params;
+}
+
 - (void)sendAllCounts {
     NSDictionary *counts = [self getAndClearCounts];
     for (NSString *name in counts) { // iterate over counts, creating one request per counter
-        NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
-        params[LP_PARAM_TYPE] = @"SDK_COUNT";
-        params[LP_PARAM_MESSAGE] = name;
-        params[LP_PARAM_COUNT] = counts[name];
+        int count = [counts[name] intValue];
+        NSMutableDictionary *params = [self makeParams:name withCount:count];
         [[LeanplumRequest post:LP_METHOD_LOG params:params] sendEventually];
     }
 }