Merge branch 'oom2' into oom3

Author: e7mac

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

@@ -488,12 +488,10 @@ static class RequestsWithEncoding {
   }
 
   private RequestsWithEncoding getRequestsWithEncodedStringForErrors() {
-
     List<Map<String, Object>> unsentRequests = new ArrayList<>();
     List<Map<String, Object>> requestsToSend;
     String jsonEncodedRequestsToSend;
 
-
     String uuid = UUID.randomUUID().toString();
     for (Map<String, Object> error : localErrors) {
       error.put(UUID_KEY, uuid);
@@ -503,6 +501,7 @@ private RequestsWithEncoding getRequestsWithEncodedStringForErrors() {
     jsonEncodedRequestsToSend = jsonEncodeUnsentRequests(unsentRequests);
 
     RequestsWithEncoding requestsWithEncoding = new RequestsWithEncoding();
+    // for errors, we send all unsent requests so they are identical
     requestsWithEncoding.unsentRequests = unsentRequests;
     requestsWithEncoding.requestsToSend = requestsToSend;
     requestsWithEncoding.jsonEncodedString = jsonEncodedRequestsToSend;
@@ -527,7 +526,6 @@ protected RequestsWithEncoding getRequestsWithEncodedStringStoredRequests(double
       }
 
       jsonEncodedRequestsToSend = jsonEncodeUnsentRequests(unsentRequests);
-
       requestsWithEncoding.unsentRequests = unsentRequests;
       requestsWithEncoding.requestsToSend = requestsToSend;
       requestsWithEncoding.jsonEncodedString = jsonEncodedRequestsToSend;

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

@@ -211,6 +211,9 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
     LeanplumEventDataManagerTest.setDatabaseToNull();
   }
 
+  // Given a list of unsent requests
+  // we want to get the list of strings to send
+  // We should get back the correct list of requests to send
   @Test
   public void testJsonEncodeUnsentRequestsWithExceptionLargeNumbers() throws NoSuchMethodException,
           InvocationTargetException, IllegalAccessException {
@@ -263,7 +266,7 @@ public void testJsonEncodeUnsentRequestsWithExceptionLargeNumbers() throws NoSuc
 
   @Test
   public void testJsonEncodeUnsentRequestsWithException() {
-    List<Map<String, Object>> requests = mockRequests(2, 2);
+    List<Map<String, Object>> requests = mockRequests(4);
 
     Request realRequest = new Request("POST", Constants.Methods.START, null);
     Request request = spy(realRequest);
@@ -273,39 +276,43 @@ public void testJsonEncodeUnsentRequestsWithException() {
 
     Request.RequestsWithEncoding requestsWithEncoding = request.getRequestsWithEncodedStringStoredRequests(1.0);
 
-    assertEquals("{\"data\":[{\"0\":\"0\"},{\"0\":\"1\"},{\"1\":\"0\"},{\"1\":\"1\"}]}", requestsWithEncoding.jsonEncodedString);
+    assertEquals(4, requestsWithEncoding .unsentRequests.size());
+    assertEquals(4, requestsWithEncoding .requestsToSend.size());
+    final String expectedJson =  "{\"data\":[{\"0\":\"testData\"},{\"1\":\"testData\"},{\"2\":\"testData\"},{\"3\":\"testData\"}]}";
+    assertEquals(expectedJson, requestsWithEncoding.jsonEncodedString);
   }
 
+  // Given a list of requests
+  // we want to encode to a JSON String
+  // The String should have the expected format
   @Test
   public void testJsonEncodeUnsentRequests() {
-    List<Map<String, Object>> requests = mockRequests(2, 2);
+    List<Map<String, Object>> requests = mockRequests(4);
 
     Request realRequest = new Request("POST", Constants.Methods.START, null);
     Request request = spy(realRequest);
     when(request.getUnsentRequests(1.0)).thenReturn(requests);
 
     Request.RequestsWithEncoding requestsWithEncoding = request.getRequestsWithEncodedStringStoredRequests(1.0);
-
-    assertEquals("{\"data\":[{\"0\":\"0\"},{\"0\":\"1\"},{\"1\":\"0\"},{\"1\":\"1\"}]}", requestsWithEncoding.jsonEncodedString);
+    final String expectedJson =  "{\"data\":[{\"0\":\"testData\"},{\"1\":\"testData\"},{\"2\":\"testData\"},{\"3\":\"testData\"}]}";
+    assertEquals(expectedJson, requestsWithEncoding.jsonEncodedString);
   }
   @Test
   public void testGetRequestsWithEncodedStringStoredRequests() {
-    List<Map<String, Object>> requests = mockRequests(2, 2);
+    List<Map<String, Object>> requests = mockRequests(4);
     String json = Request.jsonEncodeUnsentRequests(requests);
-    String expectedJson =  "{\"data\":[{\"0\":\"0\"},{\"0\":\"1\"},{\"1\":\"0\"},{\"1\":\"1\"}]}";
+
+    final String expectedJson =  "{\"data\":[{\"0\":\"testData\"},{\"1\":\"testData\"},{\"2\":\"testData\"},{\"3\":\"testData\"}]}";
     assertEquals(json, expectedJson);
   }
 
-  private List<Map<String, Object>> mockRequests(int listSize, int requestSize) {
+  private List<Map<String, Object>> mockRequests(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);
-      }
+    for (int i=0; i < requestSize; i++) {
+      Map<String, Object> request = new HashMap<String, Object>();
+      request.put(Integer.toString(i), "testData");
+      requests.add(request);
     }
     return requests;
   }