kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

strings/json: Add string delimter match, and object create with vars methods

Browse Source 
Add a function to check if there is an exact match a one string between
delimiters in another string.

Add a function that will create an ast_json object out of a list of
Asterisk variables. An excludes string can also optionally be passed
in.

Also, add a macro to make it easier to get object integers.

Change-Id: I5f34f18e102126aef3997f19a553a266d70d6226
This commit is contained in:
Kevin Harwell
2021-10-21 12:29:11 -05:00
committed by George Joseph
parent 669e16b3dc
commit d112916e98
6 changed files with 250 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
tests/test_json.c
View File

@@ -37,6 +37,7 @@
#include "asterisk.h"
#include "asterisk/config.h"
#include "asterisk/json.h"
#include "asterisk/module.h"
#include "asterisk/test.h"
@@ -1090,6 +1091,63 @@ AST_TEST_DEFINE(json_test_object_iter_null)
return AST_TEST_PASS;
}
AST_TEST_DEFINE(json_test_object_create_vars)
{
RAII_VAR(struct ast_json *, uut, NULL, ast_json_unref);
RAII_VAR(struct ast_variable *, vars, NULL, ast_variables_destroy);
const char *value;
struct ast_variable *new_var;
switch (cmd) {
case TEST_INIT:
info->name = "object_create_vars";
info->category = CATEGORY;
info->summary = "Testing JSON object creation initialized using Asterisk variables.";
info->description = "Test JSON abstraction library.";
return AST_TEST_NOT_RUN;
case TEST_EXECUTE:
break;
}
/* NULL case */
ast_test_validate(test, (uut = ast_json_object_create_vars(NULL, NULL)));
ast_test_validate(test, !(value = ast_json_object_string_get(uut, "foo")));
ast_test_validate(test, (new_var = ast_variable_new("foo", "bar", "")));
ast_variable_list_append(&vars, new_var);
ast_test_validate(test, (new_var = ast_variable_new("bar", "baz", "")));
ast_variable_list_append(&vars, new_var);
/* Variables case */
ast_json_unref(uut);
ast_test_validate(test, (uut = ast_json_object_create_vars(vars, NULL)));
ast_test_validate(test, (value = ast_json_object_string_get(uut, "foo")));
ast_test_validate(test, !strcmp("bar", value));
ast_test_validate(test, (value = ast_json_object_string_get(uut, "bar")));
ast_test_validate(test, !strcmp("baz", value));
/* Variables with excludes case */
ast_json_unref(uut);
ast_test_validate(test, (uut = ast_json_object_create_vars(vars, "foo")));
ast_test_validate(test, !(value = ast_json_object_string_get(uut, "foo")));
ast_test_validate(test, (value = ast_json_object_string_get(uut, "bar")));
ast_test_validate(test, !strcmp("baz", value));
ast_json_unref(uut);
ast_test_validate(test, (uut = ast_json_object_create_vars(vars, "foo2")));
ast_test_validate(test, (value = ast_json_object_string_get(uut, "foo")));
ast_test_validate(test, (value = ast_json_object_string_get(uut, "bar")));
ast_test_validate(test, !strcmp("baz", value));
ast_json_unref(uut);
ast_test_validate(test, (uut = ast_json_object_create_vars(vars, "foobar,baz")));
ast_test_validate(test, (value = ast_json_object_string_get(uut, "foo")));
ast_test_validate(test, (value = ast_json_object_string_get(uut, "bar")));
ast_test_validate(test, !strcmp("baz", value));
return AST_TEST_PASS;
}
AST_TEST_DEFINE(json_test_dump_load_string)
{
RAII_VAR(struct ast_json *, uut, NULL, ast_json_unref);
@@ -1738,6 +1796,7 @@ static int unload_module(void)
AST_TEST_UNREGISTER(json_test_object_null);
AST_TEST_UNREGISTER(json_test_object_iter);
AST_TEST_UNREGISTER(json_test_object_iter_null);
AST_TEST_UNREGISTER(json_test_object_create_vars);
AST_TEST_UNREGISTER(json_test_dump_load_string);
AST_TEST_UNREGISTER(json_test_dump_load_str);
AST_TEST_UNREGISTER(json_test_dump_str_fail);
@@ -1794,6 +1853,7 @@ static int load_module(void)
AST_TEST_REGISTER(json_test_object_null);
AST_TEST_REGISTER(json_test_object_iter);
AST_TEST_REGISTER(json_test_object_iter_null);
AST_TEST_REGISTER(json_test_object_create_vars);
AST_TEST_REGISTER(json_test_dump_load_string);
AST_TEST_REGISTER(json_test_dump_load_str);
AST_TEST_REGISTER(json_test_dump_str_fail);