osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 1
Code Issues Releases Wiki Activity

ctrl_test.c: replace print_escaped() with new osmo_escape_str() 

Change-Id: I12d3828dcc925f97fde11c360f1d60f3bd8cad8b
This commit is contained in:
Neels Hofmeyr 2017-12-16 01:03:37 +01:00 committed by Harald Welte
parent 9910bbc62d
commit 0ab6eca80a
2 changed files with 28 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/ctrl/ctrl_test.c
View File

@ -37,45 +37,15 @@ struct msgb *msgb_from_string(const char *str)
static void *ctx = NULL;
void print_escaped(const char *str)
{
if (!str) {
printf("NULL");
return;
}
printf("'");
for (;*str; str++) {
switch (*str) {
case '\n':
printf("\\n");
break;
case '\r':
printf("\\r");
break;
case '\t':
printf("\\t");
break;
default:
printf("%c", *str);
break;
}
}
printf("'");
}
void assert_same_str(const char *label, const char *expect, const char *got)
{
if ((expect == got) || (expect && got && (strcmp(expect, got) == 0))) {
printf("%s = ", label);
print_escaped(got);
printf("\n");
printf("%s = '%s'\n", label, osmo_escape_str(got, -1));
return;
}
printf("MISMATCH for '%s':\ngot: ", label); print_escaped(got);
printf("\nexpected: "); print_escaped(expect);
printf("\n");
printf("MISMATCH for '%s':\ngot: %s\n", label, osmo_escape_str(got, -1));
printf("expected: %s\n", osmo_escape_str(expect, -1));
OSMO_ASSERT(expect == got);
}
@ -84,9 +54,7 @@ static void assert_parsing(const char *str, const struct ctrl_cmd *expect)
struct ctrl_cmd *cmd;
struct msgb *msg = msgb_from_string(str);
printf("test parsing: ");
print_escaped(str);
printf("\n");
printf("test parsing: '%s'\n", osmo_escape_str(str, -1));
cmd = ctrl_cmd_parse(ctx, msg);
OSMO_ASSERT(cmd);

48
tests/ctrl/ctrl_test.ok
View File

@ -10,102 +10,102 @@ ctrl type 64 is unknown 0x40 [PARSE FAILED]
test parsing: 'GET 1 variable'
id = '1'
variable = 'variable'
value = NULL
reply = NULL
value = '(null)'
reply = '(null)'
ok
test parsing: 'GET 1 variable\n'
id = '1'
variable = 'variable\n'
value = NULL
reply = NULL
value = '(null)'
reply = '(null)'
ok
test parsing: 'GET 1 var\ni\nable'
id = '1'
variable = 'var\ni\nable'
value = NULL
reply = NULL
value = '(null)'
reply = '(null)'
ok
test parsing: 'GET 1 variable value'
id = '1'
variable = 'variable'
value = NULL
reply = NULL
value = '(null)'
reply = '(null)'
ok
test parsing: 'GET 1 variable value\n'
id = '1'
variable = 'variable'
value = NULL
reply = NULL
value = '(null)'
reply = '(null)'
ok
test parsing: 'GET 1 variable multiple value tokens'
id = '1'
variable = 'variable'
value = NULL
reply = NULL
value = '(null)'
reply = '(null)'
ok
test parsing: 'GET 1 variable multiple value tokens\n'
id = '1'
variable = 'variable'
value = NULL
reply = NULL
value = '(null)'
reply = '(null)'
ok
test parsing: 'SET 1 variable value'
id = '1'
variable = 'variable'
value = 'value'
reply = NULL
reply = '(null)'
ok
test parsing: 'SET 1 variable value\n'
id = '1'
variable = 'variable'
value = 'value'
reply = NULL
reply = '(null)'
ok
test parsing: 'SET weird_id variable value'
id = 'weird_id'
variable = 'variable'
value = 'value'
reply = NULL
reply = '(null)'
ok
test parsing: 'SET weird_id variable value\n'
id = 'weird_id'
variable = 'variable'
value = 'value'
reply = NULL
reply = '(null)'
ok
test parsing: 'SET 1 variable multiple value tokens'
id = '1'
variable = 'variable'
value = 'multiple value tokens'
reply = NULL
reply = '(null)'
ok
test parsing: 'SET 1 variable multiple value tokens\n'
id = '1'
variable = 'variable'
value = 'multiple value tokens'
reply = NULL
reply = '(null)'
ok
test parsing: 'SET 1 variable value_with_trailing_spaces '
id = '1'
variable = 'variable'
value = 'value_with_trailing_spaces '
reply = NULL
reply = '(null)'
ok
test parsing: 'SET 1 variable value_with_trailing_spaces \n'
id = '1'
variable = 'variable'
value = 'value_with_trailing_spaces '
reply = NULL
reply = '(null)'
ok
test parsing: 'SET \n special_char_id value'
id = '\n'
variable = 'special_char_id'
value = 'value'
reply = NULL
reply = '(null)'
ok
test parsing: 'SET \t special_char_id value'
id = '\t'
variable = 'special_char_id'
value = 'value'
reply = NULL
reply = '(null)'
ok