From 52c2f0d9185cf66ddbcafbb16250ebcfde1cd726 Mon Sep 17 00:00:00 2001
From: Mihail Gribkov <61027276+Misha-133@users.noreply.github.com>
Date: Sat, 25 Jan 2025 23:10:59 +0300
Subject: [PATCH] yeet `FluentAssertions` (#3061)

---
 test/Discord.Net.Tests.Integration/ChannelsTests.cs        | 3 ---
 .../Discord.Net.Tests.Integration.csproj                   | 2 +-
 .../DiscordRestApiClientTests.cs                           | 7 ++++---
 .../DiscordRestClientFixture.cs                            | 1 -
 test/Discord.Net.Tests.Integration/GuildTests.cs           | 2 --
 test/Discord.Net.Tests.Integration/RestGuildFixture.cs     | 3 ---
 test/Discord.Net.Tests.Unit/ColorTests.cs                  | 2 --
 test/Discord.Net.Tests.Unit/CommandBuilderTests.cs         | 2 --
 test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj  | 1 -
 test/Discord.Net.Tests.Unit/EmoteTests.cs                  | 2 --
 test/Discord.Net.Tests.Unit/FormatTests.cs                 | 3 ---
 test/Discord.Net.Tests.Unit/GuildHelperTests.cs            | 1 -
 test/Discord.Net.Tests.Unit/GuildPermissionsTests.cs       | 1 -
 test/Discord.Net.Tests.Unit/MentionUtilsTests.cs           | 2 --
 test/Discord.Net.Tests.Unit/SnowflakeUtilsTests.cs         | 2 --
 test/Discord.Net.Tests.Unit/TokenUtilsTests.cs             | 2 --
 test/Discord.Net.Tests.Unit/TypeReaderTests.cs             | 1 -
 17 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/test/Discord.Net.Tests.Integration/ChannelsTests.cs b/test/Discord.Net.Tests.Integration/ChannelsTests.cs
index 3bf60772..495eef13 100644
--- a/test/Discord.Net.Tests.Integration/ChannelsTests.cs
+++ b/test/Discord.Net.Tests.Integration/ChannelsTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
index 5e634015..2e0cd266 100644
--- a/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
+++ b/test/Discord.Net.Tests.Integration/Discord.Net.Tests.Integration.csproj
@@ -14,8 +14,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
diff --git a/test/Discord.Net.Tests.Integration/DiscordRestApiClientTests.cs b/test/Discord.Net.Tests.Integration/DiscordRestApiClientTests.cs
index 5b383061..d1b3ab5d 100644
--- a/test/Discord.Net.Tests.Integration/DiscordRestApiClientTests.cs
+++ b/test/Discord.Net.Tests.Integration/DiscordRestApiClientTests.cs
@@ -2,12 +2,13 @@ using Discord.API;
 using Discord.API.Rest;
 using Discord.Net;
 using Discord.Rest;
-using FluentAssertions;
 using System;
 using System.IO;
 using System.Threading.Tasks;
 using Xunit;
 
+using Shouldly;
+
 namespace Discord;
 
 [CollectionDefinition(nameof(DiscordRestApiClientTests), DisableParallelization = true)]
@@ -47,7 +48,7 @@ public class DiscordRestApiClientTests : IClassFixture<RestGuildFixture>, IAsync
         Func<Task> upload = async () =>
             await _apiClient.UploadFileAsync(_channel.Id, new UploadFileParams(new FileAttachment(stream, "filename")));
 
-        await upload.Should().ThrowExactlyAsync<HttpException>()
-                 .Where(e => e.DiscordCode == DiscordErrorCode.RequestEntityTooLarge);
+        var exception = await upload.ShouldThrowAsync<HttpException>();
+        exception.DiscordCode.ShouldBe(DiscordErrorCode.RequestEntityTooLarge);
     }
 }
diff --git a/test/Discord.Net.Tests.Integration/DiscordRestClientFixture.cs b/test/Discord.Net.Tests.Integration/DiscordRestClientFixture.cs
index 093a55da..c1939d91 100644
--- a/test/Discord.Net.Tests.Integration/DiscordRestClientFixture.cs
+++ b/test/Discord.Net.Tests.Integration/DiscordRestClientFixture.cs
@@ -1,6 +1,5 @@
 using Discord.Rest;
 using System;
