[asterisk-commits] dlee: branch dlee/stasis-http r384322 - in /team/dlee/stasis-http: ./ apps/ t...

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Mar 29 00:19:19 2013
New Revision: 384322

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384322
Log:
Fixed unit test and reference bug
........

Merged revisions 384321 from http://svn.asterisk.org/svn/asterisk/team/dlee/stasis-app

Modified:
    team/dlee/stasis-http/   (props changed)
    team/dlee/stasis-http/apps/app_stasis.c
    team/dlee/stasis-http/tests/test_app_stasis.c

Propchange: team/dlee/stasis-http/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 29 00:19:19 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-app:1-384318 /trunk:1-384219
+/team/dlee/stasis-app:1-384321 /trunk:1-384219

Modified: team/dlee/stasis-http/apps/app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/apps/app_stasis.c?view=diff&rev=384322&r1=384321&r2=384322
==============================================================================
--- team/dlee/stasis-http/apps/app_stasis.c (original)
+++ team/dlee/stasis-http/apps/app_stasis.c Fri Mar 29 00:19:19 2013
@@ -388,7 +388,7 @@
 		}
 	}
 
-	message = ast_json_pack("{s: o}", event_name, event);
+	message = ast_json_pack("{s: o}", event_name, ast_json_ref(event));
 
 	return ast_json_ref(message);
 }

Modified: team/dlee/stasis-http/tests/test_app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-http/tests/test_app_stasis.c?view=diff&rev=384322&r1=384321&r2=384322
==============================================================================
--- team/dlee/stasis-http/tests/test_app_stasis.c (original)
+++ team/dlee/stasis-http/tests/test_app_stasis.c Fri Mar 29 00:19:19 2013
@@ -153,7 +153,7 @@
 
 	stasis_app_register(app_name, test_handler, app_data1);
 	stasis_app_register(app_name, test_handler, app_data2);
-	expected_message1 = ast_json_pack("[{s: s}]", "event", "application-replaced");
+	expected_message1 = ast_json_pack("[{s: {}}]", "application-replaced");
 	message = ast_json_pack("{ s: o }", "test-message", ast_json_null());
 	expected_message2 = ast_json_pack("[o]", ast_json_ref(message));