Skip to content

Commit 97b5bd4

Browse files
phongcaophongcao
committed
Refactored registration keys for readability.
1 parent 0cdf710 commit 97b5bd4

File tree

3 files changed

+56
-52
lines changed

3 files changed

+56
-52
lines changed

‎android/src/main/java/com/azure/reactnative/notificationhub/ReactNativeConstants.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ public final class ReactNativeConstants {
1111
public static final String EVENT_AZURE_NOTIFICATION_HUB_REGISTERED_ERROR = "azureNotificationHubRegisteredError";
1212

1313
// Registration's keys
14+
public static final String KEY_REGISTRATION_CONNECTIONSTRING = "connectionString";
15+
public static final String KEY_REGISTRATION_HUBNAME = "hubName";
16+
public static final String KEY_REGISTRATION_SENDERID = "senderID";
17+
public static final String KEY_REGISTRATION_TAGS = "tags";
1418
public static final String KEY_REGISTRATION_CHANNELNAME = "channelName";
1519
public static final String KEY_REGISTRATION_CHANNELIMPORTANCE = "channelImportance";
1620
public static final String KEY_REGISTRATION_CHANNELSHOWBADGE = "channelShowBadge";

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,27 +64,27 @@ public boolean getIsForeground() {
6464
@ReactMethod
6565
public void register(ReadableMap config, Promise promise) {
6666
ReactNativeNotificationHubUtil notificationHubUtil = ReactNativeNotificationHubUtil.getInstance();
67-
String connectionString = config.getString("connectionString");
67+
String connectionString = config.getString(KEY_REGISTRATION_CONNECTIONSTRING);
6868
if (connectionString == null) {
6969
promise.reject(ERROR_INVALID_ARGUMENTS, ERROR_INVALID_CONNECTION_STRING);
7070
return;
7171
}
7272

73-
String hubName = config.getString("hubName");
73+
String hubName = config.getString(KEY_REGISTRATION_HUBNAME);
7474
if (hubName == null) {
7575
promise.reject(ERROR_INVALID_ARGUMENTS, ERROR_INVALID_HUBNAME);
7676
return;
7777
}
7878

79-
String senderID = config.getString("senderID");
79+
String senderID = config.getString(KEY_REGISTRATION_SENDERID);
8080
if (senderID == null) {
8181
promise.reject(ERROR_INVALID_ARGUMENTS, ERROR_INVALID_SENDER_ID);
8282
return;
8383
}
8484

8585
String[] tags = null;
86-
if (config.hasKey("tags") && !config.isNull("tags")) {
87-
ReadableArray tagsJson = config.getArray("tags");
86+
if (config.hasKey(KEY_REGISTRATION_TAGS) && !config.isNull(KEY_REGISTRATION_TAGS)) {
87+
ReadableArray tagsJson = config.getArray(KEY_REGISTRATION_TAGS);
8888
tags = new String[tagsJson.size()];
8989
for (int i = 0; i < tagsJson.size(); ++i) {
9090
tags[i] = tagsJson.getString(i);

‎sample/android/app/src/test/java/com/reactnativeazurenotificationhubsample/ReactNativeNotificationHubModuleTest.java

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void testGetIsForeground() {
138138

139139
@Test
140140
public void testRegisterMissingConnectionString() {
141-
when(mConfig.getString("connectionString")).thenReturn(null);
141+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(null);
142142

143143
mHubModule.register(mConfig, mPromise);
144144

@@ -149,8 +149,8 @@ public void testRegisterMissingConnectionString() {
149149

150150
@Test
151151
public void testRegisterMissingHubName() {
152-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
153-
when(mConfig.getString("hubName")).thenReturn(null);
152+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
153+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(null);
154154

155155
mHubModule.register(mConfig, mPromise);
156156

@@ -161,9 +161,9 @@ public void testRegisterMissingHubName() {
161161

162162
@Test
163163
public void testRegisterMissingSenderID() {
164-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
165-
when(mConfig.getString("hubName")).thenReturn("hubName");
166-
when(mConfig.getString("senderID")).thenReturn(null);
164+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
165+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(KEY_REGISTRATION_HUBNAME);
166+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(null);
167167

168168
mHubModule.register(mConfig, mPromise);
169169

@@ -176,9 +176,9 @@ public void testRegisterMissingSenderID() {
176176
public void testRegisterHasChannelName() {
177177
final String channelName = "Channel Name";
178178

179-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
180-
when(mConfig.getString("hubName")).thenReturn("hubName");
181-
when(mConfig.getString("senderID")).thenReturn("senderID");
179+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
180+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(KEY_REGISTRATION_HUBNAME);
181+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(KEY_REGISTRATION_SENDERID);
182182
when(mConfig.hasKey(KEY_REGISTRATION_CHANNELNAME)).thenReturn(true);
183183
when(mConfig.getString(KEY_REGISTRATION_CHANNELNAME)).thenReturn(channelName);
184184

@@ -192,9 +192,9 @@ public void testRegisterHasChannelName() {
192192
public void testRegisterHasChannelImportance() {
193193
final int channelImportance = 1;
194194

195-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
196-
when(mConfig.getString("hubName")).thenReturn("hubName");
197-
when(mConfig.getString("senderID")).thenReturn("senderID");
195+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
196+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(KEY_REGISTRATION_HUBNAME);
197+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(KEY_REGISTRATION_SENDERID);
198198
when(mConfig.hasKey("channelImportance")).thenReturn(true);
199199
when(mConfig.getInt("channelImportance")).thenReturn(channelImportance);
200200

@@ -208,9 +208,9 @@ public void testRegisterHasChannelImportance() {
208208
public void testRegisterHasChannelShowBadge() {
209209
final boolean channelShowBadge = true;
210210

211-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
212-
when(mConfig.getString("hubName")).thenReturn("hubName");
213-
when(mConfig.getString("senderID")).thenReturn("senderID");
211+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
212+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(KEY_REGISTRATION_HUBNAME);
213+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(KEY_REGISTRATION_SENDERID);
214214
when(mConfig.hasKey("channelShowBadge")).thenReturn(true);
215215
when(mConfig.getBoolean("channelShowBadge")).thenReturn(channelShowBadge);
216216

@@ -224,9 +224,9 @@ public void testRegisterHasChannelShowBadge() {
224224
public void testRegisterHasChannelEnableLights() {
225225
final boolean channelEnableLights = true;
226226

227-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
228-
when(mConfig.getString("hubName")).thenReturn("hubName");
229-
when(mConfig.getString("senderID")).thenReturn("senderID");
227+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
228+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(KEY_REGISTRATION_HUBNAME);
229+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(KEY_REGISTRATION_SENDERID);
230230
when(mConfig.hasKey("channelEnableLights")).thenReturn(true);
231231
when(mConfig.getBoolean("channelEnableLights")).thenReturn(channelEnableLights);
232232

@@ -240,9 +240,9 @@ public void testRegisterHasChannelEnableLights() {
240240
public void testRegisterHasChannelEnableVibration() {
241241
final boolean channelEnableVibration = true;
242242

243-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
244-
when(mConfig.getString("hubName")).thenReturn("hubName");
245-
when(mConfig.getString("senderID")).thenReturn("senderID");
243+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
244+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(KEY_REGISTRATION_HUBNAME);
245+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(KEY_REGISTRATION_SENDERID);
246246
when(mConfig.hasKey("channelEnableVibration")).thenReturn(true);
247247
when(mConfig.getBoolean("channelEnableVibration")).thenReturn(channelEnableVibration);
248248

@@ -254,17 +254,17 @@ public void testRegisterHasChannelEnableVibration() {
254254

255255
@Test
256256
public void testRegisterSuccessfully() {
257-
final String connectionString = "connectionString";
258-
final String hubName = "hubName";
259-
final String senderID = "senderID";
260-
final String[] tags = {"tags"};
261-
262-
when(mConfig.getString("connectionString")).thenReturn(connectionString);
263-
when(mConfig.getString("hubName")).thenReturn(hubName);
264-
when(mConfig.getString("senderID")).thenReturn(senderID);
265-
when(mConfig.hasKey("tags")).thenReturn(true);
266-
when(mConfig.isNull("tags")).thenReturn(false);
267-
when(mConfig.getArray("tags")).thenReturn(mTags);
257+
final String connectionString = "Connection String";
258+
final String hubName = "Hub Name";
259+
final String senderID = "Sender ID";
260+
final String[] tags = { "Tag" };
261+
262+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(connectionString);
263+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(hubName);
264+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(senderID);
265+
when(mConfig.hasKey(KEY_REGISTRATION_TAGS)).thenReturn(true);
266+
when(mConfig.isNull(KEY_REGISTRATION_TAGS)).thenReturn(false);
267+
when(mConfig.getArray(KEY_REGISTRATION_TAGS)).thenReturn(mTags);
268268
when(mTags.size()).thenReturn(1);
269269
when(mTags.getString(0)).thenReturn(tags[0]);
270270
when(mGoogleApiAvailability.isGooglePlayServicesAvailable(any())).thenReturn(
@@ -288,14 +288,14 @@ public void testRegisterSuccessfully() {
288288

289289
@Test
290290
public void testRegisterFailed() {
291-
final String[] tags = {"tags"};
292-
293-
when(mConfig.getString("connectionString")).thenReturn("connectionString");
294-
when(mConfig.getString("hubName")).thenReturn("hubName");
295-
when(mConfig.getString("senderID")).thenReturn("senderID");
296-
when(mConfig.hasKey("tags")).thenReturn(true);
297-
when(mConfig.isNull("tags")).thenReturn(false);
298-
when(mConfig.getArray("tags")).thenReturn(mTags);
291+
final String[] tags = { "Tag" };
292+
293+
when(mConfig.getString(KEY_REGISTRATION_CONNECTIONSTRING)).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
294+
when(mConfig.getString(KEY_REGISTRATION_HUBNAME)).thenReturn(KEY_REGISTRATION_HUBNAME);
295+
when(mConfig.getString(KEY_REGISTRATION_SENDERID)).thenReturn(KEY_REGISTRATION_SENDERID);
296+
when(mConfig.hasKey(KEY_REGISTRATION_TAGS)).thenReturn(true);
297+
when(mConfig.isNull(KEY_REGISTRATION_TAGS)).thenReturn(false);
298+
when(mConfig.getArray(KEY_REGISTRATION_TAGS)).thenReturn(mTags);
299299
when(mTags.size()).thenReturn(1);
300300
when(mTags.getString(0)).thenReturn(tags[0]);
301301
when(mGoogleApiAvailability.isGooglePlayServicesAvailable(any())).thenReturn(
@@ -311,8 +311,8 @@ public void testRegisterFailed() {
311311

312312
@Test
313313
public void testUnregisterSuccessfully() throws Exception {
314-
when(mNotificationHubUtil.getConnectionString(any(ReactContext.class))).thenReturn("connectionString");
315-
when(mNotificationHubUtil.getHubName(any(ReactContext.class))).thenReturn("hubName");
314+
when(mNotificationHubUtil.getConnectionString(any(ReactContext.class))).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
315+
when(mNotificationHubUtil.getHubName(any(ReactContext.class))).thenReturn(KEY_REGISTRATION_HUBNAME);
316316
when(mNotificationHubUtil.getRegistrationID(any(ReactContext.class))).thenReturn("registrationId");
317317
when(ReactNativeUtil.createNotificationHub(
318318
anyString(), anyString(), any(ReactContext.class))).thenReturn(mNotificationHub);
@@ -327,8 +327,8 @@ public void testUnregisterSuccessfully() throws Exception {
327327

328328
@Test
329329
public void testUnregisterNoRegistration() throws Exception {
330-
when(mNotificationHubUtil.getConnectionString(any(ReactContext.class))).thenReturn("connectionString");
331-
when(mNotificationHubUtil.getHubName(any(ReactContext.class))).thenReturn("hubName");
330+
when(mNotificationHubUtil.getConnectionString(any(ReactContext.class))).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
331+
when(mNotificationHubUtil.getHubName(any(ReactContext.class))).thenReturn(KEY_REGISTRATION_HUBNAME);
332332
when(mNotificationHubUtil.getRegistrationID(any(ReactContext.class))).thenReturn(null);
333333
when(ReactNativeUtil.createNotificationHub(
334334
anyString(), anyString(), any(ReactContext.class))).thenReturn(mNotificationHub);
@@ -344,8 +344,8 @@ public void testUnregisterNoRegistration() throws Exception {
344344
public void testUnregisterThrowException() throws Exception {
345345
final Exception unhandledException = new Exception("Unhandled exception");
346346

347-
when(mNotificationHubUtil.getConnectionString(any(ReactContext.class))).thenReturn("connectionString");
348-
when(mNotificationHubUtil.getHubName(any(ReactContext.class))).thenReturn("hubName");
347+
when(mNotificationHubUtil.getConnectionString(any(ReactContext.class))).thenReturn(KEY_REGISTRATION_CONNECTIONSTRING);
348+
when(mNotificationHubUtil.getHubName(any(ReactContext.class))).thenReturn(KEY_REGISTRATION_HUBNAME);
349349
when(mNotificationHubUtil.getRegistrationID(any(ReactContext.class))).thenReturn("registrationId");
350350
when(ReactNativeUtil.createNotificationHub(
351351
anyString(), anyString(), any(ReactContext.class))).thenReturn(mNotificationHub);
@@ -398,4 +398,4 @@ public void testOnNewIntent() {
398398
PowerMockito.verifyStatic(ReactNativeNotificationsHandler.class);
399399
ReactNativeNotificationsHandler.sendBroadcast(eq(mReactApplicationContext), eq(bundle), anyLong());
400400
}
401-
}
401+
}

0 commit comments

Comments
 (0)