Refactor to use AwesomeAssertions 9.0.0 (#103)

Author: missymessa

Directory.Build.props

@@ -49,7 +49,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
-    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Moq" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter">

Directory.Packages.props

@@ -11,15 +11,15 @@
     <!-- Note: These libraries can be loaded by Arcade SDK clients, which may already have a
          newer copy of this package loaded. When updating one, be aware of the other to prevent runtime issues
          See: https://github.com/dotnet/arcade/blob/main/eng/Versions.props -->
+    <PackageVersion Include="AwesomeAssertions" Version="9.0.0" />
+    <PackageVersion Include="AwesomeAssertions.Json" Version="9.0.0" />
     <PackageVersion Include="Azure.Core" Version="1.45.0" />
     <PackageVersion Include="Azure.Data.AppConfiguration" Version="1.0.0" />
     <PackageVersion Include="Azure.Data.Tables" Version="12.8.3" />
     <PackageVersion Include="Azure.Identity" Version="1.11.4" />
     <PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.4.0" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.16.0" />
     <PackageVersion Include="Castle.Core" Version="4.3.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-    <PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" />

src/Microsoft.DotNet.Internal.Testing.Utility/Microsoft.DotNet.Internal.Testing.Utility.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Http" />

src/Microsoft.DotNet.Internal.Testing.Utility/MockHttpClientFactory.cs

@@ -1,15 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentAssertions;
-using NUnit.Framework;
+using AwesomeAssertions;
 
 namespace Microsoft.DotNet.Internal.Testing.Utility;
 

src/Microsoft.DotNet.Internal.Testing.Utility/StringRegexAssertionExtensions.cs

@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Text.RegularExpressions;
-using FluentAssertions;
-using FluentAssertions.Execution;
-using FluentAssertions.Primitives;
+using AwesomeAssertions;
+using AwesomeAssertions.Primitives;
 
 namespace Microsoft.DotNet.Internal.Testing.Utility;
 
@@ -16,16 +15,11 @@ public static AndConstraint<StringAssertions> MatchRegex(
         params object[] becauseArgs
     )
     {
-        Execute.Assertion.ForCondition(stringAssertion.Subject != null)
-            .UsingLineBreaks.BecauseOf(because, becauseArgs)
-            .FailWith("Expected {context:string} to match regex {0}{reason}, but it was <null>.",
-                (object) regularExpression);
-        Execute.Assertion.ForCondition(regularExpression.IsMatch(stringAssertion.Subject))
-            .BecauseOf(because, becauseArgs)
-            .UsingLineBreaks
-            .FailWith("Expected {context:string} to match regex {0}{reason}, but {1} does not match.",
-                regularExpression.ToString(),
-                stringAssertion.Subject);
+        stringAssertion.Subject.Should().NotBeNull(
+            $"Expected string to match regex {regularExpression}{(because != string.Empty ? " because " + because : string.Empty)}, but it was <null>.");
+
+        regularExpression.IsMatch(stringAssertion.Subject).Should().BeTrue(
+            $"Expected string to match regex {regularExpression}{(because != string.Empty ? " because " + because : string.Empty)}, but {stringAssertion.Subject} does not match.");
 
         return new AndConstraint<StringAssertions>(stringAssertion);
     }

test/CoreHealthMonitor.Tests/DependencyRegistrationTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.DependencyInjection.Testing;
 using Microsoft.DotNet.ServiceFabric.ServiceHost;
 using NUnit.Framework;

test/Microsoft.DotNet.GitHub.Authentication.Tests/GitHubAppTokenProviderTests.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Security.Cryptography;
 using System.Text;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.DotNet.Internal.Testing.Utility;
 using Microsoft.Extensions.DependencyInjection;

test/Microsoft.DotNet.Internal.DependencyInjection.Testing.Tests/DependencyInjectionTestValidation.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 

test/Microsoft.DotNet.Internal.DependencyInjection.Testing.Tests/Microsoft.DotNet.Internal.DependencyInjection.Testing.Tests.csproj

@@ -3,7 +3,7 @@
     <IsPackable>false</IsPackable>
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
-	
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DotNet.Internal.DependencyInjection.Testing\Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj" />
   </ItemGroup>

test/Microsoft.DotNet.Internal.Health.Tests/AzureTableHealthReportProviderTests.cs

@@ -1,8 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using FluentAssertions;
-using FluentAssertions.Json;
+using AwesomeAssertions;
+using AwesomeAssertions.Json;
 using NUnit.Framework;
 
 namespace Microsoft.DotNet.Internal.Health.Tests;

test/Microsoft.DotNet.Internal.Health.Tests/HealthReporterFactoryTests.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Health.Tests/Microsoft.DotNet.Internal.Health.Tests.csproj

@@ -6,7 +6,7 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions.Json" />
+    <PackageReference Include="AwesomeAssertions.Json" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DotNet.Internal.Health\Microsoft.DotNet.Internal.Health.csproj" />

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/ArrayTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/AsyncConfigurationTest.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/DisposeCalledTest.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/MultipleRegistrations.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/NoParameterValueTest.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/ParameterTests.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/SyncConfigTests.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/TupleTest.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen.Tests/WithParameterValueTest.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;

test/Microsoft.DotNet.Kusto.Tests/CsvWriterTests.cs

@@ -4,7 +4,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using NUnit.Framework;
 
 namespace Microsoft.DotNet.Kusto.Tests;

test/Microsoft.DotNet.Kusto.Tests/KustoClientProviderTests.cs

@@ -8,7 +8,7 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Kusto.Cloud.Platform.Utils;
 using Kusto.Data;
 using Kusto.Data.Common;

test/Microsoft.DotNet.Kusto.Tests/KustoHelpersTests.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using Kusto.Data.Common;
 using Kusto.Ingest;
 using Microsoft.DotNet.Internal.Testing.Utility;

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/AsyncInterceptorTests.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Castle.DynamicProxy;
-using FluentAssertions;
+using AwesomeAssertions;
 using Moq;
 using NUnit.Framework;
 

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/DelegatedServiceTest.cs

@@ -3,15 +3,12 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentAssertions;
-using FluentAssertions.Execution;
-using FluentAssertions.Specialized;
+using AwesomeAssertions;
+using AwesomeAssertions.Specialized;
 using Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions;
 using Microsoft.DotNet.Internal.Testing.Utility;
 using Microsoft.Extensions.DependencyInjection;
@@ -211,13 +208,8 @@ public static async Task<AndConstraint<AsyncFunctionAssertions<TTask, TAssertion
             where TTask : Task
             where TAssertions : AsyncFunctionAssertions<TTask, TAssertions>
     {
-        Execute.Assertion.ForCondition(parentConstraint.Subject != null)
-            .BecauseOf(because, becauseArgs)
-            .FailWith(
-                "Expected {context:task} to complete within {0}{reason}, but found <null>.",
-                new object[1]
-                    { timeSpan }
-            );
+        parentConstraint.Subject.Should().NotBeNull($"Expected task to complete within {timeSpan}{because}, but found <null>.");
+            
         using var timeoutCancellationTokenSource = new CancellationTokenSource();
         Task task = parentConstraint.Subject();
         Task completedTask = await Task.WhenAny(task, Task.Delay(timeSpan, timeoutCancellationTokenSource.Token)).ConfigureAwait(false);
@@ -226,10 +218,9 @@ public static async Task<AndConstraint<AsyncFunctionAssertions<TTask, TAssertion
             timeoutCancellationTokenSource.Cancel();
             await completedTask.ConfigureAwait(false);
         }
-        Execute.Assertion.ForCondition(completedTask != task).BecauseOf(because, becauseArgs).FailWith("Expected {context:task} not to complete within {0}{reason}.", new object[1]
-        {
-            timeSpan
-        });
+        
+        completedTask.Should().NotBe(task, $"Expected task not to complete within {timeSpan}{because}.");
+        
         var andConstraint = new AndConstraint<AsyncFunctionAssertions<TTask, TAssertions>>(parentConstraint as AsyncFunctionAssertions<TTask, TAssertions>);
         return andConstraint;
     }

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/DelegatedStatelessWebServiceStartupTests.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.IO;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/ExtensionsTests.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using NUnit.Framework;
 
 namespace Microsoft.DotNet.ServiceFabric.ServiceHost.Tests;

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/InvokeInNewScopeInterceptorTests.cs

