diff --git a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
index 8ab398ff5..6eb03da25 100644
--- a/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
+++ b/src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
@@ -7,7 +7,7 @@
netstandard1.3
-
+
diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj
index 7565fa178..88858ef06 100644
--- a/src/Discord.Net.Core/Discord.Net.Core.csproj
+++ b/src/Discord.Net.Core/Discord.Net.Core.csproj
@@ -8,8 +8,8 @@
netstandard1.1;netstandard1.3
-
-
+
+
diff --git a/src/Discord.Net.Rest/Discord.Net.Rest.csproj b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
index 0eb07a4b2..c71a93484 100644
--- a/src/Discord.Net.Rest/Discord.Net.Rest.csproj
+++ b/src/Discord.Net.Rest/Discord.Net.Rest.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/src/Discord.Net.Rest/Net/Converters/DiscordContractResolver.cs b/src/Discord.Net.Rest/Net/Converters/DiscordContractResolver.cs
index 9213c5d75..8a3c1037b 100644
--- a/src/Discord.Net.Rest/Net/Converters/DiscordContractResolver.cs
+++ b/src/Discord.Net.Rest/Net/Converters/DiscordContractResolver.cs
@@ -1,4 +1,4 @@
-using Discord.API;
+using Discord.API;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using System;
@@ -25,7 +25,6 @@ namespace Discord.Net.Converters
if (converter != null)
{
property.Converter = converter;
- property.MemberConverter = converter;
}
}
else
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
index 251cdb18b..5982d1a4b 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
@@ -13,6 +13,6 @@
-
+
diff --git a/test/Discord.Net.Tests/Discord.Net.Tests.csproj b/test/Discord.Net.Tests/Discord.Net.Tests.csproj
index 204dca5c4..9284b5644 100644
--- a/test/Discord.Net.Tests/Discord.Net.Tests.csproj
+++ b/test/Discord.Net.Tests/Discord.Net.Tests.csproj
@@ -21,10 +21,10 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/test/Discord.Net.Tests/Tests.ChannelPermissions.cs b/test/Discord.Net.Tests/Tests.ChannelPermissions.cs
index b37a1195e..da969b320 100644
--- a/test/Discord.Net.Tests/Tests.ChannelPermissions.cs
+++ b/test/Discord.Net.Tests/Tests.ChannelPermissions.cs
@@ -84,7 +84,7 @@ namespace Discord
Assert.Equal(groupChannel, ChannelPermissions.Group.RawValue);
return Task.CompletedTask;
}
-
+ [Fact]
public Task TestChannelPermissionModify()
{
// test channel permission modify
diff --git a/test/Discord.Net.Tests/Tests.Channels.cs b/test/Discord.Net.Tests/Tests.Channels.cs
index b528ca5fb..cd629faa4 100644
--- a/test/Discord.Net.Tests/Tests.Channels.cs
+++ b/test/Discord.Net.Tests/Tests.Channels.cs
@@ -49,35 +49,35 @@ namespace Discord
}
private static void CheckTextChannels(RestGuild guild, params RestTextChannel[] textChannels)
{
- Assert.Equal(textChannels.Length, 5);
+ Assert.Equal(5, textChannels.Length);
Assert.All(textChannels, x =>
{
Assert.NotNull(x);
- Assert.NotEqual(x.Id, 0UL);
+ Assert.NotEqual(0UL, x.Id);
Assert.True(x.Position >= 0);
});
- var text1 = textChannels.Where(x => x.Name == "text1").FirstOrDefault();
- var text2 = textChannels.Where(x => x.Name == "text2").FirstOrDefault();
- var text3 = textChannels.Where(x => x.Name == "text3").FirstOrDefault();
- var text4 = textChannels.Where(x => x.Name == "text4").FirstOrDefault();
- var text5 = textChannels.Where(x => x.Name == "text5").FirstOrDefault();
+ var text1 = textChannels.FirstOrDefault(x => x.Name == "text1");
+ var text2 = textChannels.FirstOrDefault(x => x.Name == "text2");
+ var text3 = textChannels.FirstOrDefault(x => x.Name == "text3");
+ var text4 = textChannels.FirstOrDefault(x => x.Name == "text4");
+ var text5 = textChannels.FirstOrDefault(x => x.Name == "text5");
Assert.NotNull(text1);
//Assert.True(text1.Id == guild.DefaultChannelId);
- Assert.Equal(text1.Position, 1);
- Assert.Equal(text1.Topic, "Topic1");
+ Assert.Equal(1, text1.Position);
+ Assert.Equal("Topic1", text1.Topic);
Assert.NotNull(text2);
- Assert.Equal(text2.Position, 2);
+ Assert.Equal(2, text2.Position);
Assert.Null(text2.Topic);
Assert.NotNull(text3);
- Assert.Equal(text3.Topic, "Topic2");
+ Assert.Equal("Topic2", text3.Topic);
Assert.NotNull(text4);
- Assert.Equal(text4.Position, 3);
- Assert.Equal(text4.Topic, "Topic2");
+ Assert.Equal(3, text4.Position);
+ Assert.Equal("Topic2", text4.Topic);
Assert.NotNull(text5);
Assert.Null(text5.Topic);
@@ -114,31 +114,31 @@ namespace Discord
}
private static void CheckVoiceChannels(params RestVoiceChannel[] voiceChannels)
{
- Assert.Equal(voiceChannels.Length, 3);
+ Assert.Equal(3, voiceChannels.Length);
Assert.All(voiceChannels, x =>
{
Assert.NotNull(x);
- Assert.NotEqual(x.Id, 0UL);
- Assert.NotEqual(x.UserLimit, 0);
+ Assert.NotEqual(0UL, x.Id);
+ Assert.NotEqual(0, x.UserLimit);
Assert.True(x.Bitrate > 0);
Assert.True(x.Position >= 0);
});
- var voice1 = voiceChannels.Where(x => x.Name == "voice1").FirstOrDefault();
- var voice2 = voiceChannels.Where(x => x.Name == "voice2").FirstOrDefault();
- var voice3 = voiceChannels.Where(x => x.Name == "voice3").FirstOrDefault();
+ var voice1 = voiceChannels.FirstOrDefault(x => x.Name == "voice1");
+ var voice2 = voiceChannels.FirstOrDefault(x => x.Name == "voice2");
+ var voice3 = voiceChannels.FirstOrDefault(x => x.Name == "voice3");
Assert.NotNull(voice1);
- Assert.Equal(voice1.Bitrate, 96000);
- Assert.Equal(voice1.Position, 1);
+ Assert.Equal(96000, voice1.Bitrate);
+ Assert.Equal(1, voice1.Position);
Assert.NotNull(voice2);
- Assert.Equal(voice2.UserLimit, null);
+ Assert.Null(voice2.UserLimit);
Assert.NotNull(voice3);
- Assert.Equal(voice3.Bitrate, 8000);
- Assert.Equal(voice3.Position, 1);
- Assert.Equal(voice3.UserLimit, 16);
+ Assert.Equal(8000, voice3.Bitrate);
+ Assert.Equal(1, voice3.Position);
+ Assert.Equal(16, voice3.UserLimit);
}
}
-}
\ No newline at end of file
+}
diff --git a/test/Discord.Net.Tests/Tests.Colors.cs b/test/Discord.Net.Tests/Tests.Colors.cs
index 591778972..10b0bbdac 100644
--- a/test/Discord.Net.Tests/Tests.Colors.cs
+++ b/test/Discord.Net.Tests/Tests.Colors.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using Xunit;
namespace Discord
@@ -12,6 +12,7 @@ namespace Discord
Assert.Equal(uint.MinValue, new Color(uint.MinValue).RawValue);
Assert.Equal(uint.MaxValue, new Color(uint.MaxValue).RawValue);
}
+ [Fact]
public void Color_Default()
{
Assert.Equal(0u, Color.Default.RawValue);
diff --git a/test/Discord.Net.Tests/Tests.Emotes.cs b/test/Discord.Net.Tests/Tests.Emotes.cs
index 334975ce4..eeadbddf8 100644
--- a/test/Discord.Net.Tests/Tests.Emotes.cs
+++ b/test/Discord.Net.Tests/Tests.Emotes.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using Xunit;
namespace Discord
@@ -34,6 +34,7 @@ namespace Discord
Assert.Equal(DateTimeOffset.FromUnixTimeMilliseconds(1514056829775), emote.CreatedAt);
Assert.EndsWith("gif", emote.Url);
}
+ [Fact]
public void Test_Invalid_Amimated_Emote_Parse()
{
Assert.False(Emote.TryParse("", out _));
diff --git a/test/Discord.Net.Tests/Tests.Permissions.cs b/test/Discord.Net.Tests/Tests.Permissions.cs
index e22659d15..6e71da1b1 100644
--- a/test/Discord.Net.Tests/Tests.Permissions.cs
+++ b/test/Discord.Net.Tests/Tests.Permissions.cs
@@ -25,15 +25,15 @@ namespace Discord
// check that toggling the bit works
Permissions.UnsetFlag(ref rawValue, flagValue);
- Assert.Equal(false, Permissions.GetValue(rawValue, flagValue));
+ Assert.False(Permissions.GetValue(rawValue, flagValue));
Permissions.SetFlag(ref rawValue, flagValue);
- Assert.Equal(true, Permissions.GetValue(rawValue, flagValue));
+ Assert.True(Permissions.GetValue(rawValue, flagValue));
// do the same, but with the SetValue method
Permissions.SetValue(ref rawValue, true, flagValue);
- Assert.Equal(true, Permissions.GetValue(rawValue, flagValue));
+ Assert.True(Permissions.GetValue(rawValue, flagValue));
Permissions.SetValue(ref rawValue, false, flagValue);
- Assert.Equal(false, Permissions.GetValue(rawValue, flagValue));
+ Assert.False(Permissions.GetValue(rawValue, flagValue));
}
///