Browse Source

Update deps, fix test warnings.

pull/1046/head
Hawx 7 years ago
parent
commit
1da288f13c
11 changed files with 46 additions and 45 deletions
  1. +1
    -1
      src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj
  2. +2
    -2
      src/Discord.Net.Core/Discord.Net.Core.csproj
  3. +1
    -1
      src/Discord.Net.Rest/Discord.Net.Rest.csproj
  4. +1
    -2
      src/Discord.Net.Rest/Net/Converters/DiscordContractResolver.cs
  5. +1
    -1
      src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj
  6. +5
    -5
      test/Discord.Net.Tests/Discord.Net.Tests.csproj
  7. +1
    -1
      test/Discord.Net.Tests/Tests.ChannelPermissions.cs
  8. +26
    -26
      test/Discord.Net.Tests/Tests.Channels.cs
  9. +2
    -1
      test/Discord.Net.Tests/Tests.Colors.cs
  10. +2
    -1
      test/Discord.Net.Tests/Tests.Emotes.cs
  11. +4
    -4
      test/Discord.Net.Tests/Tests.Permissions.cs

+ 1
- 1
src/Discord.Net.Analyzers/Discord.Net.Analyzers.csproj View File

@@ -7,7 +7,7 @@
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netstandard1.3</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.6.0" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="2.7.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Discord.Net.Commands\Discord.Net.Commands.csproj" /> <ProjectReference Include="..\Discord.Net.Commands\Discord.Net.Commands.csproj" />


+ 2
- 2
src/Discord.Net.Core/Discord.Net.Core.csproj View File

@@ -8,8 +8,8 @@
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.1;netstandard1.3</TargetFrameworks> <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard1.1;netstandard1.3</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="System.Interactive.Async" Version="3.1.1" /> <PackageReference Include="System.Interactive.Async" Version="3.1.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

+ 1
- 1
src/Discord.Net.Rest/Discord.Net.Rest.csproj View File

@@ -11,7 +11,7 @@
<ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" /> <ProjectReference Include="..\Discord.Net.Core\Discord.Net.Core.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'net45' "> <ItemGroup Condition=" '$(TargetFramework)' != 'net45' ">
<PackageReference Include="System.Net.Http" Version="4.3.2" />
<PackageReference Include="System.Net.Http" Version="4.3.3" />
<!-- https://github.com/dotnet/corefx/issues/19535 --> <!-- https://github.com/dotnet/corefx/issues/19535 -->
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">


+ 1
- 2
src/Discord.Net.Rest/Net/Converters/DiscordContractResolver.cs View File

@@ -1,4 +1,4 @@
using Discord.API;
using Discord.API;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;
using System; using System;
@@ -25,7 +25,6 @@ namespace Discord.Net.Converters
if (converter != null) if (converter != null)
{ {
property.Converter = converter; property.Converter = converter;
property.MemberConverter = converter;
} }
} }
else else


+ 1
- 1
src/Discord.Net.WebSocket/Discord.Net.WebSocket.csproj View File

@@ -13,6 +13,6 @@
<ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" /> <ProjectReference Include="..\Discord.Net.Rest\Discord.Net.Rest.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.1" />
<PackageReference Include="System.Net.WebSockets.Client" Version="4.3.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

+ 5
- 5
test/Discord.Net.Tests/Discord.Net.Tests.csproj View File

@@ -21,10 +21,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Akavache" Version="5.0.0" /> <PackageReference Include="Akavache" Version="5.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit.runner.reporters" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="xunit.runner.reporters" Version="2.3.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

+ 1
- 1
test/Discord.Net.Tests/Tests.ChannelPermissions.cs View File

