Merge branch 'oom2' into oom3

Author: e7mac

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

@@ -481,7 +481,7 @@ protected Void doInBackground(Void... params) {
   }
 
 
-  private static class RequestsWithEncoding {
+  static class RequestsWithEncoding {
     List<Map<String, Object>> unsentRequests;
     List<Map<String, Object>> requestsToSend;
     String jsonEncodedString;
@@ -510,7 +510,8 @@ private RequestsWithEncoding getRequestsWithEncodedStringForErrors() {
     return requestsWithEncoding;
   }
 
-  private RequestsWithEncoding getRequestsWithEncodedStringStoredRequests(double fraction) {
+
+  protected RequestsWithEncoding getRequestsWithEncodedStringStoredRequests(double fraction) {
     try {
       List<Map<String, Object>> unsentRequests;
       List<Map<String, Object>> requestsToSend;
@@ -651,11 +652,7 @@ static void deleteSentRequests(int requestsCount) {
     }
   }
 
-  private static List<Map<String, Object>> getUnsentRequests() {
-    return getUnsentRequests(1.0);
-  }
-
-  private static List<Map<String, Object>> getUnsentRequests(double fraction) {
+  public List<Map<String, Object>> getUnsentRequests() {
     List<Map<String, Object>> requestData;
 
     synchronized (Request.class) {
@@ -712,7 +709,7 @@ private static List<Map<String, Object>> removeIrrelevantBackgroundStartRequests
     return relevantRequests;
   }
 
-  private static String jsonEncodeUnsentRequests(List<Map<String, Object>> requestData) {
+  protected static String jsonEncodeUnsentRequests(List<Map<String, Object>> requestData) {
     Map<String, Object> data = new HashMap<>();
     data.put(Constants.Params.DATA, requestData);
     return JsonConverter.toJson(data);

AndroidSDKTests/src/test/java/com/leanplum/LeanplumTest.java

@@ -398,14 +398,14 @@ public void testCrashes() throws Exception {
     LeanplumEventDataManager.init(Leanplum.getContext());
 
     // Add two events to database.
-    new Request("POST", Constants.Methods.GET_INBOX_MESSAGES, null).sendEventually();
-    new Request("POST", Constants.Methods.LOG, null).sendEventually();
+    Request request1 = new Request("POST", Constants.Methods.GET_INBOX_MESSAGES, null);
+    Request request2 = new Request("POST", Constants.Methods.LOG, null);
 
+    request1.sendEventually();
+    request2.sendEventually();
     // Get a number of events in the database.
     // Expectation: 2 events.
-    Method getUnsentRequests = Request.class.getDeclaredMethod("getUnsentRequests");
-    getUnsentRequests.setAccessible(true);
-    List unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    List unsentRequests = request1.getUnsentRequests();
     assertNotNull(unsentRequests);
     assertEquals(2, unsentRequests.size());
 
@@ -427,7 +427,7 @@ public void testCrashes() throws Exception {
 
     // Get a number of events in the database. Checks if ours two events still here.
     // Expectation: 2 events.
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request1.getUnsentRequests();
     assertNotNull(unsentRequests);
     assertEquals(2, unsentRequests.size());
 
@@ -444,7 +444,7 @@ public void onRequest(String httpMethod, String apiMethod, Map<String, Object> p
 
     // Get a number of events in the database. Make sure we sent all events.
     // Expectation: 0 events.
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request1.getUnsentRequests();
     assertNotNull(unsentRequests);
     assertEquals(0, unsentRequests.size());
 

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

@@ -39,10 +39,14 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 /**
  * @author Ben Marten
  */
@@ -89,19 +93,17 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
     Method removeIrrelevantBackgroundStartRequests =
         Request.class.getDeclaredMethod("removeIrrelevantBackgroundStartRequests", List.class);
     removeIrrelevantBackgroundStartRequests.setAccessible(true);
-    Method getUnsentRequests = Request.class.getDeclaredMethod("getUnsentRequests");
-    getUnsentRequests.setAccessible(true);
 
     // Invoke method with specific test data.
     // Expectation: No request returned.
-    List unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    List unsentRequests = request.getUnsentRequests();
     assertNotNull(unsentRequests);
     assertEquals(0, unsentRequests.size());
 
     // Regular start request.
     // Expectation: One request returned.
     request.sendEventually();
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request.getUnsentRequests();
     assertNotNull(unsentRequests);
     assertEquals(1, unsentRequests.size());
     Request.deleteSentRequests(unsentRequests.size());
@@ -116,7 +118,7 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
       put(Constants.Params.BACKGROUND, Boolean.toString(false));
       put("fg", "2");
     }}).sendEventually();
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request.getUnsentRequests();
     assertNotNull(unsentRequests);
     assertEquals(2, unsentRequests.size());
     Request.deleteSentRequests(unsentRequests.size());
@@ -131,7 +133,7 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
       put(Constants.Params.BACKGROUND, Boolean.toString(false));
       put("fg", "1");
     }}).sendEventually();
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request.getUnsentRequests();
     List unsentRequestsData =
         (List) removeIrrelevantBackgroundStartRequests.invoke(Request.class, unsentRequests);
     assertNotNull(unsentRequestsData);
@@ -153,7 +155,7 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
       put(Constants.Params.BACKGROUND, Boolean.toString(false));
       put("fg", "1");
     }}).sendEventually();
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request.getUnsentRequests();
 
     assertNotNull(unsentRequests);
     unsentRequestsData =
@@ -176,7 +178,7 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
       put(Constants.Params.BACKGROUND, Boolean.toString(true));
       put("bg", "2");
     }}).sendEventually();
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request.getUnsentRequests();
     assertNotNull(unsentRequests);
     unsentRequestsData =
         (List) removeIrrelevantBackgroundStartRequests.invoke(Request.class, unsentRequests);
