Corrected test clean up order & Robolectric update

Author: jkasten2

OneSignalSDK/unittest/build.gradle

@@ -43,5 +43,5 @@ dependencies {
     implementation 'com.google.android.gms:play-services-location:11.8.0'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.7.1'
+    testImplementation 'org.robolectric:robolectric:3.8'
 }

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

@@ -14,13 +14,17 @@
 
 import java.util.Set;
 
-import com.onesignal.ShadowOneSignalRestClient;
-
 class TestHelpers {
 
    static Exception lastException;
 
    static void betweenTestsCleanup() {
+      try {
+         stopAllOSThreads();
+      } catch (Exception e) {
+         e.printStackTrace();
+      }
+
       StaticResetHelper.restSetStaticFields();
 
       ShadowOneSignalRestClient.resetStatics();
@@ -46,12 +50,6 @@ static void betweenTestsCleanup() {
       writableDb.delete(OneSignalPackagePrivateHelper.NotificationTable.TABLE_NAME, null, null);
       writableDb.close();
       */
-
-      try {
-         stopAllOSThreads();
-      } catch (Exception e) {
-         e.printStackTrace();
-      }
       lastException = null;
    }