Sync sucess and failure better

Author: franco-zalamena-iterable

iterableapi/src/main/java/com/iterable/iterableapi/IterableEmbeddedManager.kt

@@ -78,10 +78,11 @@ public class IterableEmbeddedManager : IterableActivityMonitor.AppStateCallback
                 { data ->
                     try {
                         processEmbeddedMessagesResponse(data)
+                        notifySyncSucceeded()
                     } catch (e: JSONException) {
                         IterableLogger.e(TAG, e.toString())
+                        notifySyncFailed(e.message)
                     }
-                    notifySyncSucceeded()
                 },
                 { reason, data ->
                     handleSyncFailure(reason, data)

iterableapi/src/test/java/com/iterable/iterableapi/IterableEmbeddedManagerTest.java

@@ -4,6 +4,7 @@
 import static junit.framework.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -270,26 +271,53 @@ public void testOnEmbeddedMessagingDisabled() throws Exception {
     public void testOnEmbeddedMessagingSyncSucceeded() throws Exception {
         dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_single_1.json")));
         IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+        // Flush all automatic syncs (init + foreground) before adding listener
+        shadowOf(getMainLooper()).idle();
 
         IterableEmbeddedUpdateHandler mockHandler = mock(IterableEmbeddedUpdateHandler.class);
         embeddedManager.addUpdateListener(mockHandler);
 
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_single_1.json")));
         embeddedManager.syncMessages();
         shadowOf(getMainLooper()).idle();
 
         verify(mockHandler).onEmbeddedMessagingSyncSucceeded();
         verify(mockHandler, never()).onEmbeddedMessagingSyncFailed(anyString());
-        assertEquals(1, embeddedManager.getMessages(0L).size());
+    }
+
+    @Test
+    public void testOnEmbeddedMessagingSyncFailedOnParseError() throws Exception {
+        // Enqueue malformed responses so auto-syncs also fail (avoiding mixed success/failure)
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_malformed.json")));
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_malformed.json")));
+        IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
+
+        IterableEmbeddedUpdateHandler mockHandler = mock(IterableEmbeddedUpdateHandler.class);
+        embeddedManager.addUpdateListener(mockHandler);
+        shadowOf(getMainLooper()).idle();
+        clearInvocations(mockHandler);
+
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setBody(IterableTestUtils.getResourceString("embedded_payload_malformed.json")));
+        embeddedManager.syncMessages();
+        shadowOf(getMainLooper()).idle();
+
+        verify(mockHandler).onEmbeddedMessagingSyncFailed(anyString());
+        verify(mockHandler, never()).onEmbeddedMessagingSyncSucceeded();
     }
 
     @Test
     public void testOnEmbeddedMessagingSyncFailed() throws Exception {
+        // Enqueue 401 responses so auto-syncs also fail (avoiding mixed success/failure)
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setResponseCode(401).setBody(IterableTestUtils.getResourceString("embedded_payload_bad_api_key.json")));
         dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setResponseCode(401).setBody(IterableTestUtils.getResourceString("embedded_payload_bad_api_key.json")));
         IterableEmbeddedManager embeddedManager = IterableApi.getInstance().getEmbeddedManager();
 
         IterableEmbeddedUpdateHandler mockHandler = mock(IterableEmbeddedUpdateHandler.class);
         embeddedManager.addUpdateListener(mockHandler);
+        shadowOf(getMainLooper()).idle();
+        clearInvocations(mockHandler);
 
+        dispatcher.enqueueResponse("/embedded-messaging/messages", new MockResponse().setResponseCode(401).setBody(IterableTestUtils.getResourceString("embedded_payload_bad_api_key.json")));
         embeddedManager.syncMessages();
         shadowOf(getMainLooper()).idle();
 

iterableapi/src/test/resources/embedded_payload_malformed.json

@@ -0,0 +1,7 @@
+{
+  "placements": [
+    {
+      "unexpectedField": "missingPlacementIdAndMessages"
+    }
+  ]
+}