From c599aca553a57335267406b93c856e53c5e14db4 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Mon, 15 Apr 2013 16:43:47 +0000 Subject: Moved core logic from app_stasis to res_stasis After some discussion on asterisk-dev, it was decided that the bulk of the logic in app_stasis actually belongs in a resource module instead of the application module. This patch does that, leaves the app specific stuff in app_stasis, and fixes up everything else to be consistent with that change. * Renamed test_app_stasis to test_res_stasis * Renamed app_stasis.h to stasis_app.h * This is still stasis application support, even though it's no longer in an app_ module. The name should never have been tied to the type of module, anyways. * Now that json isn't a resource module anymore, moved the ast_channel_snapshot_to_json function to main/stasis_channels.c, where it makes more sense. Review: https://reviewboard.asterisk.org/r/2430/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@385742 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- tests/test_json.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/test_json.c') diff --git a/tests/test_json.c b/tests/test_json.c index 9b4be5beb..e87003f74 100644 --- a/tests/test_json.c +++ b/tests/test_json.c @@ -1659,12 +1659,11 @@ AST_TEST_DEFINE(json_test_timeval) break; } - ast_test_validate(test, NULL == ast_json_timeval(NULL, NULL)); expected = ast_json_string_create("2013-02-07T09:32:34.314-0600"); tv.tv_sec = 1360251154; tv.tv_usec = 314159; - uut = ast_json_timeval(&tv, "America/Chicago"); + uut = ast_json_timeval(tv, "America/Chicago"); ast_test_validate(test, ast_json_equal(expected, uut)); -- cgit v1.2.3