@@ -198,12 +200,48 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
       put(Constants.Params.BACKGROUND, Boolean.toString(true));
       put("bg", "2");
     }}).sendEventually();
-    unsentRequests = (List) getUnsentRequests.invoke(Request.class);
+    unsentRequests = request.getUnsentRequests();
     unsentRequestsData =
         (List) removeIrrelevantBackgroundStartRequests.invoke(Request.class, unsentRequests);
     assertNotNull(unsentRequestsData);
     assertEquals(3, unsentRequestsData.size());
     Request.deleteSentRequests(unsentRequests.size());
     LeanplumEventDataManagerTest.setDatabaseToNull();
   }
+
+  @Test
+  public void testJsonEncodeUnsentRequests() {
+    List<Map<String, Object>> requests = mockRequests(2, 2);
+
+    Request realRequest = new Request("POST", Constants.Methods.START, null);
+    Request request = spy(realRequest);
+    when(request.getUnsentRequests()).thenReturn(requests);
+
+    Request.RequestsWithEncoding requestsWithEncoding = request.getRequestsWithEncodedStringStoredRequests();
+
+    assertEquals("{\"data\":[{\"0\":\"0\"},{\"0\":\"1\"},{\"1\":\"0\"},{\"1\":\"1\"}]}", requestsWithEncoding.jsonEncodedString);
+  }
+
+  @Test
+  public void testGetRequestsWithEncodedStringStoredRequests() {
+    List<Map<String, Object>> requests = mockRequests(2, 2);
+    String json = Request.jsonEncodeUnsentRequests(requests);
+    String expectedJson =  "{\"data\":[{\"0\":\"0\"},{\"0\":\"1\"},{\"1\":\"0\"},{\"1\":\"1\"}]}";
+    assertEquals(json, expectedJson);
+  }
+
+  private List<Map<String, Object>> mockRequests(int listSize, int requestSize) {
+    List<Map<String, Object>> requests = new ArrayList<>();
+
+    for (int i=0; i < listSize; i++) {
+
+      for (int j=0; j < requestSize; j++) {
+        Map<String, Object> request = new HashMap<String, Object>();
+        request.put(Integer.toString(i), Integer.toString(j));
+        requests.add(request);
+      }
+    }
+    return requests;
+  }
+
 }