From c2ceb5f8899976d632f76f9bbe614ccdb90f00fb Mon Sep 17 00:00:00 2001 From: matt-lethargic Date: Wed, 25 May 2022 11:22:20 +0100 Subject: [PATCH] Reverting the removal of .ToString on Ncco Making Serialisation Settings public --- Vonage.Test.Unit/NccoTests.cs | 18 +++++++++--------- Vonage/Serialization/VonageSerialization.cs | 4 ++-- Vonage/Voice/Nccos/Ncco.cs | 6 ++++++ 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Vonage.Test.Unit/NccoTests.cs b/Vonage.Test.Unit/NccoTests.cs index f43faed09..dca984f3f 100644 --- a/Vonage.Test.Unit/NccoTests.cs +++ b/Vonage.Test.Unit/NccoTests.cs @@ -32,7 +32,7 @@ public void TestRecord(RecordAction.AudioFormat audioFormat) }; var ncco = new Ncco(recordAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -42,7 +42,7 @@ public void TestRecordMinimalist() var expectedJson = GetRequestJson(); var recordAction = new RecordAction(); var ncco = new Ncco(recordAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -61,7 +61,7 @@ public void TestConversation() CanHear = new[] {"6a4d6af0-55a6-4667-be90-8614e4c8e83c"} }; var ncco = new Ncco(conversationAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -80,7 +80,7 @@ public void TestConversationAllTrue() CanHear = new[] {"6a4d6af0-55a6-4667-be90-8614e4c8e83c"} }; var ncco = new Ncco(conversationAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -113,7 +113,7 @@ public void TestConnect() EventMethod = "POST" }; var ncco = new Ncco(connectAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -132,7 +132,7 @@ public void TestTalk() Style = 0 }; var ncco = new Ncco(talkAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -145,7 +145,7 @@ public void TestTalkBareBones() Text = "Hello World" }; var ncco = new Ncco(talkAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -161,7 +161,7 @@ public void TestStream() Level = "0", }; var ncco = new Ncco(talkAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } @@ -179,7 +179,7 @@ public void TestNotify() EventUrl = new[] {"https://example.com/webhooks/events"} }; var ncco = new Ncco(notifyAction); - var actualJson = JsonConvert.SerializeObject(ncco, Serialization.VonageSerialization.SerializerSettings); + var actualJson = ncco.ToString(); Assert.Equal(expectedJson, actualJson); } diff --git a/Vonage/Serialization/VonageSerialization.cs b/Vonage/Serialization/VonageSerialization.cs index 5e703e2ec..60a72d31a 100644 --- a/Vonage/Serialization/VonageSerialization.cs +++ b/Vonage/Serialization/VonageSerialization.cs @@ -2,9 +2,9 @@ namespace Vonage.Serialization { - internal class VonageSerialization + public class VonageSerialization { - internal static JsonSerializerSettings SerializerSettings + public static JsonSerializerSettings SerializerSettings { get { diff --git a/Vonage/Voice/Nccos/Ncco.cs b/Vonage/Voice/Nccos/Ncco.cs index c76e75f6a..560ac7b52 100644 --- a/Vonage/Voice/Nccos/Ncco.cs +++ b/Vonage/Voice/Nccos/Ncco.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using Newtonsoft.Json; namespace Vonage.Voice.Nccos { @@ -7,5 +8,10 @@ public class Ncco : List public Ncco(params NccoAction[] actions) :base(actions) { } + + public override string ToString() + { + return JsonConvert.SerializeObject(this, Serialization.VonageSerialization.SerializerSettings); + } } }