Merge pull request #25 from CNBoland/Support_FluentAssertions_v6.0

faddiv · web-flow · commit 7494e0ee5bfc · 2021-08-18T09:50:00.000+02:00
Add support for FluentAssertions v6.0.
diff --git a/src/FluentAssertions.AspNetCore.Mvc.Ref/FluentAssertions.AspNetCore.Mvc.Ref.csproj b/src/FluentAssertions.AspNetCore.Mvc.Ref/FluentAssertions.AspNetCore.Mvc.Ref.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.0.0" />
+    <PackageReference Include="FluentAssertions" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/src/FluentAssertions.AspNetCore.Mvc/ActionResultAssertions.cs b/src/FluentAssertions.AspNetCore.Mvc/ActionResultAssertions.cs
@@ -18,7 +18,6 @@ public class ActionResultAssertions : ObjectAssertions
         /// </summary>
         public ActionResultAssertions(IActionResult subject) : base(subject)
         {
-            Subject = subject;
         }
 
         #endregion Public Constructors
diff --git a/src/FluentAssertions.AspNetCore.Mvc/ActionResultAssertionsOfTValue.cs b/src/FluentAssertions.AspNetCore.Mvc/ActionResultAssertionsOfTValue.cs
@@ -17,9 +17,8 @@ public class ActionResultAssertions<TValue> : ReferenceTypeAssertions<ActionResu
         /// <summary>
         /// Initializes a new instance of the <see cref="ActionResultAssertions{TValue}" /> class.
         /// </summary>
-        public ActionResultAssertions(ActionResult<TValue> subject)
+        public ActionResultAssertions(ActionResult<TValue> subject) : base(subject)
         {
-            Subject = subject;
         }
 
         #endregion Public Constructors
