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

Make sure unit tests compile

Browse Source 
This fixes the unit tests that were broken by r403069 and several
functions requiring a new parameter for sanitization of JSON messages
generated from object snapshots.
........

Merged revisions 403094 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403095 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-11-22 23:57:45 +00:00
parent 76a2b855e1
commit 2c90d80b8f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_stasis.c
View File

@@ -41,7 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
static const char *test_category = "/stasis/core/"; static const char *test_category = "/stasis/core/";
static struct ast_json *fake_json(struct stasis_message *message) static struct ast_json *fake_json(struct stasis_message *message, const struct stasis_message_sanitizer *sanitize)
{ {
const char *text = stasis_message_data(message); const char *text = stasis_message_data(message);
@@ -1100,7 +1100,7 @@ AST_TEST_DEFINE(no_to_json)
} }
/* Test NULL */ /* Test NULL */
actual = stasis_message_to_json(NULL); actual = stasis_message_to_json(NULL, NULL);
ast_test_validate(test, NULL == actual); ast_test_validate(test, NULL == actual);
/* Test message with NULL to_json function */ /* Test message with NULL to_json function */
@@ -1111,7 +1111,7 @@ AST_TEST_DEFINE(no_to_json)
uut = stasis_message_create(type, data); uut = stasis_message_create(type, data);
ast_test_validate(test, NULL != uut); ast_test_validate(test, NULL != uut);
actual = stasis_message_to_json(uut); actual = stasis_message_to_json(uut, NULL);
ast_test_validate(test, NULL == actual); ast_test_validate(test, NULL == actual);
return AST_TEST_PASS; return AST_TEST_PASS;
@@ -1145,7 +1145,7 @@ AST_TEST_DEFINE(to_json)
ast_test_validate(test, NULL != uut); ast_test_validate(test, NULL != uut);
expected = ast_json_string_create(expected_text); expected = ast_json_string_create(expected_text);
actual = stasis_message_to_json(uut); actual = stasis_message_to_json(uut, NULL);
ast_test_validate(test, ast_json_equal(expected, actual)); ast_test_validate(test, ast_json_equal(expected, actual));
return AST_TEST_PASS; return AST_TEST_PASS;

4
tests/test_stasis_channels.c
View File

@@ -248,14 +248,14 @@ AST_TEST_DEFINE(channel_snapshot_json)
break; break;
} }
ast_test_validate(test, NULL == ast_channel_snapshot_to_json(NULL)); ast_test_validate(test, NULL == ast_channel_snapshot_to_json(NULL, NULL));
chan = ast_channel_alloc(0, AST_STATE_DOWN, "cid_num", "cid_name", "acctcode", "exten", "context", NULL, 0, "TEST/name"); chan = ast_channel_alloc(0, AST_STATE_DOWN, "cid_num", "cid_name", "acctcode", "exten", "context", NULL, 0, "TEST/name");
ast_test_validate(test, NULL != chan); ast_test_validate(test, NULL != chan);
snapshot = ast_channel_snapshot_create(chan); snapshot = ast_channel_snapshot_create(chan);
ast_test_validate(test, NULL != snapshot); ast_test_validate(test, NULL != snapshot);
actual = ast_channel_snapshot_to_json(snapshot); actual = ast_channel_snapshot_to_json(snapshot, NULL);
expected = ast_json_pack("{ s: s, s: s, s: s, s: s," expected = ast_json_pack("{ s: s, s: s, s: s, s: s,"
" s: { s: s, s: s, s: i }," " s: { s: s, s: s, s: i },"
" s: { s: s, s: s }," " s: { s: s, s: s },"