Remove FluentAssertions (#2828)

Author: MihaZupan

eng/Versions.props

@@ -20,8 +20,6 @@
     <MoqVersion>4.18.4</MoqVersion>
     <AutofacVersion>4.9.4</AutofacVersion>
     <AutofacExtrasMoqVersion>4.3.0</AutofacExtrasMoqVersion>
-    <FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
-    <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
     <PollyVersion>8.4.2</PollyVersion>
     <LettuceEncryptVersion>1.3.0</LettuceEncryptVersion>
     <PrometheusNetVersion>8.2.1</PrometheusNetVersion>

test/Kubernetes.Tests/IngressConversionTests.cs

@@ -9,7 +9,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
-using FluentAssertions.Json;
 using k8s;
 using k8s.Models;
 using Microsoft.Extensions.Logging;
@@ -31,9 +30,10 @@ public class IngressConversionTests
 {
     public IngressConversionTests()
     {
-        JsonConvert.DefaultSettings = () => new JsonSerializerSettings() {
+        JsonConvert.DefaultSettings = () => new JsonSerializerSettings()
+        {
             NullValueHandling = NullValueHandling.Ignore,
-            Converters = {new StringEnumConverter()}
+            Converters = { new StringEnumConverter() }
         };
     }
 
@@ -74,7 +74,7 @@ public async Task ParsingTests(string name)
                 YarpParser.ConvertFromKubernetesIngress(ingressContext, configContext);
             }
         }
-        var options = new JsonSerializerOptions { Converters = {new JsonStringEnumConverter()} };
+        var options = new JsonSerializerOptions { Converters = { new JsonStringEnumConverter() } };
         VerifyClusters(JsonSerializer.Serialize(configContext.BuildClusterConfig(), options), name);
         VerifyRoutes(JsonSerializer.Serialize(configContext.Routes, options), name);
     }
@@ -99,7 +99,7 @@ private static string StripNullProperties(string json)
         {
             var token = reader.TokenType;
             var value = reader.Value;
-            if(reader.TokenType == JsonToken.PropertyName)
+            if (reader.TokenType == JsonToken.PropertyName)
             {
                 reader.Read();
                 if (reader.TokenType == JsonToken.Null)
@@ -122,7 +122,8 @@ private static void VerifyJson(string json, string name, string fileName)
 
         var actual = JToken.Parse(json);
         var jOther = JToken.Parse(other);
-        actual.Should().BeEquivalentTo(jOther);
+
+        Assert.True(JToken.DeepEquals(actual, jOther), $"Expected: {jOther}\nActual: {actual}");
     }
 
     private async Task<ICache> GetKubernetesInfo(string name, V1IngressClass ingressClass)

test/Kubernetes.Tests/Yarp.Kubernetes.Tests.csproj

@@ -14,8 +14,6 @@
 
   <ItemGroup>
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-    <PackageReference Include="FluentAssertions.Json" Version="$(FluentAssertionsJsonVersion)" />
     <PackageReference Include="Polly" Version="$(PollyVersion)" />
   </ItemGroup>