Skip to content

Commit 0230262

Browse files
committed
fix(agent): Added tests for NULL parameters
Also required passing the expected values as NULLs.
1 parent b63f74f commit 0230262

File tree

1 file changed

+35
-22
lines changed

1 file changed

+35
-22
lines changed

agent/tests/test_lib_aws_sdk_php.c

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -195,27 +195,31 @@ static void test_nr_lib_aws_sdk_php_get_command_arg_value() {
195195
}
196196

197197
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,
200200
char* cloud_region,
201201
char* cloud_account_id,
202202
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,
204204
cloud_region);
205205
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);
207207
tlib_pass_if_str_equal("destination_name should match.",
208-
message_params.destination_name, destination_name);
208+
message_params->destination_name, destination_name);
209209
}
210210

211211
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+
}
219223
}
220224

221225
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() {
243247

244248
/* Test null queueurl. Extracted message_param values should be null.*/
245249
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);
247260

248261
/* Test Invalid values. Extracted message_param values should be null.*/
249262
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_1);
250263
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
251264
&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);
253266

254267
/* Test Invalid values. Extracted message_param values should be null.*/
255268
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_2);
256269
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
257270
&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);
259272

260273
/* Test Invalid values. Extracted message_param values should be null.*/
261274
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_3);
262275
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
263276
&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);
265278

266279
/* Test Invalid values. Extracted message_param values should be null.*/
267280
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_4);
268281
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
269282
&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);
271284

272285
/* Test Invalid values. Extracted message_param values should be null.*/
273286
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_5);
274287
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
275288
&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);
277290

278291
/* Test Invalid values. Extracted message_param values should be null.*/
279292
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_6);
280293
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
281294
&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);
283296

284297
/* Test Invalid values. Extracted message_param values should be null.*/
285298
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_7);
286299
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
287300
&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);
289302

290303
/* Test Invalid values. Extracted message_param values should be null.*/
291304

292305
nr_strcpy(modifiable_string, INVALID_QUEUE_URL_8);
293306
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
294307
&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);
296309

297310
/*
298311
* 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() {
302315
nr_strcpy(modifiable_string, VALID_QUEUE_URL);
303316
nr_lib_aws_sdk_php_sqs_parse_queueurl(modifiable_string, &message_params,
304317
&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,
306319
"us-east-2", "123456789012",
307320
"SQS_QUEUE_NAME");
308321

0 commit comments

Comments
 (0)