Merge pull request #1342 from OneSignal/fix/tests_stalling

Fix Tests Stalling

Author: jkasten2

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSTaskController.java

@@ -105,6 +105,12 @@ ConcurrentLinkedQueue<Runnable> getTaskQueueWaitingForInit() {
         return taskQueueWaitingForInit;
     }
 
+    void shutdownNow() {
+        if (pendingTaskExecutor != null) {
+            pendingTaskExecutor.shutdownNow();
+        }
+    }
+
     private static class PendingTaskRunnable implements Runnable {
         private OSTaskController controller;
         private Runnable innerTask;

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java

@@ -3167,6 +3167,10 @@ static OSTaskController getTaskRemoteController() {
       return taskRemoteController;
    }
 
+   static OSTaskController getTaskController() {
+      return taskController;
+   }
+
    static FocusTimeController getFocusTimeController() {
       return focusTimeController;
    }

OneSignalSDK/unittest/src/test/java/com/onesignal/OneSignalPackagePrivateHelper.java

@@ -271,6 +271,11 @@ public static ConcurrentLinkedQueue<Runnable> OneSignal_taskQueueWaitingForInit(
       return OneSignal.getTaskRemoteController().getTaskQueueWaitingForInit();
    }
 
+   public static void OneSignal_OSTaskController_ShutdownNow() {
+      OneSignal.getTaskRemoteController().shutdownNow();
+      OneSignal.getTaskController().shutdownNow();
+   }
+
    public static boolean OneSignal_requiresUserPrivacyConsent() {
       return OneSignal.requiresUserPrivacyConsent();
    }

OneSignalSDK/unittest/src/test/java/com/test/onesignal/DeviceTypeTestsRunner.java

@@ -6,6 +6,8 @@
 import com.onesignal.ShadowOSUtils;
 import com.onesignal.StaticResetHelper;
 
+import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -43,6 +45,16 @@ public void beforeEachTest() throws Exception {
         OneSignal.initWithContext(ApplicationProvider.getApplicationContext());
     }
 
+    @AfterClass
+    public static void afterEverything() throws Exception {
+        TestHelpers.beforeTestInitAndCleanup();
+    }
+
+    @After
+    public void afterEachTest() throws Exception {
+        TestHelpers.afterTestCleanup();
+    }
+
     @Test
     public void noAvailablePushChannels_defaultsToAndroid() {
         assertEquals(DEVICE_TYPE_ANDROID, getDeviceType());

OneSignalSDK/unittest/src/test/java/com/test/onesignal/GenerateNotificationRunner.java

@@ -86,6 +86,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -216,7 +217,12 @@ public void beforeEachTest() throws Exception {
 
    @AfterClass
    public static void afterEverything() throws Exception {
-      StaticResetHelper.restSetStaticFields();
+      TestHelpers.beforeTestInitAndCleanup();
+   }
+
+   @After
+   public void afterEachTest() throws Exception {
+      TestHelpers.afterTestCleanup();
    }
 
    public static Bundle getBaseNotifBundle() {

OneSignalSDK/unittest/src/test/java/com/test/onesignal/HMSDataMessageReceivedIntegrationTestsRunner.java

@@ -14,6 +14,8 @@
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -65,6 +67,16 @@ public void beforeEachTest() throws Exception {
         blankActivity = blankActivityController.get();
     }
 
+    @AfterClass
+    public static void afterEverything() throws Exception {
+        TestHelpers.beforeTestInitAndCleanup();
+    }
+
+    @After
+    public void afterEachTest() throws Exception {
+        TestHelpers.afterTestCleanup();
+    }
+
     private static @NonNull String helperBasicOSPayload() throws JSONException {
         return new JSONObject() {{
             put(PAYLOAD_OS_ROOT_CUSTOM, new JSONObject() {{

OneSignalSDK/unittest/src/test/java/com/test/onesignal/NotificationOpenedActivityHMSIntegrationTestsRunner.java

@@ -23,6 +23,8 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -84,6 +86,16 @@ public void beforeEachTest() throws Exception {
         setRemoteParamsGetHtmlResponse();
     }
 
+    @AfterClass
+    public static void afterEverything() throws Exception {
+        TestHelpers.beforeTestInitAndCleanup();
+    }
+
+    @After
+    public void afterEachTest() throws Exception {
+        TestHelpers.afterTestCleanup();
+    }
+
     private static @NonNull Intent helper_baseHMSOpenIntent() {
         return new Intent()
                 .setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK)

OneSignalSDK/unittest/src/test/java/com/test/onesignal/TestHelpers.java

@@ -73,6 +73,7 @@
 import java.util.Set;
 
 import static com.onesignal.OneSignalPackagePrivateHelper.JSONUtils;
+import static com.onesignal.OneSignalPackagePrivateHelper.OneSignal_OSTaskController_ShutdownNow;
 import static junit.framework.Assert.assertEquals;
 import static org.robolectric.Shadows.shadowOf;
 
@@ -136,6 +137,7 @@ static void beforeTestInitAndCleanup() throws Exception {
 
    public static void afterTestCleanup() throws Exception {
       try {
+         OneSignal_OSTaskController_ShutdownNow();
          stopAllOSThreads();
       } catch (Exception e) {
          e.printStackTrace();