Merge pull request #64 from Bandwidth/DX-3105

ajrice6713 · web-flow · commit a384e983c7bc · 2023-01-18T12:56:29.000-05:00
DX-3105 Update Tests to Target .NET 6 &amp; 7
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,8 +15,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2022, windows-2019, ubuntu-18.04, ubuntu-20.04]
-        dotnet: [3.1.x, 5.0.x]
+        os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04]
+        dotnet: [6.0.x, 7.0.x]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
diff --git a/Bandwidth.Standard/Voice/Bxml/StartStream.cs b/Bandwidth.Standard/Voice/Bxml/StartStream.cs
@@ -19,12 +19,12 @@ public StartStream()
     {
       StreamParams = new List<StreamParam>();
     }
-    
+
     /// <summary>
     ///   A websocket URI to send the stream to
     /// </summary>
     public string Destination { get; set; }
-    
+
     /// <summary>
     /// A name to refer to this stream by
     /// </summary>
@@ -39,7 +39,7 @@ public StartStream()
     /// URL to send the associated Webhook events to during this stream's lifetime
     /// </summary>
     public string StreamEventUrl { get; set; }
-    
+
     /// <summary>
     /// The HTTP method to use for the request to `streamEventUrl`
     /// </summary>
@@ -54,7 +54,7 @@ public StartStream()
     /// The password to send in the HTTP request to `streamEventUrl`
     /// </summary>
     public string Password { get; set; }
-    
+
     /// <summary>
     /// List of StreamParam verbs
     /// </summary>
@@ -101,10 +101,9 @@ void IXmlSerializable.WriteXml(XmlWriter writer)
       {
           var ns = new XmlSerializerNamespaces();
           ns.Add("", "");
-          
+
           foreach (var verb in StreamParams)
           {
-              Console.WriteLine(verb.Name);
               var serializer = new XmlSerializer(verb.GetType(), "");
               serializer.Serialize(writer, verb, ns);
           }
diff --git a/Bandwidth.StandardTests/Bandwidth.StandardTests.csproj b/Bandwidth.StandardTests/Bandwidth.StandardTests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework Condition="'$(DOTNET)' == '3.1.x' Or '$(DOTNET)' == ''">netcoreapp3.1</TargetFramework>
-    <TargetFramework Condition="'$(DOTNET)' == '5.0.x'">net5.0</TargetFramework>
+    <TargetFramework Condition="'$(DOTNET)' == '6.0.x' Or '$(DOTNET)' == ''">net6.0</TargetFramework>
+    <TargetFramework Condition="'$(DOTNET)' == '7.0.x'">net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/Bandwidth.StandardTests/Voice/Bxml/BxmlTests.cs b/Bandwidth.StandardTests/Voice/Bxml/BxmlTests.cs
@@ -10,9 +10,9 @@ public class BxmlTests
         public void EmptyBxmlTest()
         {
             var bxml = new BXML();
-            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml />", bxml.ToBXML());
+            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml />", bxml.ToBXML().Replace("\n", "").Replace("\r", ""));
         }
-        
+
         [Fact]
         public void RingAnswerCallResponseToBXMLShouldBeFalse()
         {
@@ -21,7 +21,7 @@ public void RingAnswerCallResponseToBXMLShouldBeFalse()
 
             var bxml = new BXML(ring);
 
-            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml>  <Ring duration=\"5\" answerCall=\"false\" /></Bxml>", bxml.ToBXML());
+            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml>  <Ring duration=\"5\" answerCall=\"false\" /></Bxml>", bxml.ToBXML().Replace("\n", "").Replace("\r", ""));
         }
     }
 }
diff --git a/Bandwidth.StandardTests/Voice/Bxml/RingTests.cs b/Bandwidth.StandardTests/Voice/Bxml/RingTests.cs
@@ -38,7 +38,7 @@ public void RingResponseToBXMLShouldBeDefaults()
             var ring = new Ring();
             var response = new Response(ring);
 
