aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-26 15:35:40 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-26 15:35:40 +0000
commit3cd7f1195a04dbcf14ad78d6c772cd82ea605f1b (patch)
tree60373f3d6449bfb74293be0c22ece99225f6c992
parent9a588f019333e3245dcecaffbea3283bc178ba00 (diff)
Update test_substitution to show failures in the test log.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@243157 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--tests/test_substitution.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/tests/test_substitution.c b/tests/test_substitution.c
index 7525a7837..5dd4e0a24 100644
--- a/tests/test_substitution.c
+++ b/tests/test_substitution.c
@@ -58,6 +58,9 @@ static enum ast_test_result_state test_chan_integer(void *status, struct ast_str
pbx_substitute_variables_helper(c, expression, workspace, sizeof(workspace));
if (sscanf(workspace, "%d", &value1) != 1 || value1 != i || sscanf(ast_str_buffer(str), "%d", &value2) != 1 || value2 != i) {
ast_test_status_update(status, "%s != %s and/or %d != %d != %d\n", ast_str_buffer(str), workspace, value1, value2, i);
+ ast_str_set(err, 0, "%s: '%s' != '%s' and/or %d != %d != %d\n",
+ __PRETTY_FUNCTION__, ast_str_buffer(str),
+ workspace, value1, value2, i);
okay = 0;
}
}
@@ -83,6 +86,8 @@ static enum ast_test_result_state test_chan_string(void *status, struct ast_str
ast_test_status_update(status, "Testing '%s' . . . . . %s\n", expression, okay ? "passed" : "FAILED");
if (strcmp(cfield, ast_str_buffer(str)) != 0 || strcmp(cfield, workspace) != 0) {
ast_test_status_update(status, "%s != %s != %s\n", cfield, ast_str_buffer(str), workspace);
+ ast_str_set(err, 0, "%s: '%s' != '%s' != '%s'\n",
+ __PRETTY_FUNCTION__, cfield, ast_str_buffer(str), workspace);
okay = 0;
}
}
@@ -109,6 +114,8 @@ static enum ast_test_result_state test_chan_variable(void *status, struct ast_st
ast_test_status_update(status, "Testing '%s' . . . . . %s\n", ast_str_buffer(var), okay ? "passed" : "FAILED");
if (strcmp(values[i], ast_str_buffer(str)) != 0 || strcmp(values[i], workspace) != 0) {
ast_test_status_update(status, "%s != %s != %s\n", values[i], ast_str_buffer(str), workspace);
+ ast_str_set(err, 0, "%s: '%s' != '%s' != '%s'\n",
+ __PRETTY_FUNCTION__, values[i], ast_str_buffer(str), workspace);
okay = 0;
}
}
@@ -132,6 +139,8 @@ static enum ast_test_result_state test_chan_function(void *status, struct ast_st
if (strcmp(workspace, ast_str_buffer(str)) != 0) {
ast_test_status_update(status, "test_chan_function, expr: '%s' ... %s != %s\n",
expression, ast_str_buffer(str), workspace);
+ ast_str_set(err, 0, "%s: expr: '%s' ... '%s' != '%s'\n",
+ __PRETTY_FUNCTION__, expression, ast_str_buffer(str), workspace);
okay = 0;
}
@@ -154,12 +163,14 @@ static enum ast_test_result_state test_2way_function(void *status, struct ast_st
okay = !strcmp(ast_str_buffer(str), "foobarbaz");
- ast_test_status_update(status, "Testing '%s%s' and '%s%s' . . . . . %s\n",
- encode1, encode2, decode1, decode2,
+ ast_test_status_update(status, "Testing '%s%s' and '%s%s' . . . . . %s\n",
+ encode1, encode2, decode1, decode2,
okay ? "passed" : "FAILED");
if (!okay) {
ast_test_status_update(status, " '%s' != 'foobarbaz'\n", ast_str_buffer(str));
+ ast_str_set(err, 0, "%s: '%s' != 'foobarbaz'\n",
+ __PRETTY_FUNCTION__, ast_str_buffer(str));
}
ast_free(str);
@@ -183,6 +194,8 @@ static enum ast_test_result_state test_expected_result(void *status, struct ast_
if (!okay) {
ast_test_status_update(status, "test_expected_result: '%s' != '%s'\n",
ast_str_buffer(str), result);
+ ast_str_set(err, 0, "%s: '%s' != '%s'\n", __PRETTY_FUNCTION__,
+ ast_str_buffer(str), result);
}
ast_free(str);