add test for testing the json encoding of unsent requests

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,7 @@ private RequestsWithEncoding getRequestsWithEncodedStringForErrors() {
     return requestsWithEncoding;
   }
 
-  private RequestsWithEncoding getRequestsWithEncodedStringStoredRequests() {
+  protected RequestsWithEncoding getRequestsWithEncodedStringStoredRequests() {
     List<Map<String, Object>> unsentRequests;
     List<Map<String, Object>> requestsToSend;
     String jsonEncodedRequestsToSend;
@@ -648,7 +648,7 @@ static void deleteSentRequests(int requestsCount) {
     }
   }
 
-  private static List<Map<String, Object>> getUnsentRequests() {
+  protected List<Map<String, Object>> getUnsentRequests() {
     List<Map<String, Object>> requestData;
 
     synchronized (Request.class) {

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

@@ -44,6 +44,9 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
 /**
  * @author Ben Marten
  */
@@ -90,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());
@@ -117,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());
@@ -132,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);
@@ -154,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 =
@@ -177,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);
@@ -199,7 +200,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();
     unsentRequestsData =
         (List) removeIrrelevantBackgroundStartRequests.invoke(Request.class, unsentRequests);
     assertNotNull(unsentRequestsData);
@@ -208,6 +209,19 @@ public void testRemoveIrrelevantBackgroundStartRequests() throws NoSuchMethodExc
     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);