Counting client android (#243)

* add tests for getAndClearCounts and makeParams

* add nullability

Author: gg4race

AndroidSDKCore/src/main/java/com/leanplum/internal/CountAggregator.java

@@ -1,5 +1,8 @@
 package com.leanplum.internal;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
+
 import java.util.HashSet;
 import java.util.HashMap;
 import java.util.Map;
@@ -14,11 +17,11 @@ public void setEnabledCounters(HashSet<String> enabledCounters) {
         this.enabledCounters = enabledCounters;
     }
 
-    public void incrementCount(String name) {
+    public void incrementCount(@NonNull String name) {
         incrementCount(name, 1);
     }
 
-    public void incrementCount(String name, int incrementCount) {
+    public void incrementCount(@NonNull String name, int incrementCount) {
         if (enabledCounters.contains(name)) {
             Integer count = 0;
             if (counts.containsKey(name)) {
@@ -29,24 +32,33 @@ public void incrementCount(String name, int incrementCount) {
         }
     }
 
-    private HashMap<String, Integer> getAndClearCounts() {
+    @VisibleForTesting
+    public HashMap<String, Integer> getAndClearCounts() {
         HashMap<String, Integer> previousCounts = new HashMap<>();
         previousCounts.putAll(counts);
         counts.clear();
         return previousCounts;
     }
 
+    @VisibleForTesting
+    public HashMap<String, Object> makeParams(@NonNull String name, int count) {
+        HashMap<String, Object> params = new HashMap<>();
+
+        params.put(Constants.Params.TYPE, Constants.Values.SDK_COUNT);
+        params.put(Constants.Params.MESSAGE, name);
+        params.put(Constants.Params.COUNT, count);
+
+        return params;
+    }
+
     public void sendAllCounts() {
         HashMap<String, Integer> counts = getAndClearCounts();
 
         for(Map.Entry<String, Integer> entry : counts.entrySet()) {
             String name = entry.getKey();
             Integer count = entry.getValue();
+            HashMap<String, Object> params = makeParams(name, count);
             try {
-                HashMap<String, Object> params = new HashMap<>();
-                params.put(Constants.Params.TYPE, Constants.Values.SDK_COUNT);
-                params.put(Constants.Params.MESSAGE, name);
-                params.put(Constants.Params.COUNT, count);
                 Request.post(Constants.Methods.LOG, params).sendEventually();
             } catch (Throwable t) {
                 android.util.Log.e("Leanplum", "Unable to send count.", t);

AndroidSDKTests/src/test/java/com/leanplum/internal/CountAggregatorTest.java

@@ -93,4 +93,36 @@ public void testIncrementCountMultiple() {
     counts = countAggregator.getCounts();
     assertEquals(17, counts.get(testString).intValue());
   }
+
+  @Test
+  public void testGetAndClearCounts() {
+    CountAggregator countAggregator = new CountAggregator();
+    String testString = "test";
+    String testString2 = "test2";
+    HashSet<String> testSet = new HashSet<String>(Arrays.asList(testString, testString2));
+    countAggregator.setEnabledCounters(testSet);
+
+    countAggregator.incrementCount(testString, 2);
+    countAggregator.incrementCount(testString2, 15);
+
+    HashMap<String, Integer> previousCounts = countAggregator.getAndClearCounts();
+    HashMap<String, Integer> counts = countAggregator.getCounts();
+
+    //check counts is empty after clearing
+    assertEquals(true, counts.isEmpty());
+    //test counts transferred to previousCounts
+    assertEquals(2, previousCounts.get(testString).intValue());
+    assertEquals(15, previousCounts.get(testString2).intValue());
+  }
+
+  @Test
+  public void testMakeParams() {
+    CountAggregator countAggregator = new CountAggregator();
+    String testString = "test";
+    HashMap<String, Object> params = countAggregator.makeParams(testString, 2);
+
+    assertEquals(Constants.Values.SDK_COUNT, params.get(Constants.Params.TYPE));
+    assertEquals(testString, params.get(Constants.Params.MESSAGE));
+    assertEquals(2, params.get(Constants.Params.COUNT));
+  }
 }