Merge pull request #113 from CatalystCode/thcao/hubutil-unit-tests

Improve code coverage for Android

Author: phongcao

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

@@ -12,7 +12,13 @@ public class NotificationChannelBuilder {
     private boolean mEnableLights = true;
     private boolean mEnableVibration = true;
 
-    public NotificationChannelBuilder() {
+    public static class Factory {
+        public static NotificationChannelBuilder create() {
+            return new NotificationChannelBuilder();
+        }
+    }
+
+    private NotificationChannelBuilder() {
     }
 
     public NotificationChannel build() {

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

@@ -25,6 +25,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import static com.azure.reactnative.notificationhub.ReactNativeNotificationsHandler.ERROR_ACTIVITY_CLASS_NOT_FOUND;
 import static com.azure.reactnative.notificationhub.ReactNativeNotificationsHandler.ERROR_COVERT_ACTIONS;
 import static com.azure.reactnative.notificationhub.ReactNativeNotificationsHandler.ERROR_GET_ACTIONS_ARRAY;
 import static com.azure.reactnative.notificationhub.ReactNativeNotificationsHandler.KEY_INTENT_NOTIFICATION;
@@ -50,22 +51,36 @@ public class NotificationHubUtil {
 
     private static NotificationHubUtil sharedNotificationHubUtilInstance = null;
 
-    private static final String SHARED_PREFS_NAME = "com.azure.reactnative.notificationhub.NotificationHubUtil";
-    private static final String KEY_FOR_PREFS_REGISTRATIONID = "AzureNotificationHub_registrationID";
-    private static final String KEY_FOR_PREFS_CONNECTIONSTRING = "AzureNotificationHub_connectionString";
-    private static final String KEY_FOR_PREFS_HUBNAME = "AzureNotificationHub_hubName";
-    private static final String KEY_FOR_PREFS_FCMTOKEN = "AzureNotificationHub_FCMToken";
-    private static final String KEY_FOR_PREFS_TAGS = "AzureNotificationHub_Tags";
-    private static final String KEY_FOR_PREFS_SENDERID = "AzureNotificationHub_senderID";
-    private static final String KEY_FOR_PREFS_CHANNELIMPORTANCE = "AzureNotificationHub_channelImportance";
-    private static final String KEY_FOR_PREFS_CHANNELSHOWBADGE = "AzureNotificationHub_channelShowBadge";
-    private static final String KEY_FOR_PREFS_CHANNELENABLELIGHTS = "AzureNotificationHub_channelEnableLights";
-    private static final String KEY_FOR_PREFS_CHANNELENABLEVIBRATION = "AzureNotificationHub_channelEnableVibration";
+    public static final String SHARED_PREFS_NAME = "com.azure.reactnative.notificationhub.NotificationHubUtil";
+    public static final String KEY_FOR_PREFS_REGISTRATIONID = "AzureNotificationHub_registrationID";
+    public static final String KEY_FOR_PREFS_CONNECTIONSTRING = "AzureNotificationHub_connectionString";
+    public static final String KEY_FOR_PREFS_HUBNAME = "AzureNotificationHub_hubName";
+    public static final String KEY_FOR_PREFS_FCMTOKEN = "AzureNotificationHub_FCMToken";
+    public static final String KEY_FOR_PREFS_TAGS = "AzureNotificationHub_Tags";
+    public static final String KEY_FOR_PREFS_SENDERID = "AzureNotificationHub_senderID";
+    public static final String KEY_FOR_PREFS_CHANNELIMPORTANCE = "AzureNotificationHub_channelImportance";
+    public static final String KEY_FOR_PREFS_CHANNELSHOWBADGE = "AzureNotificationHub_channelShowBadge";
+    public static final String KEY_FOR_PREFS_CHANNELENABLELIGHTS = "AzureNotificationHub_channelEnableLights";
+    public static final String KEY_FOR_PREFS_CHANNELENABLEVIBRATION = "AzureNotificationHub_channelEnableVibration";
 
     private final ExecutorService mPool = Executors.newFixedThreadPool(1);
 
     private boolean mIsForeground;
 
+    public static class IntentFactory {
+        public static Intent createIntent() {
+            return new Intent();
+        }
+
+        public static Intent createIntent(String action) {
+            return new Intent(action);
+        }
+
+        public static Intent createIntent(Context context, Class intentClass) {
+            return new Intent(context, intentClass);
+        }
+    }
+
     public static NotificationHubUtil getInstance() {
         if (sharedNotificationHubUtilInstance == null) {
             sharedNotificationHubUtilInstance = new NotificationHubUtil();
@@ -202,7 +217,7 @@ public JSONObject convertBundleToJSON(Bundle bundle) {
     }
 
     public Intent createBroadcastIntent(String action, JSONObject json) {
-        Intent intent = new Intent(action);
+        Intent intent = IntentFactory.createIntent(action);
         intent.putExtra("event", ReactNativeNotificationHubModule.DEVICE_NOTIF_EVENT);
         intent.putExtra("data", json.toString());
 
@@ -216,7 +231,7 @@ public Class getMainActivityClass(Context context) {
         try {
             return Class.forName(className);
         } catch (ClassNotFoundException e) {
-            e.printStackTrace();
+            Log.e(TAG, ERROR_ACTIVITY_CLASS_NOT_FOUND, e);
             return null;
         }
     }
@@ -289,10 +304,8 @@ public Uri getSoundUri(Context context, Bundle bundle) {
                 // So the strings 'my_sound.mp3' AND 'my_sound' are accepted
                 // The reason is to make the iOS and android javascript interfaces compatible
 
-                int resId;
-                if (context.getResources().getIdentifier(soundName, RESOURCE_DEF_TYPE_RAW, context.getPackageName()) != 0) {
-                    resId = context.getResources().getIdentifier(soundName, RESOURCE_DEF_TYPE_RAW, context.getPackageName());
-                } else {
+                int resId = context.getResources().getIdentifier(soundName, RESOURCE_DEF_TYPE_RAW, context.getPackageName());
+                if (resId == 0) {
                     soundName = soundName.substring(0, soundName.lastIndexOf('.'));
                     resId = context.getResources().getIdentifier(soundName, RESOURCE_DEF_TYPE_RAW, context.getPackageName());
                 }
@@ -305,7 +318,7 @@ public Uri getSoundUri(Context context, Bundle bundle) {
     }
 
     public Intent createNotificationIntent(Context context, Bundle bundle, Class intentClass) {
-        Intent intent = new Intent(context, intentClass);
+        Intent intent = IntentFactory.createIntent(context, intentClass);
         intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         bundle.putBoolean(KEY_REMOTE_NOTIFICATION_FOREGROUND, true);
         bundle.putBoolean(KEY_REMOTE_NOTIFICATION_USER_INTERACTION, false);
@@ -340,7 +353,7 @@ public void processNotificationActions(Context context, Bundle bundle,
                     continue;
                 }
 
-                Intent actionIntent = new Intent();
+                Intent actionIntent = IntentFactory.createIntent();
                 actionIntent.setAction(context.getPackageName() + "." + action);
                 // Add "action" for later identifying which button gets pressed.
                 bundle.putString(KEY_REMOTE_NOTIFICATION_ACTION, action);

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

@@ -24,7 +24,7 @@ public class ReactNativeFirebaseMessagingService extends FirebaseMessagingServic
     public static void createNotificationChannel(Context context) {
         if (notificationChannelID == null) {
             NotificationHubUtil notificationHubUtil = NotificationHubUtil.getInstance();
-            NotificationChannelBuilder builder = new NotificationChannelBuilder();
+            NotificationChannelBuilder builder = NotificationChannelBuilder.Factory.create();
             if (notificationHubUtil.hasChannelImportance(context)) {
                 builder.setImportance(notificationHubUtil.getChannelImportance(context));
             }
@@ -52,11 +52,23 @@ public static void createNotificationChannel(Context context) {
         }
     }
 
+    public static void deleteNotificationChannel(Context context) {
+        if (notificationChannelID != null) {
+            final String channelToDeleteID = notificationChannelID;
+            notificationChannelID = null;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                NotificationManager notificationManager = (NotificationManager) context.getSystemService(
+                        Context.NOTIFICATION_SERVICE);
+                notificationManager.deleteNotificationChannel(channelToDeleteID);
+            }
+        }
+    }
+
     @Override
     public void onNewToken(String token) {
         Log.i(TAG, "Refreshing FCM Registration Token");
 
-        Intent intent = new Intent(this, ReactNativeRegistrationIntentService.class);
+        Intent intent = NotificationHubUtil.IntentFactory.createIntent(this, ReactNativeRegistrationIntentService.class);
         startService(intent);
     }
 

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

@@ -153,7 +153,8 @@ public void register(ReadableMap config, Promise promise) {
             return;
         }
 
-        Intent intent = new Intent(reactContext, ReactNativeRegistrationIntentService.class);
+        Intent intent = NotificationHubUtil.IntentFactory.createIntent(
+                reactContext, ReactNativeRegistrationIntentService.class);
         reactContext.startService(intent);
     }
 

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

@@ -75,6 +75,7 @@ public final class ReactNativeNotificationsHandler {
     public static final String ERROR_COVERT_ACTIONS = "Exception while converting actions to JSON object.";
     public static final String ERROR_GET_ACTIONS_ARRAY = "Exception while getting action from actionsArray.";
     public static final String ERROR_SEND_PUSH_NOTIFICATION = "failed to send push notification";
+    public static final String ERROR_ACTIVITY_CLASS_NOT_FOUND = "Activity class not found";
 
     private static final long DEFAULT_VIBRATION = 300L;
 
@@ -178,7 +179,7 @@ public static void sendNotification(Context context, Bundle bundle, String notif
                 notificationBuilder.setSound(soundUri);
             }
 
-            if (bundle.containsKey(KEY_REMOTE_NOTIFICATION_ONGOING) || bundle.getBoolean(KEY_REMOTE_NOTIFICATION_ONGOING)) {
+            if (bundle.containsKey(KEY_REMOTE_NOTIFICATION_ONGOING)) {
                 notificationBuilder.setOngoing(bundle.getBoolean(KEY_REMOTE_NOTIFICATION_ONGOING));
             }
 

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

@@ -28,7 +28,7 @@ public ReactNativeRegistrationIntentService() {
     @Override
     protected void onHandleIntent(Intent intent) {
         final LocalBroadcastManager localBroadcastManager = LocalBroadcastManager.getInstance(this);
-        final Intent event = new Intent(TAG);
+        final Intent event = NotificationHubUtil.IntentFactory.createIntent(TAG);
         final NotificationHubUtil notificationHubUtil = NotificationHubUtil.getInstance();
         final String connectionString = notificationHubUtil.getConnectionString(this);
         final String hubName = notificationHubUtil.getHubName(this);

sample/android/app/build.gradle

@@ -193,6 +193,7 @@ dependencies {
     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"
+    testImplementation "org.json:json:20180130"
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";