aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-12-16 01:03:37 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2017-12-17 23:08:02 +0100
commitd8ad45804a605d9c0f22725aecf9a38450a35e31 (patch)
treee3bd6db14a0173c680b4ca6754ed01548e892450
parent5674c182b620bd7cb2c5a175382f8e72cecea1cf (diff)
ctrl_test.c: replace print_escaped() with new osmo_escape_str()
-rw-r--r--tests/ctrl/ctrl_test.c40
-rw-r--r--tests/ctrl/ctrl_test.ok48
2 files changed, 28 insertions, 60 deletions
diff --git a/tests/ctrl/ctrl_test.c b/tests/ctrl/ctrl_test.c
index b8425c7..2bc3128 100644
--- a/tests/ctrl/ctrl_test.c
+++ b/tests/ctrl/ctrl_test.c
@@ -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);
diff --git a/tests/ctrl/ctrl_test.ok b/tests/ctrl/ctrl_test.ok
index 9c8877b..5775eb2 100644
--- a/tests/ctrl/ctrl_test.ok
+++ b/tests/ctrl/ctrl_test.ok
@@ -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