Merge pull request #891 from OneSignal/upgrade/robolectric4_3_1

Updated to Robolectric 4.3.1

Author: jkasten2

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

@@ -35,7 +35,6 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Set;
 
@@ -111,11 +110,14 @@ public static class WritePrefHandlerThread extends HandlerThread {
 
         WritePrefHandlerThread(String name) {
             super(name);
-            start();
-            mHandler = new Handler(getLooper());
         }
 
         void startDelayedWrite() {
+            if (mHandler == null) {
+                start();
+                mHandler = new Handler(getLooper());
+            }
+
             synchronized (mHandler) {
                 mHandler.removeCallbacksAndMessages(null);
                 if (lastSyncTime == 0)

OneSignalSDK/unittest/build.gradle

@@ -47,6 +47,6 @@ dependencies {
     implementation 'com.google.firebase:firebase-core:16.0.4'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:4.0'
+    testImplementation 'org.robolectric:robolectric:4.3.1'
     testImplementation 'org.awaitility:awaitility:3.1.5'
 }

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

@@ -66,6 +66,6 @@ public void tesWriteWithNullContextAndSavesAfterSetting() throws Exception {
 
       final SharedPreferences prefs = blankActivity.getSharedPreferences(OneSignalPrefs.PREFS_ONESIGNAL, Context.MODE_PRIVATE);
       String value = prefs.getString("key", "");
-      assertEquals(value, "value");
+      assertEquals("value", value);
    }
 }

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

@@ -67,11 +67,11 @@ static void beforeTestInitAndCleanup() throws Exception {
       ShadowOneSignalRestClient.resetStatics();
 
       ShadowPushRegistratorGCM.resetStatics();
-   
+
       ShadowNotificationManagerCompat.enabled = true;
 
       ShadowOSUtils.subscribableStatus = 1;
-   
+
       ShadowCustomTabsClient.resetStatics();
       ShadowGcmBroadcastReceiver.resetStatics();
 
@@ -125,7 +125,12 @@ static void stopAllOSThreads() {
    static void flushBufferedSharedPrefs() {
       OneSignalPrefs.WritePrefHandlerThread handlerThread = OneSignalPackagePrivateHelper.OneSignalPrefs.prefsHandler;
 
+      if (handlerThread.mHandler == null)
+         return;
+
       synchronized (handlerThread.mHandler) {
+         if (handlerThread.getLooper() == null)
+            return;
          Scheduler scheduler = shadowOf(handlerThread.getLooper()).getScheduler();
          while (scheduler.runOneTask());
       }
@@ -141,16 +146,16 @@ static boolean runOSThreads() throws Exception {
          Set<Thread> threadSet = Thread.getAllStackTraces().keySet();
 
          for (Thread thread : threadSet) {
-            if (thread.getName().startsWith("OS_")) {
-               if (ShadowOneSignalRestClient.isAFrozenThread(thread))
-                  continue;
+            if (!thread.getName().startsWith("OS_"))
+               continue;
+            if (ShadowOneSignalRestClient.isAFrozenThread(thread))
+               continue;
 
-               thread.join(0, 1);
+            thread.join(0, 1);
 
-               if (lastException != null)
-                  throw lastException;
-               joinedAThread = createdNewThread = true;
-            }
+            if (lastException != null)
+               throw lastException;
+            joinedAThread = createdNewThread = true;
          }
       } while (joinedAThread);
 
@@ -194,8 +199,6 @@ static void beforeTestSuite() throws Exception {
 
       StaticResetHelper.load();
 
-      Looper.prepareMainLooper();
-
       beforeTestInitAndCleanup();
 
       System.out.println("beforeTestSuite!!!!!!");