test: cancel any background tasks in test runs

bugsnag · Jun 22, 2018 · adc20c1 · adc20c1
1 parent 7cc8a23
commit adc20c1
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 0 deletions.
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/AppDataTest.java b/sdk/src/androidTest/java/com/bugsnag/android/AppDataTest.java
@@ -13,6 +13,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,6 +31,11 @@ public void setUp() throws Exception {
         config = new Configuration("some-api-key");
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testManifestData() throws JSONException, IOException {
         AppData appData = generateAppData();

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.java b/sdk/src/androidTest/java/com/bugsnag/android/BeforeNotifyTest.java
@@ -5,6 +5,7 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,6 +35,11 @@ public void setUp() throws Exception {
         config = new Configuration("api-key");
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testRunModifiesError() {
         final String context = "new-context";

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/BreadcrumbLifecycleCrashTest.java b/sdk/src/androidTest/java/com/bugsnag/android/BreadcrumbLifecycleCrashTest.java
@@ -5,6 +5,7 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,6 +29,11 @@ public void setUp() throws Exception {
         sessionTracker = new SessionTracker(configuration, null, sessionStore);
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testLifecycleBreadcrumbCrash() {
         // should not crash with a null client

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ConfigurationTest.java
@@ -10,6 +10,7 @@
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,6 +28,11 @@ public void setUp() throws Exception {
         config = new Configuration("api-key");
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testEndpoints() {
         String notify = "https://notify.myexample.com";

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java b/sdk/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java
@@ -18,6 +18,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,6 +37,11 @@ public void setUp() throws Exception {
         deviceData = new DeviceData(InstrumentationRegistry.getContext(), sharedPref);
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testSaneValues() throws JSONException, IOException {
         JSONObject deviceDataJson = streamableToJson(deviceData);

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ErrorTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ErrorTest.java
@@ -18,6 +18,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +45,11 @@ public void setUp() throws Exception {
         error = new Error.Builder(config, exception, null).build();
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testShouldIgnoreClass() {
         config.setIgnoreClasses(new String[]{"java.io.IOException"});

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ExceptionsTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ExceptionsTest.java
@@ -11,6 +11,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,6 +29,11 @@ public void setUp() throws Exception {
         config = new Configuration("api-key");
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testBasicException() throws JSONException, IOException {
         Exceptions exceptions = new Exceptions(config, new RuntimeException("oops"));

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/JsonStreamTest.java b/sdk/src/androidTest/java/com/bugsnag/android/JsonStreamTest.java
@@ -11,6 +11,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,6 +43,11 @@ public void setUp() throws Exception {
         file.delete();
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testSaneValues() throws JSONException, IOException {
         final Long nullLong = null;

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/ReportTest.java b/sdk/src/androidTest/java/com/bugsnag/android/ReportTest.java
@@ -9,6 +9,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,6 +35,11 @@ public void setUp() throws Exception {
         report = new Report("api-key", error);
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testInMemoryError() throws JSONException, IOException {
         JSONObject reportJson = streamableToJson(report);

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java b/sdk/src/androidTest/java/com/bugsnag/android/SessionStoreTest.java
@@ -45,6 +45,7 @@ public void setUp() throws Exception {
      */
     @After
     public void tearDown() throws Exception {
+        Async.cancelTasks();
         FileUtils.clearFilesInDir(storageDir);
     }