Refactored code to test notification handler class.

Author: phongcao

android/src/main/java/com/azure/reactnative/notificationhub/NotificationHubUtil.java

@@ -1,15 +1,22 @@
 package com.azure.reactnative.notificationhub;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Bundle;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import com.facebook.react.bridge.ReactContext;
 import com.microsoft.windowsazure.messaging.NotificationHub;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public class NotificationHubUtil {
     private static NotificationHubUtil sharedNotificationHubUtilInstance = null;
 
@@ -25,6 +32,8 @@ public class NotificationHubUtil {
     private static final String KEY_FOR_PREFS_CHANNELENABLELIGHTS = "AzureNotificationHub_channelEnableLights";
     private static final String KEY_FOR_PREFS_CHANNELENABLEVIBRATION = "AzureNotificationHub_channelEnableVibration";
 
+    private final ExecutorService mPool = Executors.newFixedThreadPool(1);
+
     private boolean mIsForeground;
 
     public static NotificationHubUtil getInstance() {
@@ -145,6 +154,31 @@ public NotificationHub createNotificationHub(String hubName, String connectionSt
         return hub;
     }
 
+    public JSONObject convertBundleToJSON(Bundle bundle) {
+        JSONObject json = new JSONObject();
+        Set<String> keys = bundle.keySet();
+        for (String key : keys) {
+            try {
+                json.put(key, bundle.get(key));
+            } catch (JSONException e) {
+            }
+        }
+
+        return json;
+    }
+
+    public Intent createBroadcastIntent(String action, JSONObject json) {
+        Intent intent = new Intent(action);
+        intent.putExtra("event", ReactNativeNotificationHubModule.DEVICE_NOTIF_EVENT);
+        intent.putExtra("data", json.toString());
+
+        return intent;
+    }
+
+    public void runInWorkerThread(Runnable runnable) {
+        mPool.execute(runnable);
+    }
+
     private String getPref(Context context, String key) {
         SharedPreferences prefs =
                 context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);

android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeNotificationsHandler.java

@@ -37,28 +37,19 @@ private ReactNativeNotificationsHandler() {
     }
 
     public static void sendBroadcast(final Context context, final Bundle bundle, final long delay) {
-        (new Thread() {
+        final NotificationHubUtil hubUtil = NotificationHubUtil.getInstance();
+        hubUtil.runInWorkerThread(new Runnable() {
             public void run() {
                 try {
                     Thread.currentThread().sleep(delay);
-                    JSONObject json = new JSONObject();
-                    Set<String> keys = bundle.keySet();
-                    for (String key : keys) {
-                        try {
-                            json.put(key, bundle.get(key));
-                        } catch (JSONException e) {
-                        }
-                    }
-
-                    Intent event = new Intent(TAG);
-                    event.putExtra("event", ReactNativeNotificationHubModule.DEVICE_NOTIF_EVENT);
-                    event.putExtra("data", json.toString());
+                    JSONObject json = hubUtil.convertBundleToJSON(bundle);
+                    Intent event = hubUtil.createBroadcastIntent(TAG, json);
                     LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(context);
                     localBroadcastManager.sendBroadcast(event);
                 } catch (Exception e) {
                 }
             }
-        }).start();
+        });
     }
 
     public static void sendNotification(Context context, Bundle bundle, String notificationChannelID) {

android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeRegistrationIntentService.java

@@ -19,7 +19,7 @@ public class ReactNativeRegistrationIntentService extends IntentService {
 
     public static final String TAG = "ReactNativeRegistration";
 
-    private final ExecutorService pool = Executors.newFixedThreadPool(1);
+    private final ExecutorService mPool = Executors.newFixedThreadPool(1);
 
     public ReactNativeRegistrationIntentService() {
         super(TAG);
@@ -43,7 +43,7 @@ protected void onHandleIntent(Intent intent) {
         }
 
         FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(
-                pool, new OnSuccessListener<InstanceIdResult>() {
+                mPool, new OnSuccessListener<InstanceIdResult>() {
                     @Override
                     public void onSuccess(InstanceIdResult instanceIdResult) {
                         try {

sample/android/app/build.gradle

@@ -135,6 +135,7 @@ android {
         versionCode 1
         versionName "1.0"
     }
+
     splits {
         abi {
             reset()
@@ -143,6 +144,7 @@ android {
             include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
         }
     }
+
     signingConfigs {
         debug {
             storeFile file('debug.keystore')
@@ -151,6 +153,7 @@ android {
             keyPassword 'android'
         }
     }
+
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
@@ -163,6 +166,7 @@ android {
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
     }
+
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -186,8 +190,9 @@ dependencies {
     implementation "com.google.firebase:firebase-messaging:17.6.0"
     implementation "com.google.firebase:firebase-core:16.0.8"
     implementation "com.microsoft.azure:notification-hubs-android-sdk:0.6@aar"
-    testImplementation "org.powermock:powermock-api-mockito:1.6.2"
-    testImplementation "org.powermock:powermock-module-junit4:1.6.2"
+    testImplementation "org.powermock:powermock-core:2.0.2"
+    testImplementation "org.powermock:powermock-api-mockito2:2.0.2"
+    testImplementation "org.powermock:powermock-module-junit4:2.0.2"
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";