mirror of
https://github.com/osukey/osukey.git
synced 2025-06-22 19:57:56 +09:00
Add test coverage for channel message highlighting
This commit is contained in:
parent
30b38345aa
commit
cb2133944d
@ -9,6 +9,8 @@ using System;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
|
using osu.Framework.Testing;
|
||||||
|
using osu.Framework.Utils;
|
||||||
using osu.Game.Online.API.Requests.Responses;
|
using osu.Game.Online.API.Requests.Responses;
|
||||||
using osu.Game.Overlays.Chat;
|
using osu.Game.Overlays.Chat;
|
||||||
using osuTK.Input;
|
using osuTK.Input;
|
||||||
@ -107,49 +109,7 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
[Test]
|
[Test]
|
||||||
public void TestManyMessages()
|
public void TestManyMessages()
|
||||||
{
|
{
|
||||||
AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
sendRegularMessages();
|
||||||
{
|
|
||||||
Sender = admin,
|
|
||||||
Content = "I am a wang!"
|
|
||||||
}));
|
|
||||||
|
|
||||||
AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
|
||||||
{
|
|
||||||
Sender = redUser,
|
|
||||||
Content = "I am team red."
|
|
||||||
}));
|
|
||||||
|
|
||||||
AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
|
||||||
{
|
|
||||||
Sender = redUser,
|
|
||||||
Content = "I plan to win!"
|
|
||||||
}));
|
|
||||||
|
|
||||||
AddStep("message from team blue", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
|
||||||
{
|
|
||||||
Sender = blueUser,
|
|
||||||
Content = "Not on my watch. Prepare to eat saaaaaaaaaand. Lots and lots of saaaaaaand."
|
|
||||||
}));
|
|
||||||
|
|
||||||
AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
|
||||||
{
|
|
||||||
Sender = admin,
|
|
||||||
Content = "Okay okay, calm down guys. Let's do this!"
|
|
||||||
}));
|
|
||||||
|
|
||||||
AddStep("message from long username", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
|
||||||
{
|
|
||||||
Sender = longUsernameUser,
|
|
||||||
Content = "Hi guys, my new username is lit!"
|
|
||||||
}));
|
|
||||||
|
|
||||||
AddStep("message with new date", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
|
||||||
{
|
|
||||||
Sender = longUsernameUser,
|
|
||||||
Content = "Message from the future!",
|
|
||||||
Timestamp = DateTimeOffset.Now
|
|
||||||
}));
|
|
||||||
|
|
||||||
checkScrolledToBottom();
|
checkScrolledToBottom();
|
||||||
|
|
||||||
const int messages_per_call = 10;
|
const int messages_per_call = 10;
|
||||||
@ -182,6 +142,61 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
checkScrolledToBottom();
|
checkScrolledToBottom();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestMessageHighlighting()
|
||||||
|
{
|
||||||
|
Message highlighted = null;
|
||||||
|
|
||||||
|
sendRegularMessages();
|
||||||
|
|
||||||
|
AddStep("highlight first message", () =>
|
||||||
|
{
|
||||||
|
highlighted = testChannel.Messages[0];
|
||||||
|
chatDisplay.DrawableChannel.HighlightMessage(highlighted);
|
||||||
|
});
|
||||||
|
|
||||||
|
AddUntilStep("chat scrolled to first message", () =>
|
||||||
|
{
|
||||||
|
var line = chatDisplay.ChildrenOfType<ChatLine>().Single(c => c.Message == highlighted);
|
||||||
|
return chatDisplay.ScrollContainer.ScreenSpaceDrawQuad.Contains(line.ScreenSpaceDrawQuad.Centre);
|
||||||
|
});
|
||||||
|
|
||||||
|
sendMessage();
|
||||||
|
checkNotScrolledToBottom();
|
||||||
|
|
||||||
|
AddStep("highlight last message", () =>
|
||||||
|
{
|
||||||
|
highlighted = testChannel.Messages[^1];
|
||||||
|
chatDisplay.DrawableChannel.HighlightMessage(highlighted);
|
||||||
|
});
|
||||||
|
|
||||||
|
AddUntilStep("chat scrolled to last message", () =>
|
||||||
|
{
|
||||||
|
var line = chatDisplay.ChildrenOfType<ChatLine>().Single(c => c.Message == highlighted);
|
||||||
|
return chatDisplay.ScrollContainer.ScreenSpaceDrawQuad.Contains(line.ScreenSpaceDrawQuad.Centre);
|
||||||
|
});
|
||||||
|
|
||||||
|
sendMessage();
|
||||||
|
checkScrolledToBottom();
|
||||||
|
|
||||||
|
AddRepeatStep("highlight other random messages", () =>
|
||||||
|
{
|
||||||
|
highlighted = testChannel.Messages[RNG.Next(0, testChannel.Messages.Count - 1)];
|
||||||
|
chatDisplay.DrawableChannel.HighlightMessage(highlighted);
|
||||||
|
}, 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestMessageHighlightingOnFilledChat()
|
||||||
|
{
|
||||||
|
fillChat();
|
||||||
|
|
||||||
|
AddRepeatStep("highlight random messages", () =>
|
||||||
|
{
|
||||||
|
chatDisplay.DrawableChannel.HighlightMessage(testChannel.Messages[RNG.Next(0, testChannel.Messages.Count - 1)]);
|
||||||
|
}, 10);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Tests that when a message gets wrapped by the chat display getting contracted while scrolled to bottom, the chat will still keep scrolling down.
|
/// Tests that when a message gets wrapped by the chat display getting contracted while scrolled to bottom, the chat will still keep scrolling down.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -321,6 +336,52 @@ namespace osu.Game.Tests.Visual.Online
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void sendRegularMessages()
|
||||||
|
{
|
||||||
|
AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
||||||
|
{
|
||||||
|
Sender = admin,
|
||||||
|
Content = "I am a wang!"
|
||||||
|
}));
|
||||||
|
|
||||||
|
AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
||||||
|
{
|
||||||
|
Sender = redUser,
|
||||||
|
Content = "I am team red."
|
||||||
|
}));
|
||||||
|
|
||||||
|
AddStep("message from team red", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
||||||
|
{
|
||||||
|
Sender = redUser,
|
||||||
|
Content = "I plan to win!"
|
||||||
|
}));
|
||||||
|
|
||||||
|
AddStep("message from team blue", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
||||||
|
{
|
||||||
|
Sender = blueUser,
|
||||||
|
Content = "Not on my watch. Prepare to eat saaaaaaaaaand. Lots and lots of saaaaaaand."
|
||||||
|
}));
|
||||||
|
|
||||||
|
AddStep("message from admin", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
||||||
|
{
|
||||||
|
Sender = admin,
|
||||||
|
Content = "Okay okay, calm down guys. Let's do this!"
|
||||||
|
}));
|
||||||
|
|
||||||
|
AddStep("message from long username", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
||||||
|
{
|
||||||
|
Sender = longUsernameUser,
|
||||||
|
Content = "Hi guys, my new username is lit!"
|
||||||
|
}));
|
||||||
|
|
||||||
|
AddStep("message with new date", () => testChannel.AddNewMessages(new Message(messageIdSequence++)
|
||||||
|
{
|
||||||
|
Sender = longUsernameUser,
|
||||||
|
Content = "Message from the future!",
|
||||||
|
Timestamp = DateTimeOffset.Now
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
private void checkScrolledToBottom() =>
|
private void checkScrolledToBottom() =>
|
||||||
AddUntilStep("is scrolled to bottom", () => chatDisplay.ScrolledToBottom);
|
AddUntilStep("is scrolled to bottom", () => chatDisplay.ScrolledToBottom);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user