Merge branch 'master' into use-buffered-streams

bugsnag · May 2, 2018 · e00ff45 · e00ff45
2 parents 986f93d + 8a24ac6
commit e00ff45
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.java b/sdk/src/androidTest/java/com/bugsnag/android/BreadcrumbsTest.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import static com.bugsnag.android.BreadcrumbType.MANUAL;
+import static com.bugsnag.android.BugsnagTestUtils.generateClient;
 import static com.bugsnag.android.BugsnagTestUtils.streamableToJsonArray;
 import static org.junit.Assert.assertEquals;
 
@@ -16,6 +18,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Queue;
 
 
 @RunWith(AndroidJUnit4.class)
@@ -172,4 +175,21 @@ public void testPayloadType() throws JSONException, IOException {
         assertEquals("left", node.getJSONObject("metaData").get("direction"));
         assertEquals(1, breadcrumbsJson.length());
     }
+
+    @Test
+    public void testClientMethods() {
+        Client client = generateClient();
+        client.leaveBreadcrumb("Hello World");
+        Queue<Breadcrumb> store = client.breadcrumbs.store;
+        int count = 0;
+
+        for (Breadcrumb breadcrumb : store) {
+            if (MANUAL == breadcrumb.getType() && "manual".equals(breadcrumb.getName())) {
+                count++;
+                assertEquals("Hello World", breadcrumb.getMetadata().get("message"));
+            }
+        }
+        assertEquals(1, count);
+    }
+
 }
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ClientTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ClientTest.java
@@ -1,8 +1,10 @@
 package com.bugsnag.android;
 
+import static com.bugsnag.android.BugsnagTestUtils.generateClient;
 import static com.bugsnag.android.BugsnagTestUtils.getSharedPrefs;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
@@ -236,4 +238,20 @@ public void postSessionTrackingPayload(String urlString,
         assertEquals(customClient, client.sessionTracker.getApiClient());
     }
 
+    @Test
+    public void testClientAddToTab() {
+        Client client = generateClient();
+        client.addToTab("drink", "cola", "cherry");
+        assertNotNull(client.getMetaData().getTab("drink"));
+    }
+
+    @Test
+    public void testClientClearTab() {
+        Client client = generateClient();
+        client.addToTab("drink", "cola", "cherry");
+
+        client.clearTab("drink");
+        assertTrue(client.getMetaData().getTab("drink").isEmpty());
+    }
+
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/Client.java b/sdk/src/main/java/com/bugsnag/android/Client.java
@@ -1172,8 +1172,7 @@ public void setMetaData(@NonNull MetaData metaData) {
      * @param breadcrumb the log message to leave (max 140 chars)
      */
     public void leaveBreadcrumb(@NonNull String breadcrumb) {
-        Map<String, String> metaData = Collections.emptyMap();
-        Breadcrumb crumb = new Breadcrumb(breadcrumb, BreadcrumbType.MANUAL, metaData);
+        Breadcrumb crumb = new Breadcrumb(breadcrumb);
 
         if (runBeforeBreadcrumbTasks(crumb)) {
             breadcrumbs.add(crumb);