[asterisk-commits] mjordan: trunk r398629 - in /trunk: ./ tests/test_cdr.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun Sep  8 18:30:39 2013
New Revision: 398629

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=398629
Log:
Update CDR Unit tests to reflect container changes in r398579

When a channel joins a multi-party bridge, the ordering of the CDRs that is
created is determined by the ordering of the channels who happen to be in that
bridge. When r398579 changed the number of buckets in the container to
something sensible, it changed the ordering that the CDRs was created in,
causing one of the multiparty tests to fail. This fixes the test with the
now expected ordering.
........

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

Modified:
    trunk/   (props changed)
    trunk/tests/test_cdr.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Sun Sep  8 18:30:39 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398198,398206,398215,398226,398237,398283,398286,398299,398303,398368,398381,398418,398458,398498,398511,398521,398533,398562,398572,398579-398580,398619
+/branches/12:1-398198,398206,398215,398226,398237,398283,398286,398299,398303,398368,398381,398418,398458,398498,398511,398521,398533,398562,398572,398579-398580,398619,398628

Modified: trunk/tests/test_cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_cdr.c?view=diff&rev=398629&r1=398628&r2=398629
==============================================================================
--- trunk/tests/test_cdr.c (original)
+++ trunk/tests/test_cdr.c Sun Sep  8 18:30:39 2013
@@ -1808,6 +1808,22 @@
 		.dst = "100",
 		.dcontext = "default",
 		.channel = CHANNEL_TECH_NAME "/Alice",
+		.dstchannel = CHANNEL_TECH_NAME "/Charlie",
+		.lastapp = "Dial",
+		.lastdata = CHANNEL_TECH_NAME "/Bob",
+		.amaflags = AST_AMA_DOCUMENTATION,
+		.billsec = 1,
+		.disposition = AST_CDR_ANSWERED,
+		.accountcode = "100",
+		.peeraccount = "300",
+		.next = &charlie_expected_one,
+	};
+	struct ast_cdr alice_expected_two = {
+		.clid = "\"Alice\" <100>",
+		.src = "100",
+		.dst = "100",
+		.dcontext = "default",
+		.channel = CHANNEL_TECH_NAME "/Alice",
 		.dstchannel = CHANNEL_TECH_NAME "/David",
 		.lastapp = "Dial",
 		.lastdata = CHANNEL_TECH_NAME "/Bob",
@@ -1816,22 +1832,6 @@
 		.disposition = AST_CDR_ANSWERED,
 		.accountcode = "100",
 		.peeraccount = "400",
-		.next = &charlie_expected_one,
-	};
-	struct ast_cdr alice_expected_two = {
-		.clid = "\"Alice\" <100>",
-		.src = "100",
-		.dst = "100",
-		.dcontext = "default",
-		.channel = CHANNEL_TECH_NAME "/Alice",
-		.dstchannel = CHANNEL_TECH_NAME "/Charlie",
-		.lastapp = "Dial",
-		.lastdata = CHANNEL_TECH_NAME "/Bob",
-		.amaflags = AST_AMA_DOCUMENTATION,
-		.billsec = 1,
-		.disposition = AST_CDR_ANSWERED,
-		.accountcode = "100",
-		.peeraccount = "300",
 		.next = &alice_expected_three,
 	};
 	struct ast_cdr alice_expected_one = {