WI00856225 - Remove FluentAssertions from Blazor.Diagrams.Core.Tests

* FluentAssertion removed from chunk1 files

* FluentAssertion removed from chunk2 files

* Final FluentAssertion removed from chunk3 files

* Updated build.xml and release.xml to .net8 version

* updated build.xml for .net7 version

* Spelling change of PackageReference

* <HintPath> removed form Blazor.Diagram.csproj

* changes made in build.yml and Blazor.Diagram.csproj

* removed net7.0 from Directory.Build.props

* debugging

* changes made in Directory.Build.props

* Removal of trailing spaces

* Spaces and warnings removed

* actions/upload-artifact version changed from v3 to v4

* extra spaces removed

Author: Srude-Vena

.github/workflows/build.yml

@@ -21,8 +21,8 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
+            8.0.x
             6.0.x
-            3.1.x
 
     - name: Install dependencies
       run: dotnet restore
@@ -36,7 +36,7 @@ jobs:
 
     - name: Upload packages
       if: matrix.configuration == 'Release'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: package
         path: /home/runner/work/Blazor.Diagrams/Blazor.Diagrams/src/Blazor.Diagrams/bin/Release/*.nupkg

.github/workflows/release.yml

@@ -22,7 +22,9 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: |
+            8.0.x
+            6.0.x
 
       # Finds the latest release and increases the version
     - name: Get next version

src/Blazor.Diagrams.Core/Blazor.Diagrams.Core.csproj

@@ -28,9 +28,9 @@
     </None>
   </ItemGroup>
 
-	<ItemGroup>
-	  <PackageReference Include="SvgPathProperties" />
-    <PackageReference Include="Brutal.Dev.StrongNameSigner" PrivateAssets="All"/>
-	</ItemGroup>
+<ItemGroup>
+  <PackageReference Include="SvgPathProperties" />
+  <PackageReference Include="Brutal.Dev.StrongNameSigner" PrivateAssets="All"/>
+</ItemGroup>
 
 </Project>

src/Blazor.Diagrams/Blazor.Diagrams.csproj

@@ -20,11 +20,9 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Components" />
         <PackageReference Include="Microsoft.AspNetCore.Components.Web" />
-        <PacakgeReference Include="Brutal.Dev.StrongNameSigner" PrivateAssets="All" />
+        <PackageReference Include="Brutal.Dev.StrongNameSigner" PrivateAssets="All" />
         <!-- Reference the SvgPathProperties that we already strong name signed -->
-        <Reference Include="SvgPathProperties" PrivateAssets="All">
-          <HintPath>..\..\packages\svgpathproperties\1.1.2\lib\netstandard2.0\SvgPathProperties.dll</HintPath>
-        </Reference>
+        <PackageReference Include="SvgPathProperties" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup>

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

tests/Blazor.Diagrams.Core.Tests/Anchors/DynamicAnchorTests.cs

@@ -2,7 +2,6 @@
 using Blazor.Diagrams.Core.Geometry;
 using Blazor.Diagrams.Core.Models;
 using Blazor.Diagrams.Core.Positions;
-using FluentAssertions;
 using Xunit;
 
 namespace Blazor.Diagrams.Core.Tests.Anchors;
@@ -37,7 +36,7 @@ public void GetPosition_ShouldReturnNull_WhenNodesSizeIsNull()
         var position = anchor1.GetPosition(link);
 
         // Assert
-        position.Should().BeNull();
+        Assert.Null(position);
     }
 
     [Fact]
@@ -72,9 +71,9 @@ public void GetPosition_ShouldReturnClosestPositionToOtherNodesCenter_WhenRouteI
         var position = anchor1.GetPosition(link);
 
         // Assert
-        position.Should().NotBeNull();
-        position!.X.Should().Be(220);
-        position.Y.Should().Be(95);
+        Assert.NotNull(position);
+        Assert.Equal(220,position!.X);
+        Assert.Equal(95, position.Y);
     }
 
     [Fact]
@@ -109,9 +108,9 @@ public void GetPosition_ShouldReturnClosestPositionToOtherNodesCenterWithOffset_
         var position = anchor1.GetPosition(link);
 
         // Assert
-        position.Should().NotBeNull();
-        position!.X.Should().Be(230);
-        position.Y.Should().Be(85);
+        Assert.NotNull(position);
+        Assert.Equal(230, position!.X);
+        Assert.Equal(85, position.Y);
     }
 
     [Fact]
@@ -149,9 +148,9 @@ public void GetPosition_ShouldReturnClosestPositionToFirstVertex_WhenRouteIsNotE
         });
 
         // Assert
-        position.Should().NotBeNull();
-        position!.X.Should().Be(220);
-        position.Y.Should().Be(125);
+        Assert.NotNull(position);
+        Assert.Equal(220, position!.X);
+        Assert.Equal(125, position.Y);
     }
 
     [Fact]
@@ -189,8 +188,8 @@ public void GetPosition_ShouldReturnClosestPositionToLastVertex_WhenRouteIsNotEm
         });
 
         // Assert
-        position.Should().NotBeNull();
-        position!.X.Should().Be(300);
-        position.Y.Should().Be(120);
+        Assert.NotNull(position);
+        Assert.Equal(300, position!.X);
+        Assert.Equal(120, position.Y);
     }
 }

tests/Blazor.Diagrams.Core.Tests/Anchors/ShapeIntersectionAnchorTests.cs

@@ -3,7 +3,6 @@
 using Blazor.Diagrams.Core.Anchors;
 using Blazor.Diagrams.Core.Geometry;
 using Blazor.Diagrams.Core.Models;
-using FluentAssertions;
 using Moq;
 using Xunit;
 
@@ -27,8 +26,8 @@ public void GetPlainPosition_ShouldReturnNodeCenter()
 
         // Assert
         var center = node.GetBounds()!.Center;
-        position.X.Should().Be(center.X);
-        position.Y.Should().Be(center.Y);
+        Assert.Equal(center.X, position.X);
+        Assert.Equal(center.Y, position.Y);
     }
 
     [Fact]
@@ -43,7 +42,7 @@ public void GetPosition_ShouldReturnNull_WhenNodeSizeIsNull()
         var position = anchor.GetPosition(link);
 
         // Assert
-        position.Should().BeNull();
+        Assert.Null(position);
     }
 
     [Fact]
@@ -67,8 +66,8 @@ public void GetPosition_ShouldUseRouteToFindOtherPositionForIntersection_WhenSou
 
         // Assert
         var line = args.Single();
-        line.Start.Should().BeEquivalentTo(route[0]);
-        line.End.Should().BeEquivalentTo(node.GetBounds()!.Center);
+        Assert.Equal(route[0],line.Start);
+        Assert.Equal(node.GetBounds()!.Center, line.End);
     }
 
     [Fact]
@@ -93,8 +92,8 @@ public void GetPosition_ShouldUseRouteToFindOtherPositionForIntersection_WhenTar
 
         // Assert
         var line = args.Single();
-        line.Start.Should().BeEquivalentTo(route[^1]);
-        line.End.Should().BeEquivalentTo(node.GetBounds()!.Center);
+        Assert.Equal(route[^1],line.Start);
+        Assert.Equal(node.GetBounds()!.Center,line.End);
     }
 
     [Fact]
@@ -120,8 +119,8 @@ public void GetPosition_ShouldCallOtherGetPlainPosition_WhenNoRoute()
 
         // Assert
         var line = args.Single();
-        line.Start.Should().BeEquivalentTo(pt);
-        line.End.Should().BeEquivalentTo(node.GetBounds()!.Center);
+        Assert.Equal(pt,line.Start);
+        Assert.Equal(node.GetBounds()!.Center, line.End);
     }
 
     [Fact]
@@ -145,7 +144,7 @@ public void GetPosition_ShouldReturnNull_WhenOtherPositionIsNull()
         var position = source.GetPosition(link);
 
         // Assert
-        position.Should().BeNull();
+        Assert.Null(position);
     }
 
     private class CustomNodeModel : NodeModel

tests/Blazor.Diagrams.Core.Tests/Anchors/SinglePortAnchorTests.cs

@@ -1,7 +1,6 @@
 using Blazor.Diagrams.Core.Anchors;
 using Blazor.Diagrams.Core.Geometry;
 using Blazor.Diagrams.Core.Models;
-using FluentAssertions;
 using Moq;
 using Xunit;
 
@@ -26,8 +25,8 @@ public void GetPlainPosition_ShouldReturnMiddlePosition()
 
         // Assert
         var mp = port.MiddlePosition;
-        position.X.Should().Be(mp.X);
-        position.Y.Should().Be(mp.Y);
+        Assert.Equal(mp.X, position.X);
+        Assert.Equal(mp.Y, position.Y);
     }
 
     [Fact]
@@ -47,7 +46,7 @@ public void GetPosition_ShouldReturnNull_WhenPortNotInitialized()
         var position = anchor.GetPosition(link);
 
         // Assert
-        position.Should().BeNull();
+        Assert.Null(position);
     }
 
     [Fact]
@@ -72,8 +71,8 @@ public void GetPosition_ShouldReturnMiddlePosition_WhenMiddleIfNoMarker()
 
         // Assert
         var mp = port.MiddlePosition;
-        position.X.Should().Be(mp.X);
-        position.Y.Should().Be(mp.Y);
+        Assert.Equal(mp.X, position.X);
+        Assert.Equal(mp.Y, position.Y);
     }
 
     [Theory]
@@ -106,8 +105,8 @@ public void GetPosition_ShouldReturnAlignmentBasedPosition_WhenUseShapeAndAlignm
         var position = anchor.GetPosition(link)!;
 
         // Assert
-        position.X.Should().Be(x);
-        position.Y.Should().Be(y);
+        Assert.Equal(x, position.X);
+        Assert.Equal(y, position.Y);
     }
 
     [Theory]
@@ -139,7 +138,7 @@ public void GetPosition_ShouldUsePointAtAngle_WhenUseShapeAndAlignmentIsTrue(Por
 
         // Act
         var position = anchor.GetPosition(link)!;
-        
+
         // Assert
         shapeMock.Verify(s => s.GetPointAtAngle(angle), Times.Once);
     }

tests/Blazor.Diagrams.Core.Tests/Behaviors/DragMovablesBehaviorTests.cs

@@ -3,7 +3,6 @@
 using Blazor.Diagrams.Core.Geometry;
 using Blazor.Diagrams.Core.Models;
 using Blazor.Diagrams.Core.Options;
-using FluentAssertions;
 using Moq;
 using Xunit;
 
@@ -79,7 +78,7 @@ public void Behavior_ShouldTriggerMoved()
             new PointerEventArgs(150, 150, 0, 0, false, false, false, 0, 0, 0, 0, 0, 0, string.Empty, true));
 
         // Assert
-        movedTrigger.Should().BeTrue();
+        Assert.True(movedTrigger);
     }
 
     [Fact]
@@ -99,7 +98,7 @@ public void Behavior_ShouldNotTriggerMoved_WhenMovableDidntMove()
             new PointerEventArgs(150, 150, 0, 0, false, false, false, 0, 0, 0, 0, 0, 0, string.Empty, true));
 
         // Assert
-        movedTrigger.Should().BeFalse();
+        Assert.False(movedTrigger);
     }
 
     [Fact]