Merge pull request #93 from CatalystCode/thcao/android-tests

Adding initial unit tests for Android.

Author: phongcao

.gitignore

@@ -0,0 +1,4 @@
+android/.gradle
+android/.idea
+android/android.iml
+android/local.properties

.npmignore

@@ -1,3 +1,4 @@
-azure-pipelines.yml
 .gitattributes
+.gitignore
+azure-pipelines.yml
 sample

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

@@ -7,6 +7,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.facebook.react.bridge.ReactContext;
+import com.microsoft.windowsazure.messaging.NotificationHub;
+
 public class NotificationHubUtil {
     private static NotificationHubUtil sharedNotificationHubUtilInstance = null;
 
@@ -24,7 +27,7 @@ public class NotificationHubUtil {
             "AzureNotificationHub_Tags";
 
     public static NotificationHubUtil getInstance() {
-        if(sharedNotificationHubUtilInstance == null) {
+        if (sharedNotificationHubUtilInstance == null) {
             sharedNotificationHubUtilInstance = new NotificationHubUtil();
         }
         return sharedNotificationHubUtilInstance;
@@ -72,6 +75,11 @@ public void setTags(Context context, String[] tags) {
         setPrefSet(context, KEY_FOR_PREFS_TAGS, set);
     }
 
+    public NotificationHub createNotificationHub(String hubName, String connectionString, ReactContext reactContext) {
+        NotificationHub hub = new NotificationHub(hubName, connectionString, reactContext);
+        return hub;
+    }
+
     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/ReactNativeNotificationHubModule.java

@@ -6,6 +6,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.facebook.react.bridge.LifecycleEventListener;
@@ -26,20 +27,27 @@
 import com.microsoft.windowsazure.notifications.NotificationsManager;
 
 public class ReactNativeNotificationHubModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
+    public static final String AZURE_NOTIFICATION_HUB_NAME = "AzureNotificationHub";
     public static final String NOTIF_REGISTER_AZURE_HUB_EVENT = "azureNotificationHubRegistered";
     public static final String NOTIF_AZURE_HUB_REGISTRATION_ERROR_EVENT = "azureNotificationHubRegistrationError";
     public static final String DEVICE_NOTIF_EVENT = "remoteNotificationReceived";
 
+    public static final String ERROR_INVALID_ARGUMENTS = "E_INVALID_ARGUMENTS";
+    public static final String ERROR_INVALID_CONNECTION_STRING = "Connection string cannot be null.";
+    public static final String ERROR_INVALID_HUBNAME = "Hub name cannot be null.";
+    public static final String ERROR_INVALID_SENDER_ID = "Sender ID cannot be null.";
+    public static final String ERROR_PLAY_SERVICES = "E_PLAY_SERVICES";
+    public static final String ERROR_PLAY_SERVICES_DISABLED = "User must enable Google Play Services.";
+    public static final String ERROR_PLAY_SERVICES_UNSUPPORTED = "This device is not supported by Google Play Services.";
+    public static final String ERROR_NOTIFICATION_HUB = "E_NOTIFICATION_HUB";
+    public static final String ERROR_NOT_REGISTERED = "E_NOT_REGISTERED";
+    public static final String ERROR_NOT_REGISTERED_DESC = "No registration to Azure Notification Hub.";
+
     private static final int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
     private static final int NOTIFICATION_DELAY_ON_START = 3000;
 
-    private static final String ERROR_INVALID_ARGUMENTS = "E_INVALID_ARGUMENTS";
-    private static final String ERROR_PLAY_SERVICES = "E_PLAY_SERVICES";
-    private static final String ERROR_NOTIFICATION_HUB = "E_NOTIFICATION_HUB";
-    private static final String ERROR_NOT_REGISTERED = "E_NOT_REGISTERED";
-
-    private ReactApplicationContext  mReactContext;
-    private LocalBroadcastReceiver  mLocalBroadcastReceiver;
+    private ReactApplicationContext mReactContext;
+    private LocalBroadcastReceiver mLocalBroadcastReceiver;
 
     public ReactNativeNotificationHubModule(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -53,25 +61,28 @@ public ReactNativeNotificationHubModule(ReactApplicationContext reactContext) {
 
     @Override
     public String getName() {
-        return "AzureNotificationHub";
+        return AZURE_NOTIFICATION_HUB_NAME;
     }
 
     @ReactMethod
     public void register(ReadableMap config, Promise promise) {
         NotificationHubUtil notificationHubUtil = NotificationHubUtil.getInstance();
         String connectionString = config.getString("connectionString");
         if (connectionString == null) {
-            promise.reject(ERROR_INVALID_ARGUMENTS, "Connection string cannot be null.");
+            promise.reject(ERROR_INVALID_ARGUMENTS, ERROR_INVALID_CONNECTION_STRING);
+            return;
         }
 
         String hubName = config.getString("hubName");
         if (hubName == null) {
-            promise.reject(ERROR_INVALID_ARGUMENTS, "Hub name cannot be null.");
+            promise.reject(ERROR_INVALID_ARGUMENTS, ERROR_INVALID_HUBNAME);
+            return;
         }
 
         String senderID = config.getString("senderID");
         if (senderID == null) {
-            promise.reject(ERROR_INVALID_ARGUMENTS, "Sender ID cannot be null.");
+            promise.reject(ERROR_INVALID_ARGUMENTS, ERROR_INVALID_SENDER_ID);
+            return;
         }
 
         String[] tags = null;
@@ -97,9 +108,9 @@ public void register(ReadableMap config, Promise promise) {
                                 getCurrentActivity(),
                                 apiAvailability,
                                 resultCode));
-                promise.reject(ERROR_PLAY_SERVICES, "User must enable Google Play Services.");
+                promise.reject(ERROR_PLAY_SERVICES, ERROR_PLAY_SERVICES_DISABLED);
             } else {
-                promise.reject(ERROR_PLAY_SERVICES, "This device is not supported by Google Play Services.");
+                promise.reject(ERROR_PLAY_SERVICES, ERROR_PLAY_SERVICES_UNSUPPORTED);
             }
             return;
         }
@@ -118,10 +129,11 @@ public void unregister(Promise promise) {
         String registrationId = notificationHubUtil.getRegistrationID(reactContext);
 
         if (connectionString == null || hubName == null || registrationId == null) {
-            promise.reject(ERROR_NOT_REGISTERED, "No registration to Azure Notification Hub.");
+            promise.reject(ERROR_NOT_REGISTERED, ERROR_NOT_REGISTERED_DESC);
+            return;
         }
 
-        NotificationHub hub = new NotificationHub(hubName, connectionString, reactContext);
+        NotificationHub hub = notificationHubUtil.createNotificationHub(hubName, connectionString, reactContext);
         try {
             hub.unregister();
             notificationHubUtil.setRegistrationID(reactContext, null);
@@ -144,10 +156,15 @@ public void onHostResume() {
             }
         }
     }
+
     @Override
-    public void onHostPause() {}
+    public void onHostPause() {
+    }
+
     @Override
-    public void onHostDestroy() {}
+    public void onHostDestroy() {
+    }
+
     public class LocalBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {

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

@@ -17,8 +17,10 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+
 import androidx.core.app.NotificationCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import android.util.Log;
 
 import org.json.JSONArray;

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

@@ -2,7 +2,9 @@
 
 import android.app.IntentService;
 import android.content.Intent;
+
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import android.util.Log;
 
 import com.google.android.gms.tasks.OnSuccessListener;

azure-pipelines.yml

@@ -44,6 +44,14 @@ steps:
     gradleWrapperFile: '../sample/android/gradlew'
     tasks: 'assembleRelease'
   continueOnError: false
+  
+- task: Gradle@2
+  displayName: 'Running Android unit tests'
+  inputs:
+    workingDirectory: '../sample/android'
+    gradleWrapperFile: '../sample/android/gradlew'
+    tasks: 'test'
+  continueOnError: false  
 
 - script: |
     pod install

sample/android/app/build.gradle

@@ -184,6 +184,9 @@ dependencies {
     implementation project(":react-native-azurenotificationhub")  // From node_modules
     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.4@aar"
+    testImplementation "org.powermock:powermock-api-mockito:1.6.2"
+    testImplementation "org.powermock:powermock-module-junit4:1.6.2"
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";