-            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response>  <Ring duration=\"5\" answerCall=\"true\" /></Response>", response.ToBXML());
+            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response>  <Ring duration=\"5\" answerCall=\"true\" /></Response>", response.ToBXML().Replace("\n", "").Replace("\r", ""));
         }
 
         [Fact]
@@ -49,7 +49,7 @@ public void RingDurationResponseToBXMLShouldBeThirty()
 
             var response = new Response(ring);
 
-            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response>  <Ring duration=\"30\" answerCall=\"true\" /></Response>", response.ToBXML());
+            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response>  <Ring duration=\"30\" answerCall=\"true\" /></Response>", response.ToBXML().Replace("\n", "").Replace("\r", ""));
         }
 
         [Fact]
@@ -60,7 +60,7 @@ public void RingAnswerCallResponseToBXMLShouldBeFalse()
 
             var response = new Response(ring);
 
-            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response>  <Ring duration=\"5\" answerCall=\"false\" /></Response>", response.ToBXML());
+            Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response>  <Ring duration=\"5\" answerCall=\"false\" /></Response>", response.ToBXML().Replace("\n", "").Replace("\r", ""));
         }
     }
-}
+}
diff --git a/Bandwidth.StandardTests/Voice/Bxml/StreamTests.cs b/Bandwidth.StandardTests/Voice/Bxml/StreamTests.cs
@@ -11,7 +11,7 @@ public class StreamTests
         public void StartStreamBxmlVerbTest()
         {
             var expected = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Response>  <StartStream destination=\"https://www.test.com/stream\" name=\"test_stream\" tracks=\"inbound\" streamEventUrl=\"https://www.test.com/event\" streamEventMethod=\"POST\" username=\"username\" password=\"password\">    <StreamParam name=\"name1\" value=\"value1\" />    <StreamParam name=\"name2\" value=\"value2\" />  </StartStream></Response>";
-            
+
             var streamParam1 = new StreamParam();
             streamParam1.Name = "name1";
             streamParam1.Value = "value1";
@@ -34,9 +34,9 @@ public void StartStreamBxmlVerbTest()
             var response = new Response(startStream);
             var actual = response.ToBXML();
 
-            Assert.Equal(expected, actual);
+            Assert.Equal(expected, actual.Replace("\n", "").Replace("\r", ""));
         }
-        
+
         [Fact]
         public void StopStreamBxmlVerbTest()
         {
@@ -47,7 +47,7 @@ public void StopStreamBxmlVerbTest()
             var response = new Response(stopStream);
             var actual = response.ToBXML();
 
-            Assert.Equal(expected, actual);
+            Assert.Equal(expected, actual.Replace("\n", "").Replace("\r", ""));
         }
     }
 }
diff --git a/README.md b/README.md
@@ -4,10 +4,10 @@
 
 | **OS** | **.NET** |
 |:---:|:---:|
-| Windows 2016 | Core 3.1, 5.0 |
-| Windows 2019 | Core 3.1, 5.0 |
-| Ubuntu 18.04 | Core 3.1, 5.0 |
-| Ubuntu 20.04 | Core 3.1, 5.0 |
+| Windows 2019 | Core 3.1, 6.0 |
+| Windows 2022 | Core 3.1, 7.0 |
+| Ubuntu 20.04 | Core 3.1, 6.0 |
+| Ubuntu 22.04 | Core 3.1, 7.0 |
 
 ## Getting Started
 
@@ -88,7 +88,7 @@ response.ToBXML();
 
 ### Update an Existing Calls BXML
 
