kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Remove calls to ast_cli_generator.

Browse Source 
The ability to add to localized storage cannot be supported by
ast_cli_generator.  The only calls to ast_cli_generator should be by
functions that need to proxy the CLI generator, for example 'cli check
permissions' or 'core show help'.

* ast_cli_generatornummatches now retrieves the vector of matches and
  reports the number of elements (not including 'best' match).
* test_substitution retrieves and iterates the vector.

Change-Id: I8cd6b93905363cf7a33a2d2b0e2a8f8446d9f248
This commit is contained in:
Corey Farrell
2017-11-09 01:39:13 -05:00
parent 3abf8dfeae
commit a02cbc2ef3
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/test_substitution.c
View File

@@ -43,6 +43,7 @@
#include "asterisk/stringfields.h"
#include "asterisk/threadstorage.h"
#include "asterisk/test.h"
#include "asterisk/vector.h"
static enum ast_test_result_state test_chan_integer(struct ast_test *test,
struct ast_channel *c, int *ifield, const char *expression)
@@ -225,6 +226,7 @@ AST_TEST_DEFINE(test_substitution)
struct ast_channel *c;
int i;
enum ast_test_result_state res = AST_TEST_PASS;
struct ast_vector_string *funcs;
switch (cmd) {
case TEST_INIT:
@@ -302,11 +304,12 @@ AST_TEST_DEFINE(test_substitution)
#undef TEST
/* For testing dialplan functions */
for (i = 0; ; i++) {
char *cmd = ast_cli_generator("core show function", "", i);
if (cmd == NULL) {
break;
}
funcs = ast_cli_completion_vector("core show function", "");
/* Skip "best match" element 0 */
for (i = 1; funcs && i < AST_VECTOR_SIZE(funcs); i++) {
char *cmd = AST_VECTOR_GET(funcs, i);
if (strcmp(cmd, "CHANNEL") && strcmp(cmd, "CALLERID") && strncmp(cmd, "CURL", 4) &&
strncmp(cmd, "AES", 3) && strncmp(cmd, "BASE64", 6) &&
strcmp(cmd, "CDR") && strcmp(cmd, "ENV") && strcmp(cmd, "GLOBAL") &&
@@ -321,10 +324,14 @@ AST_TEST_DEFINE(test_substitution)
}
}
}
ast_free(cmd);
}
if (funcs) {
AST_VECTOR_CALLBACK_VOID(funcs, ast_free);
AST_VECTOR_PTR_FREE(funcs);
}
ast_hangup(c);
return res;
}