diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2016-10-12 16:20:00 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2016-10-13 18:12:16 -0500 |
| commit | beae5022bfcfa52ee43f6adc1a5a0b35bd63ef7c (patch) | |
| tree | b2db0ceaf220342098652cdf00b6c5ff3a01b41e /tests | |
| parent | 2433a9d0c02ad01916fbdf02a2a54f297fd2ad8c (diff) | |
json: Check party id name, number, subaddresses for UTF-8.
* Updated unit test as ast_json_name_number() is now NULL tolerant.
ASTERISK-26466 #close
Reported by: Richard Mudgett
Change-Id: I7d4e14194f8f81f24a1dc34d1b8602c0950265a6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_json.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/tests/test_json.c b/tests/test_json.c index 915578128..7362a6127 100644 --- a/tests/test_json.c +++ b/tests/test_json.c @@ -1598,11 +1598,26 @@ AST_TEST_DEFINE(json_test_clever_circle) return AST_TEST_PASS; } -AST_TEST_DEFINE(json_test_name_number) +static int test_name_number(const char *name, const char *number) { - RAII_VAR(struct ast_json *, uut, NULL, ast_json_unref); - RAII_VAR(struct ast_json *, expected, NULL, ast_json_unref); + int res; + struct ast_json *uut; + struct ast_json *expected; + + expected = ast_json_pack("{s: s, s: s}", + "name", name ?: "", + "number", number ?: ""); + uut = ast_json_name_number(name, number); + + res = ast_json_equal(expected, uut); + ast_json_unref(expected); + ast_json_unref(uut); + return res; +} + +AST_TEST_DEFINE(json_test_name_number) +{ switch (cmd) { case TEST_INIT: info->name = "name_number"; @@ -1614,15 +1629,10 @@ AST_TEST_DEFINE(json_test_name_number) break; } - ast_test_validate(test, NULL == ast_json_name_number("name", NULL)); - ast_test_validate(test, NULL == ast_json_name_number(NULL, "1234")); - ast_test_validate(test, NULL == ast_json_name_number(NULL, NULL)); - - expected = ast_json_pack("{s: s, s: s}", - "name", "Jenny", - "number", "867-5309"); - uut = ast_json_name_number("Jenny", "867-5309"); - ast_test_validate(test, ast_json_equal(expected, uut)); + ast_test_validate(test, test_name_number("name", NULL)); + ast_test_validate(test, test_name_number(NULL, "1234")); + ast_test_validate(test, test_name_number(NULL, NULL)); + ast_test_validate(test, test_name_number("Jenny", "867-5309")); return AST_TEST_PASS; } |