[svn-commits] kmoore: branch kmoore/peer-field-restoration r398740 - /team/kmoore/peer-fiel...

[SVN commits to the Digium repositories]

Author: kmoore
Date: Tue Sep 10 07:49:20 2013
New Revision: 398740

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398740
Log:
Fix attended transfer swap test

Modified:
    team/kmoore/peer-field-restoration/tests/test_cel.c

Modified: team/kmoore/peer-field-restoration/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/peer-field-restoration/tests/test_cel.c?view=diff&rev=398740&r1=398739&r2=398740
==============================================================================
--- team/kmoore/peer-field-restoration/tests/test_cel.c (original)
+++ team/kmoore/peer-field-restoration/tests/test_cel.c Tue Sep 10 07:49:20 2013
@@ -152,15 +152,19 @@
 	} while (0)
 
 #define BRIDGE_ENTER_EVENT(channel, bridge) do { \
-	RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref); \
 	RAII_VAR(struct ast_str *, peer_str, NULL, ast_free); \
 	stasis_topic_wait(ast_channel_topic_all()); \
 	stasis_topic_wait(ast_bridge_topic_all()); \
 	peer_str = test_cel_generate_peer_str(channel, bridge); \
 	ast_test_validate(test, peer_str != NULL); \
+	BRIDGE_ENTER_EVENT_PEER(channel, bridge, ast_str_buffer(peer_str)); \
+	} while (0)
+
+#define BRIDGE_ENTER_EVENT_PEER(channel, bridge, peer) do { \
+	RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref); \
 	extra = ast_json_pack("{s: s}", "bridge_id", bridge->uniqueid); \
 	ast_test_validate(test, extra != NULL); \
-	APPEND_EVENT_PEER(channel, AST_CEL_BRIDGE_ENTER, NULL, extra, ast_str_buffer(peer_str)); \
+	APPEND_EVENT_PEER(channel, AST_CEL_BRIDGE_ENTER, NULL, extra, peer); \
 	} while (0)
 
 #define BLINDTRANSFER_EVENT(channel, bridge, extension, context) do { \
@@ -1272,7 +1276,7 @@
 	/* Perform attended transfer */
 	ast_bridge_transfer_attended(chan_alice, chan_david);
 	do_sleep();
-	BRIDGE_ENTER_EVENT(chan_bob, bridge2);
+	BRIDGE_ENTER_EVENT_PEER(chan_bob, bridge2, "CELTestChannel/David,CELTestChannel/Charlie");
 
 	BRIDGE_EXIT_EVENT(chan_david, bridge2);
 	ATTENDEDTRANSFER_BRIDGE(chan_alice, bridge1, chan_david, bridge2);