Adding full set of signing tests and dlr test

Vonage · Feb 5, 2020 · e86442c · e86442c
1 parent 847583c
commit e86442c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Nexmo.Api.Test.Unit/SmsTest.cs b/Nexmo.Api.Test.Unit/SmsTest.cs
@@ -1,5 +1,7 @@
 using Newtonsoft.Json;
 using Nexmo.Api.Cryptography;
+using System.Web;
+using System;
 using System.Collections.Generic;
 using System.Web;
 using Xunit;
@@ -73,12 +75,17 @@ public void TestGenerateSignatureMD5()
               ""concat-total"": ""3"",
               ""concat-part"": ""2"",
               ""data"": ""abc123"",
+<<<<<<< HEAD
 <<<<<<< HEAD
               ""udh"": ""abc123"",
               ""sig"":""12345""
 =======
               ""udh"": ""abc123""
 >>>>>>> adding signature and inbound test
+=======
+              ""udh"": ""abc123"",
+              ""sig"":""12345""
+>>>>>>> Adding full set of signing tests and dlr test
             }";
             var message = JsonConvert.DeserializeObject<SMS.SMSInbound>(request);
             var dict = JsonConvert.DeserializeObject<Dictionary<string, string>>(request);
@@ -244,7 +251,6 @@ public void TestDLRStruct()
         [Fact]
         public void TestSendSmsWithSig()
         {
-
         }
     }
 }