diff --git a/src/FluentAssertions.AspNetCore.Mvc/AssertionHelpers.cs b/src/FluentAssertions.AspNetCore.Mvc/AssertionHelpers.cs
@@ -30,7 +30,7 @@ internal static void AssertStringObjectDictionary<TKey, TValue>(
                 {
                     Execute.Assertion
                         .BecauseOf(reason, reasonArgs)
-                        .ForCondition(actual.IsSameOrEqualTo(expectedValue))
+                        .ForCondition(Equals(actual, expectedValue))
                         .FailWith("Expected {context} to contain value {0} at key {1}{reason} but found {2}.", expectedValue, key, actual);
                 }
                 else
diff --git a/src/FluentAssertions.AspNetCore.Mvc/ConvertToActionResultAssertions.cs b/src/FluentAssertions.AspNetCore.Mvc/ConvertToActionResultAssertions.cs
@@ -13,9 +13,8 @@ public class ConvertToActionResultAssertions : ReferenceTypeAssertions<IConvertT
         /// <summary>
         /// Initializes a new instance of the <see cref="ConvertToActionResultAssertions" /> class.
         /// </summary>
-        public ConvertToActionResultAssertions(IConvertToActionResult subject)
+        public ConvertToActionResultAssertions(IConvertToActionResult subject) : base(subject)
         {
-            Subject = subject;
         }
 
         /// <inheritdoc />
diff --git a/src/FluentAssertions.AspNetCore.Mvc/FluentAssertions.AspNetCore.Mvc.csproj b/src/FluentAssertions.AspNetCore.Mvc/FluentAssertions.AspNetCore.Mvc.csproj
@@ -24,7 +24,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.0.0" />
+    <PackageReference Include="FluentAssertions" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/src/FluentAssertions.AspNetCore.Mvc/ObjectResultAssertionsBase.cs b/src/FluentAssertions.AspNetCore.Mvc/ObjectResultAssertionsBase.cs
@@ -184,7 +184,7 @@ public TObjectResultAssertion WithValue(object expectedValue, string reason = ""
 
             Execute.Assertion
                 .BecauseOf(reason, reasonArgs)
-                .ForCondition(actualValue.IsSameOrEqualTo(expectedValue))
+                .ForCondition(Equals(actualValue, expectedValue))
                 .WithDefaultIdentifier(Identifier + ".Value")
                 .FailWith(FailureMessages.CommonFailMessage, expectedValue, actualValue);
 
diff --git a/src/FluentAssertions.AspNetCore.Mvc/RedirectToRouteAssertions.cs b/src/FluentAssertions.AspNetCore.Mvc/RedirectToRouteAssertions.cs
@@ -17,9 +17,8 @@ public class RedirectToRouteAssertions : ReferenceTypeAssertions<RedirectToRoute
         /// <summary>
         /// Initializes a new instance of the <see cref="ContentResultAssertions" /> class.
         /// </summary>
-        public RedirectToRouteAssertions(RedirectToRouteResult subject)
+        public RedirectToRouteAssertions(RedirectToRouteResult subject) : base(subject)
         {
-            Subject = subject;
         }
 
         #endregion Public Constructors
diff --git a/src/FluentAssertions.AspNetCore.Mvc/RouteDataAssertions.cs b/src/FluentAssertions.AspNetCore.Mvc/RouteDataAssertions.cs
@@ -17,7 +17,6 @@ public class RouteDataAssertions : ObjectAssertions
         public RouteDataAssertions(RouteData subject)
             : base(subject)
         {
-            Subject = subject;
         }
 
         /// <summary>
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/FluentAssertions.AspNetCore.Mvc.Tests.csproj b/tests/FluentAssertions.AspNetCore.Mvc.Tests/FluentAssertions.AspNetCore.Mvc.Tests.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
     <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/Helpers/FailureMessageHelper.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/Helpers/FailureMessageHelper.cs
@@ -97,24 +97,24 @@ public static string AuthenticationPropertiesExpectations(object containingObjec
 
 Microsoft.AspNetCore.Authentication.AuthenticationProperties
 {
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
+    AllowRefresh = <null>, 
+    ExpiresUtc = <null>, 
+    IsPersistent = False, 
+    IssuedUtc = <null>, 
+    Items = {empty}, 
+    Parameters = {empty}, 
+    RedirectUri = <null>
 } because it is 10 but found 
 
 Microsoft.AspNetCore.Authentication.AuthenticationProperties
 {
-   AllowRefresh = <null>
-   ExpiresUtc = <null>
-   IsPersistent = False
-   IssuedUtc = <null>
-   Items = {empty}
-   Parameters = {empty}
-   RedirectUri = <null>
+    AllowRefresh = <null>, 
+    ExpiresUtc = <null>, 
+    IsPersistent = False, 
+    IssuedUtc = <null>, 
+    Items = {empty}, 
+    Parameters = {empty}, 
+    RedirectUri = <null>
 }.";
             return failureMessage;
         }
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/ObjectResultAssertions_Tests.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/ObjectResultAssertions_Tests.cs
@@ -262,16 +262,23 @@ public void WithValueEquivalentTo_GivenExpected_ShouldPass()
         public void WithValueEquivalentTo_GivenUnexpected_ShouldFail()
         {
             var result = new ObjectResult(WrongObject);
-            string failureMessage = @"Expected member Value to be 
-""testValue"" with a length of 9 because it is 10, but 
-""wrongValue"" has a length of 10.
+#if DEBUG
+            var actualRef = "actualValue";
+#else
+            var actualRef = "root";
+#endif
+            string failureMessage = $@"Expected property {actualRef}.Value to be ""testValue"" with a length of 9 because it is 10, but ""wrongValue"" has a length of 10, differs near ""wro"" (index 0).
 
 With configuration:
 - Use declared types and members
 - Compare enums by value
+- Compare tuples by their properties
+- Compare anonymous types by their properties
+- Compare records by their members
 - Match member by name (or throw)
+- Be strict about the order of items in byte arrays
 - Without automatic conversion.
-- Be strict about the order of items in byte arrays";
+";
 
             Action a = () => result.Should().BeObjectResult().WithValueEquivalentTo(GoodObject, Reason, ReasonArgs);
 
diff --git a/tests/FluentAssertions.AspNetCore.Mvc.Tests/SignInResultAssertions_Tests.cs b/tests/FluentAssertions.AspNetCore.Mvc.Tests/SignInResultAssertions_Tests.cs
@@ -339,20 +339,16 @@ public void WithPrincipal_GivenUnexpected_ShouldFail()
         {
             var excpectedClaimsPrincipal = new ClaimsPrincipal();
             ActionResult result = new SignInResult(TestAuthenticationScheme, TestClaimsPrincipal);
-            var failureMessage = @"Expected SignInResult.Principal to be 
-
-System.Security.Claims.ClaimsPrincipal
+            var failureMessage = @"Expected SignInResult.Principal to be System.Security.Claims.ClaimsPrincipal
 {
-   Claims = {empty}
-   Identities = {empty}
-   Identity = <null>
-} because it is 10 but found 
-
-System.Security.Claims.ClaimsPrincipal
+    Claims = {empty}, 
+    Identities = {empty}, 
+    Identity = <null>
+} because it is 10 but found System.Security.Claims.ClaimsPrincipal
 {
-   Claims = {empty}
-   Identities = {empty}
-   Identity = <null>
+    Claims = {empty}, 
+    Identities = {empty}, 
+    Identity = <null>
 }.";
 
             Action a = () => result.Should().BeSignInResult().WithPrincipal(excpectedClaimsPrincipal, Reason, ReasonArgs);

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ public class ActionResultAssertions : ObjectAssertions`
`18`	`18`	`/// </summary>`
`19`	`19`	`public ActionResultAssertions(IActionResult subject) : base(subject)`
`20`	`20`	`{`
`21`		`- Subject = subject;`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`#endregion Public Constructors`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,8 @@ public class ActionResultAssertions<TValue> : ReferenceTypeAssertions<ActionResu`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// Initializes a new instance of the <see cref="ActionResultAssertions{TValue}" /> class.`
`19`	`19`	`/// </summary>`
`20`		`- public ActionResultAssertions(ActionResult<TValue> subject)`
	`20`	`+ public ActionResultAssertions(ActionResult<TValue> subject) : base(subject)`
`21`	`21`	`{`
`22`		`- Subject = subject;`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`#endregion Public Constructors`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ internal static void AssertStringObjectDictionary<TKey, TValue>(`
`30`	`30`	`{`
`31`	`31`	`Execute.Assertion`
`32`	`32`	`.BecauseOf(reason, reasonArgs)`
`33`		`- .ForCondition(actual.IsSameOrEqualTo(expectedValue))`
	`33`	`+ .ForCondition(Equals(actual, expectedValue))`
`34`	`34`	`.FailWith("Expected {context} to contain value {0} at key {1}{reason} but found {2}.", expectedValue, key, actual);`
`35`	`35`	`}`
`36`	`36`	`else`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,8 @@ public class ConvertToActionResultAssertions : ReferenceTypeAssertions<IConvertT`
`13`	`13`	`/// <summary>`
`14`	`14`	`/// Initializes a new instance of the <see cref="ConvertToActionResultAssertions" /> class.`
`15`	`15`	`/// </summary>`
`16`		`- public ConvertToActionResultAssertions(IConvertToActionResult subject)`
	`16`	`+ public ConvertToActionResultAssertions(IConvertToActionResult subject) : base(subject)`
`17`	`17`	`{`
`18`		`- Subject = subject;`
`19`	`18`	`}`
`20`	`19`
`21`	`20`	`/// <inheritdoc />`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,8 @@ public class RedirectToRouteAssertions : ReferenceTypeAssertions<RedirectToRoute`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// Initializes a new instance of the <see cref="ContentResultAssertions" /> class.`
`19`	`19`	`/// </summary>`
`20`		`- public RedirectToRouteAssertions(RedirectToRouteResult subject)`
	`20`	`+ public RedirectToRouteAssertions(RedirectToRouteResult subject) : base(subject)`
`21`	`21`	`{`
`22`		`- Subject = subject;`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`#endregion Public Constructors`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ public class RouteDataAssertions : ObjectAssertions`
`17`	`17`	`public RouteDataAssertions(RouteData subject)`
`18`	`18`	`: base(subject)`
`19`	`19`	`{`
`20`		`- Subject = subject;`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`/// <summary>`