@@ -84,7 +84,7 @@ namespace Discord
Assert.Equal(groupChannel, ChannelPermissions.Group.RawValue); Assert.Equal(groupChannel, ChannelPermissions.Group.RawValue);
return Task.CompletedTask; return Task.CompletedTask;
} }
[Fact]
public Task TestChannelPermissionModify() public Task TestChannelPermissionModify()
{ {
// test channel permission modify // test channel permission modify


+ 26
- 26
test/Discord.Net.Tests/Tests.Channels.cs View File

@@ -49,35 +49,35 @@ namespace Discord
} }
private static void CheckTextChannels(RestGuild guild, params RestTextChannel[] textChannels) private static void CheckTextChannels(RestGuild guild, params RestTextChannel[] textChannels)
{ {
Assert.Equal(textChannels.Length, 5);
Assert.Equal(5, textChannels.Length);
Assert.All(textChannels, x => Assert.All(textChannels, x =>
{ {
Assert.NotNull(x); Assert.NotNull(x);
Assert.NotEqual(x.Id, 0UL);
Assert.NotEqual(0UL, x.Id);
Assert.True(x.Position >= 0); 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.NotNull(text1);
//Assert.True(text1.Id == guild.DefaultChannelId); //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.NotNull(text2);
Assert.Equal(text2.Position, 2);
Assert.Equal(2, text2.Position);
Assert.Null(text2.Topic); Assert.Null(text2.Topic);


Assert.NotNull(text3); Assert.NotNull(text3);
Assert.Equal(text3.Topic, "Topic2");
Assert.Equal("Topic2", text3.Topic);


Assert.NotNull(text4); 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.NotNull(text5);
Assert.Null(text5.Topic); Assert.Null(text5.Topic);
@@ -114,31 +114,31 @@ namespace Discord
} }
private static void CheckVoiceChannels(params RestVoiceChannel[] voiceChannels) private static void CheckVoiceChannels(params RestVoiceChannel[] voiceChannels)
{ {
Assert.Equal(voiceChannels.Length, 3);
Assert.Equal(3, voiceChannels.Length);
Assert.All(voiceChannels, x => Assert.All(voiceChannels, x =>
{ {
Assert.NotNull(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.Bitrate > 0);
Assert.True(x.Position >= 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.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.NotNull(voice2);
Assert.Equal(voice2.UserLimit, null);
Assert.Null(voice2.UserLimit);


Assert.NotNull(voice3); 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);
} }
} }
}
}

+ 2
- 1
test/Discord.Net.Tests/Tests.Colors.cs View File

@@ -1,4 +1,4 @@
using System;
using System;
using Xunit; using Xunit;


namespace Discord namespace Discord
@@ -12,6 +12,7 @@ namespace Discord
Assert.Equal(uint.MinValue, new Color(uint.MinValue).RawValue); Assert.Equal(uint.MinValue, new Color(uint.MinValue).RawValue);
Assert.Equal(uint.MaxValue, new Color(uint.MaxValue).RawValue); Assert.Equal(uint.MaxValue, new Color(uint.MaxValue).RawValue);
} }
[Fact]
public void Color_Default() public void Color_Default()
{ {
Assert.Equal(0u, Color.Default.RawValue); Assert.Equal(0u, Color.Default.RawValue);


+ 2
- 1
test/Discord.Net.Tests/Tests.Emotes.cs View File

@@ -1,4 +1,4 @@
using System;
using System;
using Xunit; using Xunit;


namespace Discord namespace Discord
@@ -34,6 +34,7 @@ namespace Discord
Assert.Equal(DateTimeOffset.FromUnixTimeMilliseconds(1514056829775), emote.CreatedAt); Assert.Equal(DateTimeOffset.FromUnixTimeMilliseconds(1514056829775), emote.CreatedAt);
Assert.EndsWith("gif", emote.Url); Assert.EndsWith("gif", emote.Url);
} }
[Fact]
public void Test_Invalid_Amimated_Emote_Parse() public void Test_Invalid_Amimated_Emote_Parse()
{ {
Assert.False(Emote.TryParse("<x:typingstatus:394207658351263745>", out _)); Assert.False(Emote.TryParse("<x:typingstatus:394207658351263745>", out _));


+ 4
- 4
test/Discord.Net.Tests/Tests.Permissions.cs View File

@@ -25,15 +25,15 @@ namespace Discord


// check that toggling the bit works // check that toggling the bit works
Permissions.UnsetFlag(ref rawValue, flagValue); Permissions.UnsetFlag(ref rawValue, flagValue);
Assert.Equal(false, Permissions.GetValue(rawValue, flagValue));
Assert.False(Permissions.GetValue(rawValue, flagValue));
Permissions.SetFlag(ref 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 // do the same, but with the SetValue method
Permissions.SetValue(ref rawValue, true, flagValue); 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); Permissions.SetValue(ref rawValue, false, flagValue);
Assert.Equal(false, Permissions.GetValue(rawValue, flagValue));
Assert.False(Permissions.GetValue(rawValue, flagValue));
} }


/// <summary> /// <summary>


Loading…
Cancel
Save