github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed legacy warnings

Browse Source
This commit is contained in:
RogueException
2015-12-31 04:24:36 -04:00
parent aa040193a1
commit 672cde4654
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/Discord.Net.Tests/Tests.cs
View File

@@ -36,17 +36,17 @@ namespace Discord.Tests
//Cleanup existing servers //Cleanup existing servers
WaitMany( WaitMany(
_hostClient.Servers.Select(x => _hostClient.LeaveServer(x)), _hostClient.Servers.Select(x => x.IsOwner ? x.Delete() : x.Leave()),
_targetBot.Servers.Select(x => _targetBot.LeaveServer(x)), _targetBot.Servers.Select(x => x.IsOwner ? x.Delete() : x.Leave()),
_observerBot.Servers.Select(x => _observerBot.LeaveServer(x))); _observerBot.Servers.Select(x => x.IsOwner ? x.Delete() : x.Leave()));
//Create new server and invite the other bots to it //Create new server and invite the other bots to it
_testServer = _hostClient.CreateServer("Discord.Net Testing", _hostClient.GetVoiceRegions().First()).Result; _testServer = _hostClient.CreateServer("Discord.Net Testing", _hostClient.Regions.First()).Result;
_testServerChannel = _testServer.DefaultChannel; _testServerChannel = _testServer.DefaultChannel;
Invite invite = _hostClient.CreateInvite(_testServer, 60, 1, false, false).Result; Invite invite = _testServer.CreateInvite(60, 1, false, false).Result;
WaitAll( WaitAll(
_targetBot.AcceptInvite(invite), _targetBot.GetInvite(invite.Code).Result.Accept(),
_observerBot.AcceptInvite(invite)); _observerBot.GetInvite(invite.Code).Result.Accept());
} }
//Channels //Channels
@@ -62,14 +62,14 @@ namespace Discord.Tests
string name = $"#test_{_random.Next()}"; string name = $"#test_{_random.Next()}";
AssertEvent<ChannelEventArgs>( AssertEvent<ChannelEventArgs>(
"ChannelCreated event never received", "ChannelCreated event never received",
async () => channel = await _hostClient.CreateChannel(_testServer, name.Substring(1), type), async () => channel = await _testServer.CreateChannel(name.Substring(1), type),
x => _targetBot.ChannelCreated += x, x => _targetBot.ChannelCreated += x,
x => _targetBot.ChannelCreated -= x, x => _targetBot.ChannelCreated -= x,
(s, e) => e.Channel.Name == name); (s, e) => e.Channel.Name == name);
AssertEvent<ChannelEventArgs>( AssertEvent<ChannelEventArgs>(
"ChannelDestroyed event never received", "ChannelDestroyed event never received",
async () => await _hostClient.DeleteChannel(channel), async () => await channel.Delete(),
x => _targetBot.ChannelDestroyed += x, x => _targetBot.ChannelDestroyed += x,
x => _targetBot.ChannelDestroyed -= x, x => _targetBot.ChannelDestroyed -= x,
(s, e) => e.Channel.Name == name); (s, e) => e.Channel.Name == name);
@@ -79,21 +79,21 @@ namespace Discord.Tests
[ExpectedException(typeof(InvalidOperationException))] [ExpectedException(typeof(InvalidOperationException))]
public async Task TestCreateChannel_NoName() public async Task TestCreateChannel_NoName()
{ {
await _hostClient.CreateChannel(_testServer, $"", ChannelType.Text); await _testServer.CreateChannel($"", ChannelType.Text);
} }
[TestMethod] [TestMethod]
[ExpectedException(typeof(InvalidOperationException))] [ExpectedException(typeof(InvalidOperationException))]
public async Task TestCreateChannel_NoType() public async Task TestCreateChannel_NoType()
{ {
string name = $"#test_{_random.Next()}"; string name = $"#test_{_random.Next()}";
await _hostClient.CreateChannel(_testServer, $"", ChannelType.FromString("")); await _testServer.CreateChannel($"", ChannelType.FromString(""));
} }
[TestMethod] [TestMethod]
[ExpectedException(typeof(InvalidOperationException))] [ExpectedException(typeof(InvalidOperationException))]
public async Task TestCreateChannel_BadType() public async Task TestCreateChannel_BadType()
{ {
string name = $"#test_{_random.Next()}"; string name = $"#test_{_random.Next()}";
await _hostClient.CreateChannel(_testServer, $"", ChannelType.FromString("badtype")); await _testServer.CreateChannel($"", ChannelType.FromString("badtype"));
} }
//Messages //Messages
@@ -103,7 +103,7 @@ namespace Discord.Tests
string text = $"test_{_random.Next()}"; string text = $"test_{_random.Next()}";
AssertEvent<MessageEventArgs>( AssertEvent<MessageEventArgs>(
"MessageCreated event never received", "MessageCreated event never received",
() => _hostClient.SendMessage(_testServerChannel, text), () => _testServerChannel.SendMessage(text),
x => _targetBot.MessageReceived += x, x => _targetBot.MessageReceived += x,
x => _targetBot.MessageReceived -= x, x => _targetBot.MessageReceived -= x,
(s, e) => e.Message.Text == text); (s, e) => e.Message.Text == text);
@@ -113,9 +113,9 @@ namespace Discord.Tests
public static void Cleanup() public static void Cleanup()
{ {
WaitMany( WaitMany(
_hostClient.State == ConnectionState.Connected ? _hostClient.Servers.Select(x => _hostClient.LeaveServer(x)) : null, _hostClient.State == ConnectionState.Connected ? _hostClient.Servers.Select(x => x.IsOwner ? x.Delete() : x.Leave()) : null,
_targetBot.State == ConnectionState.Connected ? _targetBot.Servers.Select(x => _targetBot.LeaveServer(x)) : null, _targetBot.State == ConnectionState.Connected ? _targetBot.Servers.Select(x => x.IsOwner ? x.Delete() : x.Leave()) : null,
_observerBot.State == ConnectionState.Connected ? _observerBot.Servers.Select(x => _observerBot.LeaveServer(x)) : null); _observerBot.State == ConnectionState.Connected ? _observerBot.Servers.Select(x => x.IsOwner ? x.Delete() : x.Leave()) : null);
WaitAll( WaitAll(
_hostClient.Disconnect(), _hostClient.Disconnect(),