diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-11-22 23:57:45 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-11-22 23:57:45 +0000 |
| commit | 2c90d80b8fbe2bb59471bee4eae22b22dd528be9 (patch) | |
| tree | 17cde45c0a143bad32d7da5e8909d890d527db40 /tests | |
| parent | 76a2b855e14bf7e165e9be7451c0c2fab0ef6622 (diff) | |
Make sure unit tests compile
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_stasis.c | 8 | ||||
| -rw-r--r-- | tests/test_stasis_channels.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/test_stasis.c b/tests/test_stasis.c index 1e911e092..9ee16843c 100644 --- a/tests/test_stasis.c +++ b/tests/test_stasis.c @@ -41,7 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") 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); @@ -1100,7 +1100,7 @@ AST_TEST_DEFINE(no_to_json) } /* Test NULL */ - actual = stasis_message_to_json(NULL); + actual = stasis_message_to_json(NULL, NULL); ast_test_validate(test, NULL == actual); /* Test message with NULL to_json function */ @@ -1111,7 +1111,7 @@ AST_TEST_DEFINE(no_to_json) uut = stasis_message_create(type, data); 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); return AST_TEST_PASS; @@ -1145,7 +1145,7 @@ AST_TEST_DEFINE(to_json) ast_test_validate(test, NULL != uut); 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)); return AST_TEST_PASS; diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c index a3f882819..45f1e2ba3 100644 --- a/tests/test_stasis_channels.c +++ b/tests/test_stasis_channels.c @@ -248,14 +248,14 @@ AST_TEST_DEFINE(channel_snapshot_json) 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"); ast_test_validate(test, NULL != chan); snapshot = ast_channel_snapshot_create(chan); 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," " s: { s: s, s: s, s: i }," " s: { s: s, s: s }," |