remove fluent assertions (#53)

Author: BenjaminAbt

.editorconfig

@@ -72,9 +72,9 @@ dotnet_code_quality_unused_parameters = all:suggestion
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = false:silent
-csharp_style_var_for_built_in_types = false:silent
-csharp_style_var_when_type_is_apparent = true:silent
+dotnet_style_var_for_built_in_types = false:error
+dotnet_style_var_when_type_is_apparent = false:error
+dotnet_style_var_elsewhere = false:error
 
 # Expression-bodied members
 csharp_style_expression_bodied_accessors = true:silent

Directory.Packages.props

@@ -18,7 +18,6 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="FluentAssertions" Version="7.0.0-alpha.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.console" Version="2.9.2">
@@ -48,4 +47,4 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageVersion>
   </ItemGroup>
-</Project>
+</Project>

src/MyCSharp.HttpUserAgentParser.MemoryCache/DependencyInjection/HttpUserAgentParserMemoryCacheServiceCollectionExtensions.cs

@@ -1,6 +1,5 @@
 // Copyright © myCSharp.de - all rights reserved
 
-using System;
 using Microsoft.Extensions.DependencyInjection;
 using MyCSharp.HttpUserAgentParser.DependencyInjection;
 using MyCSharp.HttpUserAgentParser.Providers;

tests/MyCSharp.HttpUserAgentParser.AspNetCore.UnitTests/DependencyInjection/HttpUserAgentParserServiceCollectionExtensionsTests.cs

@@ -1,6 +1,5 @@
 // Copyright © myCSharp.de - all rights reserved
 
-using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using MyCSharp.HttpUserAgentParser.AspNetCore.DependencyInjection;
 using MyCSharp.HttpUserAgentParser.DependencyInjection;
@@ -18,10 +17,10 @@ public void AddHttpUserAgentParserAccessor()
 
         options.AddHttpUserAgentParserAccessor();
 
-        services.Count.Should().Be(1);
+        Assert.Single(services);
 
-        services[0].ServiceType.Should().Be<IHttpUserAgentParserAccessor>();
-        services[0].ImplementationType.Should().Be<HttpUserAgentParserAccessor>();
-        services[0].Lifetime.Should().Be(ServiceLifetime.Singleton);
+        Assert.Equal(typeof(IHttpUserAgentParserAccessor), services[0].ServiceType);
+        Assert.Equal(typeof(HttpUserAgentParserAccessor), services[0].ImplementationType);
+        Assert.Equal(ServiceLifetime.Singleton, services[0].Lifetime);
     }
 }

tests/MyCSharp.HttpUserAgentParser.AspNetCore.UnitTests/HttpUserAgentParserAccessorTests.cs

@@ -1,6 +1,5 @@
 // Copyright © myCSharp.de - all rights reserved
 
-using FluentAssertions;
 using Microsoft.AspNetCore.Http;
 using MyCSharp.HttpUserAgentParser.Providers;
 using NSubstitute;
@@ -27,8 +26,8 @@ public void Get(string userAgent)
         HttpUserAgentInformation? info = accessor.Get(httpContext);
 
         // assert
-        info.Should().NotBeNull();
-        info.Should().Be(userAgentInformation);
+        Assert.NotNull(info);
+        Assert.Equal(userAgentInformation, info);
 
         // verify
         _parserMock.Received(1).Parse(userAgent);

tests/MyCSharp.HttpUserAgentParser.AspNetCore.UnitTests/MyCSharp.HttpUserAgentParser.AspNetCore.UnitTests.csproj

@@ -4,6 +4,10 @@
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    </ItemGroup>
+
     <ItemGroup Label="NuGet Roslyn">
         <PackageReference Include="Roslynator.Analyzers">
             <PrivateAssets>all</PrivateAssets>
@@ -20,9 +24,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-
-        <PackageReference Include="FluentAssertions" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="NSubstitute" />
         <PackageReference Include="xunit" />

tests/MyCSharp.HttpUserAgentParser.MemoryCache.UnitTests/DependencyInjection/HttpUserAgentParserMemoryCacheServiceCollectionExtensionssTests.cs

@@ -1,6 +1,5 @@
 // Copyright © myCSharp.de - all rights reserved
 
-using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using MyCSharp.HttpUserAgentParser.MemoryCache.DependencyInjection;
 using MyCSharp.HttpUserAgentParser.Providers;
@@ -17,13 +16,13 @@ public void AddHttpUserAgentMemoryCachedParser()
 
         services.AddHttpUserAgentMemoryCachedParser();
 
-        services.Count.Should().Be(2);
+        Assert.Equal(2, services.Count);
 
-        services[0].ImplementationInstance.Should().BeOfType<HttpUserAgentParserMemoryCachedProviderOptions>();
-        services[0].Lifetime.Should().Be(ServiceLifetime.Singleton);
+        Assert.IsType<HttpUserAgentParserMemoryCachedProviderOptions>(services[0].ImplementationInstance);
+        Assert.Equal(ServiceLifetime.Singleton, services[0].Lifetime);
 
