@@ -195,27 +195,31 @@ static void test_nr_lib_aws_sdk_php_get_command_arg_value() {
195
195
}
196
196
197
197
static inline void test_message_param_queueurl_settings_expect_val (
198
- nr_segment_message_params_t message_params ,
199
- nr_segment_cloud_attrs_t cloud_attrs ,
198
+ nr_segment_message_params_t * message_params ,
199
+ nr_segment_cloud_attrs_t * cloud_attrs ,
200
200
char * cloud_region ,
201
201
char * cloud_account_id ,
202
202
char * destination_name ) {
203
- tlib_pass_if_str_equal ("cloud_region should match." , cloud_attrs . cloud_region ,
203
+ tlib_pass_if_str_equal ("cloud_region should match." , cloud_attrs -> cloud_region ,
204
204
cloud_region );
205
205
tlib_pass_if_str_equal ("cloud_account_id should match." ,
206
- cloud_attrs . cloud_account_id , cloud_account_id );
206
+ cloud_attrs -> cloud_account_id , cloud_account_id );
207
207
tlib_pass_if_str_equal ("destination_name should match." ,
208
- message_params . destination_name , destination_name );
208
+ message_params -> destination_name , destination_name );
209
209
}
210
210
211
211
static inline void test_message_param_queueurl_settings_expect_null (
212
- nr_segment_message_params_t message_params ,
213
- nr_segment_cloud_attrs_t cloud_attrs ) {
214
- tlib_pass_if_null ("cloud_region should be null." , cloud_attrs .cloud_region );
215
- tlib_pass_if_null ("cloud_account_id should be null." ,
216
- cloud_attrs .cloud_account_id );
217
- tlib_pass_if_null ("destination_name should be null." ,
218
- message_params .destination_name );
212
+ nr_segment_message_params_t * message_params ,
213
+ nr_segment_cloud_attrs_t * cloud_attrs ) {
214
+ if (NULL != cloud_attrs ) {
215
+ tlib_pass_if_null ("cloud_region should be null." , cloud_attrs -> cloud_region );
216
+ tlib_pass_if_null ("cloud_account_id should be null." ,
217
+ cloud_attrs -> cloud_account_id );
218
+ }
219
+ if (NULL != message_params ) {
220
+ tlib_pass_if_null ("destination_name should be null." ,
221
+ message_params -> destination_name );
222
+ }
219
223
}
220
224
221
225
static void test_nr_lib_aws_sdk_php_sqs_parse_queueurl () {
@@ -243,56 +247,65 @@ static void test_nr_lib_aws_sdk_php_sqs_parse_queueurl() {
243
247
244
248
/* Test null queueurl. Extracted message_param values should be null.*/
245
249
nr_lib_aws_sdk_php_sqs_parse_queueurl (NULL , & message_params , & cloud_attrs );
246
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
250
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
251
+
252
+ /* Test null message_params. No values extracted, all values should be
253
+ * null.*/
254
+ nr_lib_aws_sdk_php_sqs_parse_queueurl (NULL , NULL , & cloud_attrs );
255
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
256
+
257
+ /* Test null cloud_attrs. No values extracted, all values should be null.*/
258
+ nr_lib_aws_sdk_php_sqs_parse_queueurl (NULL , & message_params , NULL );
259
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
247
260
248
261
/* Test Invalid values. Extracted message_param values should be null.*/
249
262
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_1 );
250
263
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
251
264
& cloud_attrs );
252
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
265
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
253
266
254
267
/* Test Invalid values. Extracted message_param values should be null.*/
255
268
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_2 );
256
269
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
257
270
& cloud_attrs );
258
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
271
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
259
272
260
273
/* Test Invalid values. Extracted message_param values should be null.*/
261
274
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_3 );
262
275
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
263
276
& cloud_attrs );
264
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
277
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
265
278
266
279
/* Test Invalid values. Extracted message_param values should be null.*/
267
280
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_4 );
268
281
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
269
282
& cloud_attrs );
270
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
283
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
271
284
272
285
/* Test Invalid values. Extracted message_param values should be null.*/
273
286
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_5 );
274
287
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
275
288
& cloud_attrs );
276
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
289
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
277
290
278
291
/* Test Invalid values. Extracted message_param values should be null.*/
279
292
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_6 );
280
293
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
281
294
& cloud_attrs );
282
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
295
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
283
296
284
297
/* Test Invalid values. Extracted message_param values should be null.*/
285
298
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_7 );
286
299
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
287
300
& cloud_attrs );
288
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
301
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
289
302
290
303
/* Test Invalid values. Extracted message_param values should be null.*/
291
304
292
305
nr_strcpy (modifiable_string , INVALID_QUEUE_URL_8 );
293
306
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
294
307
& cloud_attrs );
295
- test_message_param_queueurl_settings_expect_null (message_params , cloud_attrs );
308
+ test_message_param_queueurl_settings_expect_null (& message_params , & cloud_attrs );
296
309
297
310
/*
298
311
* Test 'https://sqs.us-east-2.amazonaws.com/123456789012/SQS_QUEUE_NAME'.
@@ -302,7 +315,7 @@ static void test_nr_lib_aws_sdk_php_sqs_parse_queueurl() {
302
315
nr_strcpy (modifiable_string , VALID_QUEUE_URL );
303
316
nr_lib_aws_sdk_php_sqs_parse_queueurl (modifiable_string , & message_params ,
304
317
& cloud_attrs );
305
- test_message_param_queueurl_settings_expect_val (message_params , cloud_attrs ,
318
+ test_message_param_queueurl_settings_expect_val (& message_params , & cloud_attrs ,
306
319
"us-east-2" , "123456789012" ,
307
320
"SQS_QUEUE_NAME" );
308
321
0 commit comments