@@ -3,10 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Fabric;
 using System.Linq;
 using Castle.DynamicProxy;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.DataContracts;
 using Microsoft.ApplicationInsights.Extensibility;

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/LoggingServiceInterceptorTests.cs

@@ -5,9 +5,8 @@
 using System.Collections.Generic;
 using System.Fabric;
 using System.Linq;
-using System.Reflection;
 using Castle.DynamicProxy;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.DataContracts;
 using Microsoft.ApplicationInsights.Extensibility;

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/LoggingServiceProxyInterceptorTests.cs

@@ -5,9 +5,8 @@
 using System.Collections.Generic;
 using System.Fabric;
 using System.Linq;
-using System.Reflection;
 using Castle.DynamicProxy;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.DataContracts;
 using Microsoft.ApplicationInsights.Extensibility;

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/ServiceHostTests.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.ApplicationInsights;
 using Microsoft.ApplicationInsights.Channel;
 using Microsoft.ApplicationInsights.DataContracts;

test/Microsoft.DotNet.ServiceFabric.ServiceHost.Tests/TemporaryFilesTest.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.IO;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.Extensions.Logging.Abstractions;
 using NUnit.Framework;
 

test/Microsoft.DotNet.Web.Authentication.Tests/DefaultAuthorizeActionModelConventionTests.cs

@@ -7,7 +7,7 @@
 using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using FluentAssertions;
+using AwesomeAssertions;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;