-```csharp 
+```csharp
 using Bandwidth.Standard;
 using Bandwidth.Standard.Voice.Bxml;
 

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ public class BxmlTests`
`10`	`10`	`public void EmptyBxmlTest()`
`11`	`11`	`{`
`12`	`12`	`var bxml = new BXML();`
`13`		`- Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml />", bxml.ToBXML());`
	`13`	`+ Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml />", bxml.ToBXML().Replace("\n", "").Replace("\r", ""));`
`14`	`14`	`}`
`15`		`-`
	`15`	`+`
`16`	`16`	`[Fact]`
`17`	`17`	`public void RingAnswerCallResponseToBXMLShouldBeFalse()`
`18`	`18`	`{`
`@@ -21,7 +21,7 @@ public void RingAnswerCallResponseToBXMLShouldBeFalse()`
`21`	`21`
`22`	`22`	`var bxml = new BXML(ring);`
`23`	`23`
`24`		`- Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml> <Ring duration=\"5\" answerCall=\"false\" /></Bxml>", bxml.ToBXML());`
	`24`	`+ Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Bxml> <Ring duration=\"5\" answerCall=\"false\" /></Bxml>", bxml.ToBXML().Replace("\n", "").Replace("\r", ""));`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void RingResponseToBXMLShouldBeDefaults()`
`38`	`38`	`var ring = new Ring();`
`39`	`39`	`var response = new Response(ring);`
`40`	`40`
`41`		`- Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response> <Ring duration=\"5\" answerCall=\"true\" /></Response>", response.ToBXML());`
	`41`	`+ Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response> <Ring duration=\"5\" answerCall=\"true\" /></Response>", response.ToBXML().Replace("\n", "").Replace("\r", ""));`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[Fact]`
`@@ -49,7 +49,7 @@ public void RingDurationResponseToBXMLShouldBeThirty()`
`49`	`49`
`50`	`50`	`var response = new Response(ring);`
`51`	`51`
`52`		`- Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response> <Ring duration=\"30\" answerCall=\"true\" /></Response>", response.ToBXML());`
	`52`	`+ Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response> <Ring duration=\"30\" answerCall=\"true\" /></Response>", response.ToBXML().Replace("\n", "").Replace("\r", ""));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`[Fact]`
`@@ -60,7 +60,7 @@ public void RingAnswerCallResponseToBXMLShouldBeFalse()`
`60`	`60`
`61`	`61`	`var response = new Response(ring);`
`62`	`62`
`63`		`- Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response> <Ring duration=\"5\" answerCall=\"false\" /></Response>", response.ToBXML());`
	`63`	`+ Assert.Equal("<?xml version=\"1.0\" encoding=\"utf-8\"?><Response> <Ring duration=\"5\" answerCall=\"false\" /></Response>", response.ToBXML().Replace("\n", "").Replace("\r", ""));`
`64`	`64`	`}`
`65`	`65`	`}`
`66`		`-}`
	`66`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class StreamTests`
`11`	`11`	`public void StartStreamBxmlVerbTest()`
`12`	`12`	`{`
`13`	`13`	`var expected = "<?xml version=\"1.0\" encoding=\"utf-8\"?><Response> <StartStream destination=\"https://www.test.com/stream\" name=\"test_stream\" tracks=\"inbound\" streamEventUrl=\"https://www.test.com/event\" streamEventMethod=\"POST\" username=\"username\" password=\"password\"> <StreamParam name=\"name1\" value=\"value1\" /> <StreamParam name=\"name2\" value=\"value2\" /> </StartStream></Response>";`
`14`		`-`
	`14`	`+`
`15`	`15`	`var streamParam1 = new StreamParam();`
`16`	`16`	`streamParam1.Name = "name1";`
`17`	`17`	`streamParam1.Value = "value1";`
`@@ -34,9 +34,9 @@ public void StartStreamBxmlVerbTest()`
`34`	`34`	`var response = new Response(startStream);`
`35`	`35`	`var actual = response.ToBXML();`
`36`	`36`
`37`		`- Assert.Equal(expected, actual);`
	`37`	`+ Assert.Equal(expected, actual.Replace("\n", "").Replace("\r", ""));`
`38`	`38`	`}`
`39`		`-`
	`39`	`+`
`40`	`40`	`[Fact]`
`41`	`41`	`public void StopStreamBxmlVerbTest()`
`42`	`42`	`{`
`@@ -47,7 +47,7 @@ public void StopStreamBxmlVerbTest()`
`47`	`47`	`var response = new Response(stopStream);`
`48`	`48`	`var actual = response.ToBXML();`
`49`	`49`
`50`		`- Assert.Equal(expected, actual);`
	`50`	`+ Assert.Equal(expected, actual.Replace("\n", "").Replace("\r", ""));`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`