refactor: add tests for delivery api change

sdk/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java

@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import android.support.test.filters.SmallTest;
@@ -164,4 +165,21 @@ public void testOverrideCodeBundleId() throws Exception {
         config.setCodeBundleId("abc123");
         assertEquals("abc123", config.getCodeBundleId());
     }
+
+    @Test
+    public void testSetDelivery() {
+        Configuration configuration = new Configuration("api-key");
+        assertNull(configuration.getDelivery());
+        Delivery delivery = BugsnagTestUtils.generateDelivery();
+        configuration.setDelivery(delivery);
+
+        assertTrue(configuration.getDelivery() instanceof DeliveryCompat);
+        DeliveryCompat compat = (DeliveryCompat) configuration.getDelivery();
+        assertEquals(compat.delivery, delivery);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetNullDelivery() {
+        config.setDelivery(null);
+    }
 }

sdk/src/androidTest/java/com/bugsnag/android/DeliveryCompatTest.java

@@ -0,0 +1,126 @@
+package com.bugsnag.android;
+
+import static com.bugsnag.android.DeliveryFailureException.Reason.CONNECTIVITY;
+import static com.bugsnag.android.DeliveryFailureException.Reason.REQUEST_FAILURE;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class DeliveryCompatTest {
+
+    private final Configuration config = BugsnagTestUtils.generateConfiguration();
+    private DeliveryCompat deliveryCompat;
+
+    private AtomicInteger defaultCount;
+    private AtomicInteger customCount;
+
+    /**
+     * Generates a Delivery instance that increments a counter on each request
+     *
+     * @throws Exception if setup failed
+     */
+    @Before
+    public void setUp() throws Exception {
+        defaultCount = new AtomicInteger();
+        customCount = new AtomicInteger();
+
+        Delivery baseDelivery = new Delivery() {
+            @Override
+            public void deliver(SessionTrackingPayload payload,
+                                Configuration config) throws DeliveryFailureException {
+                defaultCount.incrementAndGet();
+            }
+
+            @Override
+            public void deliver(Report report,
+                                Configuration config) throws DeliveryFailureException {
+                defaultCount.incrementAndGet();
+            }
+        };
+        deliveryCompat = new DeliveryCompat(baseDelivery);
+    }
+
+    @Test
+    public void deliverReport() throws Exception {
+        Report report = null;
+        deliveryCompat.deliver(report, config);
+        assertEquals(1, defaultCount.get());
+
+        deliveryCompat.errorReportApiClient = new ErrorReportApiClient() {
+            @Override
+            public void postReport(String urlString,
+                                   Report report,
+                                   Map<String, String> headers)
+                throws NetworkException, BadResponseException {
+                customCount.incrementAndGet();
+            }
+        };
+
+        deliveryCompat.deliver(report, config);
+        assertEquals(1, defaultCount.get());
+        assertEquals(1, customCount.get());
+    }
+
+    @Test
+    public void deliverSession() throws Exception {
+        SessionTrackingPayload payload = null;
+        deliveryCompat.deliver(payload, config);
+
+        deliveryCompat.sessionTrackingApiClient = new SessionTrackingApiClient() {
+            @Override
+            public void postSessionTrackingPayload(String urlString,
+                                                   SessionTrackingPayload payload,
+                                                   Map<String, String> headers)
+                throws NetworkException, BadResponseException {
+                customCount.incrementAndGet();
+            }
+        };
+
+        deliveryCompat.deliver(payload, config);
+        assertEquals(1, defaultCount.get());
+        assertEquals(1, customCount.get());
+    }
+
+    @Test
+    public void testClientCompat() {
+        Client client = BugsnagTestUtils.generateClient();
+        Delivery delivery = client.config.getDelivery();
+        assertTrue(delivery instanceof DeliveryCompat);
+        DeliveryCompat compat = (DeliveryCompat) delivery;
+
+        assertNull(compat.errorReportApiClient);
+        assertNull(compat.sessionTrackingApiClient);
+
+        ErrorReportApiClient errorClient = BugsnagTestUtils.generateErrorReportApiClient();
+        client.setErrorReportApiClient(errorClient);
+
+        assertEquals(errorClient, compat.errorReportApiClient);
+        assertNull(compat.sessionTrackingApiClient);
+
+        SessionTrackingApiClient sessionClient
+            = BugsnagTestUtils.generateSessionTrackingApiClient();
+        client.setSessionTrackingApiClient(sessionClient);
+
+        assertEquals(errorClient, compat.errorReportApiClient);
+        assertEquals(sessionClient, compat.sessionTrackingApiClient);
+    }
+
+    @Test
+    public void testExceptionConversion() {
+        BadResponseException requestFailExc = new BadResponseException("test", 400);
+        DeliveryFailureException responseFail = deliveryCompat.convertException(requestFailExc);
+        assertEquals(REQUEST_FAILURE, responseFail.reason);
+
+        NetworkException connectivityExc = new NetworkException("test", new RuntimeException(""));
+        DeliveryFailureException exc = deliveryCompat.convertException(connectivityExc);
+        assertEquals(CONNECTIVITY, exc.reason);
+
+        assertNull(deliveryCompat.convertException(new RuntimeException()));
+    }
+}