-using Xunit;
 
 namespace Discord
 {
diff --git a/test/Discord.Net.Tests.Integration/GuildTests.cs b/test/Discord.Net.Tests.Integration/GuildTests.cs
index 44766d02..c29b017b 100644
--- a/test/Discord.Net.Tests.Integration/GuildTests.cs
+++ b/test/Discord.Net.Tests.Integration/GuildTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/test/Discord.Net.Tests.Integration/RestGuildFixture.cs b/test/Discord.Net.Tests.Integration/RestGuildFixture.cs
index be7a7416..1b5f2e7c 100644
--- a/test/Discord.Net.Tests.Integration/RestGuildFixture.cs
+++ b/test/Discord.Net.Tests.Integration/RestGuildFixture.cs
@@ -1,8 +1,5 @@
 using Discord.Rest;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace Discord
 {
diff --git a/test/Discord.Net.Tests.Unit/ColorTests.cs b/test/Discord.Net.Tests.Unit/ColorTests.cs
index 6259238e..f8e1bddc 100644
--- a/test/Discord.Net.Tests.Unit/ColorTests.cs
+++ b/test/Discord.Net.Tests.Unit/ColorTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Discord
diff --git a/test/Discord.Net.Tests.Unit/CommandBuilderTests.cs b/test/Discord.Net.Tests.Unit/CommandBuilderTests.cs
index 22df7cc3..39898f6a 100644
--- a/test/Discord.Net.Tests.Unit/CommandBuilderTests.cs
+++ b/test/Discord.Net.Tests.Unit/CommandBuilderTests.cs
@@ -1,5 +1,3 @@
-using Discord;
-using System;
 using Xunit;
 
 namespace Discord;
diff --git a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
index c028a79b..bd2ec418 100644
--- a/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
+++ b/test/Discord.Net.Tests.Unit/Discord.Net.Tests.Unit.csproj
@@ -12,7 +12,6 @@
     <ProjectReference Include="../../src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NSubstitute" Version="5.3.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
diff --git a/test/Discord.Net.Tests.Unit/EmoteTests.cs b/test/Discord.Net.Tests.Unit/EmoteTests.cs
index a4f44170..eeadbddf 100644
--- a/test/Discord.Net.Tests.Unit/EmoteTests.cs
+++ b/test/Discord.Net.Tests.Unit/EmoteTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Discord
diff --git a/test/Discord.Net.Tests.Unit/FormatTests.cs b/test/Discord.Net.Tests.Unit/FormatTests.cs
index c015c7e1..e1aeead6 100644
--- a/test/Discord.Net.Tests.Unit/FormatTests.cs
+++ b/test/Discord.Net.Tests.Unit/FormatTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Discord
diff --git a/test/Discord.Net.Tests.Unit/GuildHelperTests.cs b/test/Discord.Net.Tests.Unit/GuildHelperTests.cs
index b05e5ff4..092526ca 100644
--- a/test/Discord.Net.Tests.Unit/GuildHelperTests.cs
+++ b/test/Discord.Net.Tests.Unit/GuildHelperTests.cs
@@ -1,5 +1,4 @@
 using Discord.Rest;
-using NSubstitute;
 using System;
 using Xunit;
 
diff --git a/test/Discord.Net.Tests.Unit/GuildPermissionsTests.cs b/test/Discord.Net.Tests.Unit/GuildPermissionsTests.cs
index 438f69f5..3aca32af 100644
--- a/test/Discord.Net.Tests.Unit/GuildPermissionsTests.cs
+++ b/test/Discord.Net.Tests.Unit/GuildPermissionsTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Discord
diff --git a/test/Discord.Net.Tests.Unit/MentionUtilsTests.cs b/test/Discord.Net.Tests.Unit/MentionUtilsTests.cs
index b59b9f39..d41bdcf3 100644
--- a/test/Discord.Net.Tests.Unit/MentionUtilsTests.cs
+++ b/test/Discord.Net.Tests.Unit/MentionUtilsTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Discord
diff --git a/test/Discord.Net.Tests.Unit/SnowflakeUtilsTests.cs b/test/Discord.Net.Tests.Unit/SnowflakeUtilsTests.cs
index f7cbf929..805fd94c 100644
--- a/test/Discord.Net.Tests.Unit/SnowflakeUtilsTests.cs
+++ b/test/Discord.Net.Tests.Unit/SnowflakeUtilsTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Discord
diff --git a/test/Discord.Net.Tests.Unit/TokenUtilsTests.cs b/test/Discord.Net.Tests.Unit/TokenUtilsTests.cs
index 4306fa9e..abb50d46 100644
--- a/test/Discord.Net.Tests.Unit/TokenUtilsTests.cs
+++ b/test/Discord.Net.Tests.Unit/TokenUtilsTests.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using Xunit;
 
 namespace Discord
diff --git a/test/Discord.Net.Tests.Unit/TypeReaderTests.cs b/test/Discord.Net.Tests.Unit/TypeReaderTests.cs
index 39ea71a4..41f1d1dc 100644
--- a/test/Discord.Net.Tests.Unit/TypeReaderTests.cs
+++ b/test/Discord.Net.Tests.Unit/TypeReaderTests.cs
@@ -1,7 +1,6 @@
 using Discord.Commands;
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Xunit;