-        services[1].ServiceType.Should().Be<IHttpUserAgentParserProvider>();
-        services[1].ImplementationType.Should().Be<HttpUserAgentParserMemoryCachedProvider>();
-        services[1].Lifetime.Should().Be(ServiceLifetime.Singleton);
+        Assert.Equal(typeof(IHttpUserAgentParserProvider), services[1].ServiceType);
+        Assert.Equal(typeof(HttpUserAgentParserMemoryCachedProvider), services[1].ImplementationType);
+        Assert.Equal(ServiceLifetime.Singleton, services[1].Lifetime);
     }
 }

tests/MyCSharp.HttpUserAgentParser.MemoryCache.UnitTests/HttpUserAgentParserMemoryCachedProviderOptionsTests.cs

@@ -1,6 +1,5 @@
 // Copyright © myCSharp.de - all rights reserved
 
-using FluentAssertions;
 using Microsoft.Extensions.Caching.Memory;
 using Xunit;
 
@@ -16,8 +15,8 @@ public void Ctor()
 
         HttpUserAgentParserMemoryCachedProviderOptions options = new(cacheOptions, cacheEntryOptions);
 
-        options.CacheOptions.Should().Be(cacheOptions);
-        options.CacheEntryOptions.Should().Be(cacheEntryOptions);
+        Assert.Equal(cacheOptions, options.CacheOptions);
+        Assert.Equal(cacheEntryOptions, options.CacheEntryOptions);
     }
 
     [Fact]
@@ -27,8 +26,8 @@ public void Ctor_MemoryCacheOptions()
 
         HttpUserAgentParserMemoryCachedProviderOptions options = new(cacheOptions);
 
-        options.CacheOptions.Should().Be(cacheOptions);
-        options.CacheEntryOptions.Should().NotBeNull();
+        Assert.Equal(cacheOptions, options.CacheOptions);
+        Assert.NotNull(options.CacheEntryOptions);
     }
 
     [Fact]
@@ -38,16 +37,16 @@ public void Ctor_MemoryCacheEntryOptions()
 
         HttpUserAgentParserMemoryCachedProviderOptions options = new(cacheEntryOptions);
 
-        options.CacheOptions.Should().NotBeNull();
-        options.CacheEntryOptions.Should().Be(cacheEntryOptions);
+        Assert.NotNull(options.CacheOptions);
+        Assert.Equal(cacheEntryOptions, options.CacheEntryOptions);
     }
 
     [Fact]
     public void Ctor_Empty()
     {
         HttpUserAgentParserMemoryCachedProviderOptions options = new();
 
-        options.CacheOptions.Should().NotBeNull();
-        options.CacheEntryOptions.Should().NotBeNull();
+        Assert.NotNull(options.CacheOptions);
+        Assert.NotNull(options.CacheEntryOptions);
     }
 }

tests/MyCSharp.HttpUserAgentParser.MemoryCache.UnitTests/HttpUserAgentParserMemoryCachedProviderTests.cs

@@ -1,6 +1,5 @@
 // Copyright © myCSharp.de - all rights reserved
 
-using FluentAssertions;
 using Xunit;
 
 namespace MyCSharp.HttpUserAgentParser.MemoryCache.UnitTests;
@@ -14,28 +13,28 @@ public void Parse()
         HttpUserAgentParserMemoryCachedProvider provider = new(cachedProviderOptions);
 
         // create first
-        string userAgentOne =
+        const string userAgentOne =
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36 Edg/90.0.818.62";
 
         HttpUserAgentInformation infoOne = provider.Parse(userAgentOne);
 
-        infoOne.Name.Should().Be("Edge");
-        infoOne.Version.Should().Be("90.0.818.62");
+        Assert.Equal("Edge", infoOne.Name);
+        Assert.Equal("90.0.818.62", infoOne.Version);
 
         // check duplicate
 
         HttpUserAgentInformation infoDuplicate = provider.Parse(userAgentOne);
 
-        infoDuplicate.Name.Should().Be("Edge");
-        infoDuplicate.Version.Should().Be("90.0.818.62");
+        Assert.Equal("Edge", infoDuplicate.Name);
+        Assert.Equal("90.0.818.62", infoDuplicate.Version);
 
         // create second
 
-        string userAgentTwo = "Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0";
+        const string userAgentTwo = "Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0";
 
         HttpUserAgentInformation infoTwo = provider.Parse(userAgentTwo);
 
-        infoTwo.Name.Should().Be("Firefox");
-        infoTwo.Version.Should().Be("41.0");
+        Assert.Equal("Firefox", infoTwo.Name);
+        Assert.Equal("41.0", infoTwo.Version);
     }
 }

tests/MyCSharp.HttpUserAgentParser.MemoryCache.UnitTests/MyCSharp.HttpUserAgentParser.MemoryCache.UnitTests.csproj

@@ -4,6 +4,11 @@
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    </ItemGroup>
+
     <ItemGroup Label="NuGet Roslyn">
         <PackageReference Include="Roslynator.Analyzers">
             <PrivateAssets>all</PrivateAssets>
@@ -20,12 +25,8 @@
     </ItemGroup>
 
     <ItemGroup Label="NuGet">
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-
-        <PackageReference Include="FluentAssertions"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
-        <PackageReference Include="xunit"  />
+        <PackageReference Include="xunit" />
         <PackageReference Include="xunit.runner.console">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>