Fix failing test shouldHandleBasicNotifications

Author: Jeasmine

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

@@ -77,7 +77,7 @@ public synchronized void complete(@Nullable final OSNotification notification) {
 
       isComplete = true;
 
-      if (OSUtils.isRunningOnMainThread()) {
+      if (isRunningOnMainThread()) {
          new Thread(new Runnable() {
             @Override
             public void run() {
@@ -119,4 +119,8 @@ public String toString() {
               ", notification=" + notification +
               '}';
    }
+
+   static boolean isRunningOnMainThread() {
+      return OSUtils.isRunningOnMainThread();
+   }
 }

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

@@ -986,6 +986,9 @@ public static void provideUserConsent(boolean consent) {
    }
 
    private static boolean reassignDelayedInitParams() {
+      if (initDone)
+         return false;
+
       String delayedAppId;
       Context delayedContext;
       if (delayedInitParams == null) {

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

@@ -0,0 +1,25 @@
+package com.onesignal;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(OSNotificationReceivedEvent.class)
+public class ShadowNotificationReceivedEvent {
+
+    private static boolean runningOnMainThreadCheck = false;
+
+    @Implementation
+    public static boolean isRunningOnMainThread() {
+        // Remove Main thread check and throw
+        runningOnMainThreadCheck = true;
+        return false;
+    }
+
+    public static boolean isRunningOnMainThreadCheckCalled() {
+        return runningOnMainThreadCheck;
+    }
+
+    public static void resetStatics() {
+        runningOnMainThreadCheck = false;
+    }
+}

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

@@ -68,6 +68,7 @@
 import com.onesignal.ShadowFCMBroadcastReceiver;
 import com.onesignal.ShadowGenerateNotification;
 import com.onesignal.ShadowNotificationManagerCompat;
+import com.onesignal.ShadowNotificationReceivedEvent;
 import com.onesignal.ShadowOSUtils;
 import com.onesignal.ShadowOSViewUtils;
 import com.onesignal.ShadowOSWebView;
@@ -823,7 +824,7 @@ public void shouldUpdateNormalNotificationDisplayWhenReplacingANotification() th
    }
 
    @Test
-   @Config(shadows = { ShadowGenerateNotification.class })
+   @Config(shadows = { ShadowGenerateNotification.class, ShadowNotificationReceivedEvent.class })
    public void shouldHandleBasicNotifications() throws Exception {
       // Make sure the notification got posted and the content is correct.
       Bundle bundle = getBaseNotifBundle();

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

@@ -37,6 +37,7 @@
 import com.onesignal.ShadowHMSFusedLocationProviderClient;
 import com.onesignal.ShadowHmsInstanceId;
 import com.onesignal.ShadowNotificationManagerCompat;
+import com.onesignal.ShadowNotificationReceivedEvent;
 import com.onesignal.ShadowOSUtils;
 import com.onesignal.ShadowOSWebView;
 import com.onesignal.ShadowOneSignalDbHelper;
@@ -128,6 +129,7 @@ static void beforeTestInitAndCleanup() throws Exception {
       ShadowOSUtils.resetStatics();
       ShadowTimeoutHandler.resetStatics();
       ShadowGenerateNotification.resetStatics();
+      ShadowNotificationReceivedEvent.resetStatics();
 
       lastException = null;
    }