h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-08 05:52:54 +08:00
Code Issues Releases Wiki Activity

Mix normal channel tabs with PM ones

Browse Source
This commit is contained in:
TheWildTree 2020-03-16 19:44:03 +01:00
parent 50c2e65e3c
commit 0f40671e69
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs
View File

@ -47,20 +47,15 @@ namespace osu.Game.Tests.Visual.Online
private Channel previousChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) - 1); private Channel previousChannel => joinedChannels.ElementAt(joinedChannels.ToList().IndexOf(currentChannel) - 1);
private Channel channel1 => channels[0]; private Channel channel1 => channels[0];
private Channel channel2 => channels[1]; private Channel channel2 => channels[1];
private Channel channelPM => channels.Last();
public TestSceneChatOverlay() public TestSceneChatOverlay()
{ {
channels = Enumerable.Range(1, 10) channels = Enumerable.Range(1, 10)
.Select(index => new Channel .Select(index => new Channel(new User())
{ {
Name = $"Channel no. {index}", Name = $"Channel no. {index}",
Topic = index == 3 ? null : $"We talk about the number {index} here", Topic = index == 3 ? null : $"We talk about the number {index} here",
Type = ChannelType.Temporary Type = index % 2 == 0 ? ChannelType.PM : ChannelType.Temporary
})
.Append(new Channel(new User())
{
Name = "PM channel"
}) })
.ToList(); .ToList();
} }
@ -150,9 +145,9 @@ namespace osu.Game.Tests.Visual.Online
// Using temporary channels because they don't hide their names when not active // Using temporary channels because they don't hide their names when not active
channelManager.JoinChannel(new Channel channelManager.JoinChannel(new Channel
{ {
Name = $"Channel no. {joinedChannels.Count() + 1}", Name = $"Channel no. {joinedChannels.Count() + 1}",
Type = ChannelType.Temporary Type = ChannelType.Temporary
}); });
return false; return false;
@ -203,7 +198,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
if (!joinedChannels.Any()) if (!joinedChannels.Any())
return true; return true;
chatOverlay.ChannelTabControl.RemoveChannel(joinedChannels.Last()); chatOverlay.ChannelTabControl.RemoveChannel(joinedChannels.Last());
return false; return false;
}); });
@ -213,16 +208,16 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestChannelCloseButton() public void TestChannelCloseButton()
{ {
AddStep("Join channels", () => AddStep("Join 2 channels", () =>
{ {
channelManager.JoinChannel(channel1); channelManager.JoinChannel(channel1);
channelManager.JoinChannel(channelPM); channelManager.JoinChannel(channel2);
}); });
// PM channel close button only appears when active // PM channel close button only appears when active
AddStep("Select PM channel", () => clickDrawable(chatOverlay.TabMap[channelPM])); AddStep("Select PM channel", () => clickDrawable(chatOverlay.TabMap[channel2]));
AddStep("Click PM close button", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channelPM]).CloseButton.Child)); AddStep("Click PM close button", () => clickDrawable(((TestPrivateChannelTabItem)chatOverlay.TabMap[channel2]).CloseButton.Child));
AddAssert("PM channel closed", () => !channelManager.JoinedChannels.Contains(channelPM)); AddAssert("PM channel closed", () => !channelManager.JoinedChannels.Contains(channel2));
// Non-PM chat channel close button only appears when hovered // Non-PM chat channel close button only appears when hovered
AddStep("Hover normal channel tab", () => InputManager.MoveMouseTo(chatOverlay.TabMap[channel1])); AddStep("Hover normal channel tab", () => InputManager.MoveMouseTo(chatOverlay.TabMap[channel1]));