diff --git a/NEventSocket.Tests/Applications/Applications.cs b/NEventSocket.Tests/Applications/Applications.cs index 39f8fa1..19dac44 100644 --- a/NEventSocket.Tests/Applications/Applications.cs +++ b/NEventSocket.Tests/Applications/Applications.cs @@ -50,7 +50,7 @@ public void can_build_originate_string() var toString = options.ToString(); const string Expected = - "{origination_uuid='985cea12-4e70-4c03-8a2c-2c4b4502bbbb',bypass_media='true',origination_caller_id_name='Test',origination_caller_id_number='12341234',execute_on_originate='start_dtmf',ignore_early_media='true',originate_retries='3',originate_retry_sleep_ms='4000',return_ring_ready='true',originate_timeout='20',hangup_after_bridge='false',foo='bar',baz='widgets'}"; + "{origination_uuid='985cea12-4e70-4c03-8a2c-2c4b4502bbbb',bypass_media='true',origination_caller_id_name='Test',origination_caller_id_number='12341234',execute_on_originate='start_dtmf',ignore_early_media='true',originate_retries='3',originate_retry_sleep_ms='4000',return_ring_ready='true',originate_timeout='20',fooE='barE',bazE='widgetsE',hangup_after_bridge='false',foo='bar',baz='widgets'}"; Assert.That(toString, Is.EqualTo(Expected)); } diff --git a/NEventSocket.Tests/Applications/OriginateTests.cs b/NEventSocket.Tests/Applications/OriginateTests.cs index f7336ad..27e74b8 100644 --- a/NEventSocket.Tests/Applications/OriginateTests.cs +++ b/NEventSocket.Tests/Applications/OriginateTests.cs @@ -41,7 +41,7 @@ public void can_set_enterprise_channel_variables() {"e2" , "ev2"} } }.ToString(); - Assert.That(options, Does.Contain("")); + Assert.That(options, Does.Contain("{e1='ev1',e2='ev2'}")); } [Test] @@ -52,7 +52,7 @@ public void can_set_enterprise_channel_variables_and_channel_variables() EnterpriseChannelVariables = new Dictionary { { "e1", "ev1" }, { "e2", "ev2" } }, ChannelVariables = new Dictionary { { "c1", "cv1" }, { "c2", "cv2" } } }.ToString(); - Assert.That(options, Does.Contain("{c1='cv1',c2='cv2'}")); + Assert.That(options, Does.Contain("{e1='ev1',e2='ev2',c1='cv1',c2='cv2'}")); } [Test] diff --git a/NEventSocket/FreeSwitch/OriginateOptions.cs b/NEventSocket/FreeSwitch/OriginateOptions.cs index 18eb1ca..7a2f3e6 100644 --- a/NEventSocket/FreeSwitch/OriginateOptions.cs +++ b/NEventSocket/FreeSwitch/OriginateOptions.cs @@ -271,40 +271,17 @@ public OriginationPrivacy OriginationPrivacy public override string ToString() { var sb = StringBuilderPool.Allocate(); - AppendOriginateEnterpriseChannelVariablesString(sb); AppendOriginateChannelVariablesString(sb); return StringBuilderPool.ReturnAndFree(sb); } - /// - /// Append enterprise channel variables to string builder - /// - private void AppendOriginateEnterpriseChannelVariablesString(StringBuilder sb) - { - if (!EnterpriseChannelVariables.Any()) - { - return; - } - - sb.Append("<"); - - sb.Append(EnterpriseChannelVariables.ToOriginateString()); - - if (sb.Length > 1) - { - sb.Remove(sb.Length - 1, 1); - } - - sb.Append(">"); - } - /// /// Append channel variables to string builder /// private void AppendOriginateChannelVariablesString(StringBuilder sb) { - if (!ChannelVariables.Any() && !parameters.Any()) + if (!parameters.Any() && !EnterpriseChannelVariables.Any() && !ChannelVariables.Any()) { return; } @@ -312,6 +289,7 @@ private void AppendOriginateChannelVariablesString(StringBuilder sb) sb.Append("{"); sb.Append(parameters.ToOriginateString()); + sb.Append(EnterpriseChannelVariables.ToOriginateString()); //ici, je crois que pour une entreprise variable il faurait ajouter le caractere $ dans la valeur pour dire que c'est un entreprise variable sb.Append(ChannelVariables.ToOriginateString()); if (sb.Length > 1)