test: To FluentAssertions.

ar-met · Jul 15, 2021 · deb1c91 · deb1c91
1 parent 9509042
commit deb1c91
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 61 deletions.
diff --git a/src/tests/H.Engine.IO.IntegrationTests/BaseTests.cs b/src/tests/H.Engine.IO.IntegrationTests/BaseTests.cs
@@ -2,7 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using H.WebSockets.Utilities;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using FluentAssertions;
 
 namespace H.Engine.IO.IntegrationTests
 {
@@ -45,7 +45,7 @@ public static async Task ConnectToChatBaseTestAsync(string url, CancellationToke
 
             foreach (var pair in results)
             {
-                Assert.IsNotNull(pair.Value, $"Client event(\"{pair.Key}\") did not happen");
+                pair.Value.Should().NotBeNull(because: $"Client event(\"{pair.Key}\") did not happen");
             }
         }
     }

diff --git a/src/tests/H.Engine.IO.IntegrationTests/H.Engine.IO.IntegrationTests.csproj b/src/tests/H.Engine.IO.IntegrationTests/H.Engine.IO.IntegrationTests.csproj
@@ -5,9 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/tests/H.Engine.IO.UnitTests/EngineIoClientTests.cs b/src/tests/H.Engine.IO.UnitTests/EngineIoClientTests.cs
@@ -1,5 +1,6 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using FluentAssertions;
 
 namespace H.Engine.IO.Tests
 {
@@ -8,9 +9,8 @@ public class EngineIoClientTests
     {
         private static void ToWebSocketUriBaseTest(string expected, string url, string framework = "engine.io")
         {
-            Assert.AreEqual(
-                new Uri(expected), 
-                EngineIoClient.ToWebSocketUri(new Uri(url), framework));
+            EngineIoClient.ToWebSocketUri(new Uri(url), framework)
+                .Should().Be(new Uri(expected));
         }
 
         [TestMethod]

diff --git a/src/tests/H.Engine.IO.UnitTests/EngineIoPacketTests.cs b/src/tests/H.Engine.IO.UnitTests/EngineIoPacketTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using FluentAssertions;
 
 namespace H.Engine.IO.Tests
 {
@@ -9,8 +10,8 @@ private static EngineIoPacket BaseDecodeTest(string message, EngineIoPacket expe
         {
             var packet = EngineIoPacket.Decode(message);
 
-            Assert.AreEqual(expectedPacket.Prefix, packet.Prefix, $"{nameof(BaseDecodeTest)}.{nameof(packet.Prefix)}: {message}");
-            Assert.AreEqual(expectedPacket.Value, packet.Value, $"{nameof(BaseDecodeTest)}.{nameof(packet.Value)}: {message}");
+            packet.Prefix.Should().Be(expectedPacket.Prefix);
+            packet.Value.Should().Be(expectedPacket.Value);
 
             return packet;
         }
@@ -19,7 +20,7 @@ private static string BaseEncodeTest(EngineIoPacket packet, string expectedMessa
         {
             var message = packet.Encode();
 
-            Assert.AreEqual(expectedMessage, message, $"{nameof(BaseEncodeTest)}.{nameof(message)}: {message}");
+            message.Should().Be(expectedMessage);
 
             return message;
         }

diff --git a/src/tests/H.Engine.IO.UnitTests/H.Engine.IO.UnitTests.csproj b/src/tests/H.Engine.IO.UnitTests/H.Engine.IO.UnitTests.csproj
@@ -5,9 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/tests/H.Socket.IO.IntegrationTests/BaseTests.cs b/src/tests/H.Socket.IO.IntegrationTests/BaseTests.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using FluentAssertions;
 using H.Socket.IO.EventsArgs;
 using H.WebSockets.Utilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -43,7 +44,7 @@ public static async Task BaseTestAsync(
 
             foreach (var pair in results)
             {
-                Assert.IsNotNull(pair.Value, $"Client event(\"{pair.Key}\") did not happen");
+                pair.Value.Should().NotBeNull(because: $"Client event(\"{pair.Key}\") did not happen");
             }
         }
 

diff --git a/src/tests/H.Socket.IO.IntegrationTests/H.Socket.IO.IntegrationTests.csproj b/src/tests/H.Socket.IO.IntegrationTests/H.Socket.IO.IntegrationTests.csproj
@@ -5,9 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/tests/H.Socket.IO.UnitTests/H.Socket.IO.UnitTests.csproj b/src/tests/H.Socket.IO.UnitTests/H.Socket.IO.UnitTests.csproj
@@ -5,9 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/tests/H.Socket.IO.UnitTests/SocketIoPacketTests.cs b/src/tests/H.Socket.IO.UnitTests/SocketIoPacketTests.cs
@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using FluentAssertions;
 
 namespace H.Socket.IO.Tests
 {
@@ -9,9 +10,9 @@ private static SocketIoPacket BaseDecodeTest(string message, SocketIoPacket expe
         {
             var packet = SocketIoPacket.Decode(message);
 
-            Assert.AreEqual(expectedPacket.Prefix, packet.Prefix, $"{nameof(BaseDecodeTest)}.{nameof(packet.Prefix)}: {message}");
-            Assert.AreEqual(expectedPacket.Namespace, packet.Namespace, $"{nameof(BaseDecodeTest)}.{nameof(packet.Namespace)}: {message}");
-            Assert.AreEqual(expectedPacket.Value, packet.Value, $"{nameof(BaseDecodeTest)}.{nameof(packet.Value)}: {message}");
+            packet.Prefix.Should().Be(expectedPacket.Prefix);
+            packet.Namespace.Should().Be(expectedPacket.Namespace);
+            packet.Value.Should().Be(expectedPacket.Value);
 
             return packet;
         }
@@ -20,7 +21,7 @@ private static string BaseEncodeTest(SocketIoPacket packet, string expectedMessa
         {
             var message = packet.Encode();
 
-            Assert.AreEqual(expectedMessage, message, $"{nameof(BaseEncodeTest)}.{nameof(message)}: {message}");
+            message.Should().Be(expectedMessage);
 
             return message;
         }

diff --git a/src/tests/H.Socket.IO.UnitTests/SocketIoUtilitiesTests.cs b/src/tests/H.Socket.IO.UnitTests/SocketIoUtilitiesTests.cs
@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Linq;
-using H.Socket.IO.Utilities;
+using H.Socket.IO.Utilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using FluentAssertions;
 
 namespace H.Socket.IO.Tests
 {
@@ -11,33 +10,16 @@ public class SocketIoUtilitiesTests
         [TestMethod]
         public void GetEventValuesTest()
         {
-            CollectionAreEqual(
-                new[] { "messages", "[{},{},{}]" },
-                "[\"messages\",[{},{},{}]]".GetJsonArrayValues());
-
-            CollectionAreEqual(
-                new [] { "message", "value" }, 
-                "[\"message\",\"value\"]".GetJsonArrayValues());
-
-            CollectionAreEqual(
-                new[] { "message" },
-                "[\"message\"]".GetJsonArrayValues());
-
-            CollectionAreEqual(
-                new[] { "message", "{}" },
-                "[\"message\",{}]".GetJsonArrayValues());
-
-            CollectionAreEqual(
-                new[] { "new message", "{\"username\":\"1\",\"message\":\"1\"}" },
-                "[\"new message\",{\"username\":\"1\",\"message\":\"1\"}]".GetJsonArrayValues());
-        }
-
-        private static void CollectionAreEqual<T>(IEnumerable<T> first, IEnumerable<T> second)
-        {
-            foreach (var (a, b) in first.Zip(second, (a, b) => (a, b)))
-            {
-                Assert.AreEqual(a, b);
-            }
+            "[\"messages\",[{},{},{}]]".GetJsonArrayValues()
+                .Should().BeEquivalentTo(new[] { "messages", "[{},{},{}]" });
+            "[\"message\",\"value\"]".GetJsonArrayValues()
+                .Should().BeEquivalentTo(new[] { "message", "value" });
+            "[\"message\"]".GetJsonArrayValues()
+                .Should().BeEquivalentTo(new[] { "message" });
+            "[\"message\",{}]".GetJsonArrayValues()
+                .Should().BeEquivalentTo(new[] { "message", "{}" });
+            "[\"new message\",{\"username\":\"1\",\"message\":\"1\"}]".GetJsonArrayValues()
+                .Should().BeEquivalentTo(new[] { "new message", "{\"username\":\"1\",\"message\":\"1\"}" });
         }
     }
 }
diff --git a/src/tests/H.Socket.IO.UnitTests/StringExtensionsTests.cs b/src/tests/H.Socket.IO.UnitTests/StringExtensionsTests.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using H.Socket.IO.Utilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using FluentAssertions;
 
 namespace H.Socket.IO.Tests
 {
@@ -23,9 +24,8 @@ public void SplitByIndexesTest()
                 }
             } while (index >= 0);
 
-            CollectionAssert.AreEqual(
-                new[] { "[\"message\"", "\"value\"", "\"value\"", "\"value\"]" },
-                text.SplitByIndexes(indexes.ToArray()));
+            text.SplitByIndexes(indexes.ToArray())
+                .Should().BeEquivalentTo(new[] { "[\"message\"", "\"value\"", "\"value\"", "\"value\"]" });
         }
     }
 }
diff --git a/src/tests/H.WebSockets.IntegrationTests/H.WebSockets.IntegrationTests.csproj b/src/tests/H.WebSockets.IntegrationTests/H.WebSockets.IntegrationTests.csproj
@@ -5,9 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201020-06" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.5" />
   </ItemGroup>
 
   <ItemGroup>