RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix code formatting

This commit is contained in:
Opelkuh 2021-08-15 16:02:25 +02:00
parent 2f9f1ba862
commit 7d7c5c06f0
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Game.Tests/Chat/TestSceneChannelManager.cs
View File

@ -20,7 +20,7 @@ public class TestSceneChannelManager : OsuTestScene
{
private ChannelManager channelManager;
private int currentMessageId;
List<Message> sentMessages;
private List<Message> sentMessages;
[SetUp]
public void Setup() => Schedule(() =>
@ -90,46 +90,49 @@ public void TestCommandsPostedToCorrectChannelWhenNotCurrent()
}
[Test]
public void TestMarkAsReadIgnoringLocalMessages() {
public void TestMarkAsReadIgnoringLocalMessages()
{
Channel channel = null;
AddStep("join channel and select it", () =>
{
channelManager.JoinChannel(channel = createChannel(1, ChannelType.Public));
channelManager.CurrentChannel.Value = channel;
});
AddStep("post message", () => channelManager.PostMessage("Something interesting"));
AddUntilStep("wait until the message is posted", () => channel.Messages.Count == sentMessages.Count);
AddStep("post /help command", () => channelManager.PostCommand("help", channel));
AddStep("post /me command with no action", () => channelManager.PostCommand("me", channel));
AddStep("post /join command with no channel", () => channelManager.PostCommand("join", channel));
AddStep("post /join command with non-existent channel", () => channelManager.PostCommand("join i-dont-exist", channel));
AddStep("post non-existent command", () => channelManager.PostCommand("non-existent-cmd arg", channel));
AddStep("register mark channel as read request handler", () => {
AddStep("register mark channel as read request handler", () =>
{
((DummyAPIAccess)API).HandleRequest = req =>
{
switch (req)
{
switch (req)
{
case MarkChannelAsReadRequest markRead:
var isSentMessage = sentMessages.Contains(markRead.Message);
case MarkChannelAsReadRequest markRead:
var isSentMessage = sentMessages.Contains(markRead.Message);
AddAssert("mark channel as read called with a real message", () => isSentMessage);
AddAssert("mark channel as read called with a real message", () => isSentMessage);
if(isSentMessage) {
markRead.TriggerSuccess();
} else {
markRead.TriggerFailure(new APIException("unknown message!", null));
}
if (isSentMessage)
{
markRead.TriggerSuccess();
}
else
{
markRead.TriggerFailure(new APIException("unknown message!", null));
}
return true;
}
return true;
}
return false;
};
return false;
};
});
AddStep("mark channel as read", () => channelManager.MarkChannelAsRead(channel));

4
osu.Game/Online/API/Requests/MarkChannelAsReadRequest.cs
View File

@ -14,8 +14,8 @@ public class MarkChannelAsReadRequest : APIRequest
public MarkChannelAsReadRequest(Channel channel, Message message)
{
this.Channel = channel;
this.Message = message;
Channel = channel;
Message = message;
}
protected override string Target => $"chat/channels/{Channel.Id}/mark-as-read/{Message.Id}";