sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Ensure joined channels are actually joined to avoid unexpected tab order

Browse Source
This commit is contained in:
Dean Herbert
2022-06-28 18:04:08 +09:00
parent d630b62cfc
commit 21d31ee218
1 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,6 @@ namespace osu.Game.Tests.Visual.Online
private ChannelManager channelManager; private ChannelManager channelManager;
private APIUser testUser; private APIUser testUser;
private Channel testPMChannel;
private Channel[] testChannels; private Channel[] testChannels;
private Channel testChannel1 => testChannels[0]; private Channel testChannel1 => testChannels[0];
@ -53,7 +52,6 @@ namespace osu.Game.Tests.Visual.Online
public void SetUp() => Schedule(() => public void SetUp() => Schedule(() =>
{ {
testUser = new APIUser { Username = "test user", Id = 5071479 }; testUser = new APIUser { Username = "test user", Id = 5071479 };
testPMChannel = new Channel(testUser);
testChannels = Enumerable.Range(1, 10).Select(createPublicChannel).ToArray(); testChannels = Enumerable.Range(1, 10).Select(createPublicChannel).ToArray();
Child = new DependencyProvidingContainer Child = new DependencyProvidingContainer
@ -181,7 +179,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddAssert("Listing is visible", () => listingIsVisible); AddAssert("Listing is visible", () => listingIsVisible);
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
waitForChannel1Visible(); waitForChannel1Visible();
} }
@ -203,12 +201,11 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestChannelCloseButton() public void TestChannelCloseButton()
{ {
var testPMChannel = new Channel(testUser);
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddStep("Join PM and public channels", () => joinTestChannel(0);
{ joinChannel(testPMChannel);
channelManager.JoinChannel(testChannel1);
channelManager.JoinChannel(testPMChannel);
});
AddStep("Select PM channel", () => clickDrawable(getChannelListItem(testPMChannel))); AddStep("Select PM channel", () => clickDrawable(getChannelListItem(testPMChannel)));
AddStep("Click close button", () => AddStep("Click close button", () =>
{ {
@ -229,7 +226,7 @@ namespace osu.Game.Tests.Visual.Online
public void TestChatCommand() public void TestChatCommand()
{ {
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
AddStep("Open chat with user", () => channelManager.PostCommand($"chat {testUser.Username}")); AddStep("Open chat with user", () => channelManager.PostCommand($"chat {testUser.Username}"));
AddAssert("PM channel is selected", () => AddAssert("PM channel is selected", () =>
@ -248,14 +245,16 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestMultiplayerChannelIsNotShown() public void TestMultiplayerChannelIsNotShown()
{ {
Channel multiplayerChannel = null; Channel multiplayerChannel;
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddStep("Join multiplayer channel", () => channelManager.JoinChannel(multiplayerChannel = new Channel(new APIUser())
joinChannel(multiplayerChannel = new Channel(new APIUser())
{ {
Name = "#mp_1", Name = "#mp_1",
Type = ChannelType.Multiplayer, Type = ChannelType.Multiplayer,
})); });
AddAssert("Channel is joined", () => channelManager.JoinedChannels.Contains(multiplayerChannel)); AddAssert("Channel is joined", () => channelManager.JoinedChannels.Contains(multiplayerChannel));
AddUntilStep("Channel not present in listing", () => !chatOverlay.ChildrenOfType<ChannelListingItem>() AddUntilStep("Channel not present in listing", () => !chatOverlay.ChildrenOfType<ChannelListingItem>()
.Where(item => item.IsPresent) .Where(item => item.IsPresent)
@ -269,7 +268,7 @@ namespace osu.Game.Tests.Visual.Online
Message message = null; Message message = null;
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
AddStep("Send message in channel 1", () => AddStep("Send message in channel 1", () =>
{ {
@ -291,8 +290,8 @@ namespace osu.Game.Tests.Visual.Online
Message message = null; Message message = null;
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Join channel 2", () => channelManager.JoinChannel(testChannel2)); joinTestChannel(1);
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
AddStep("Send message in channel 2", () => AddStep("Send message in channel 2", () =>
{ {
@ -314,8 +313,8 @@ namespace osu.Game.Tests.Visual.Online
Message message = null; Message message = null;
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Join channel 2", () => channelManager.JoinChannel(testChannel2)); joinTestChannel(1);
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
AddStep("Send message in channel 2", () => AddStep("Send message in channel 2", () =>
{ {
@ -337,7 +336,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Message message = null; Message message = null;
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Send message in channel 1", () => AddStep("Send message in channel 1", () =>
{ {
testChannel1.AddNewMessages(message = new Message testChannel1.AddNewMessages(message = new Message
@ -357,7 +356,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Message message = null; Message message = null;
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Send message in channel 1", () => AddStep("Send message in channel 1", () =>
{ {
testChannel1.AddNewMessages(message = new Message testChannel1.AddNewMessages(message = new Message
@ -378,7 +377,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
AddStep("Show overlay", () => chatOverlay.Show()); AddStep("Show overlay", () => chatOverlay.Show());
AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox); AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox);
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
waitForChannel1Visible(); waitForChannel1Visible();
AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox); AddAssert("TextBox is focused", () => InputManager.FocusedDrawable == chatOverlayTextBox);
@ -404,11 +403,11 @@ namespace osu.Game.Tests.Visual.Online
chatOverlay.Show(); chatOverlay.Show();
chatOverlay.SlowLoading = true; chatOverlay.SlowLoading = true;
}); });
AddStep("Join channel 1", () => channelManager.JoinChannel(testChannel1)); joinTestChannel(0);
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
AddUntilStep("Channel 1 loading", () => !channelIsVisible && chatOverlay.GetSlowLoadingChannel(testChannel1).LoadState == LoadState.Loading); AddUntilStep("Channel 1 loading", () => !channelIsVisible && chatOverlay.GetSlowLoadingChannel(testChannel1).LoadState == LoadState.Loading);
AddStep("Join channel 2", () => channelManager.JoinChannel(testChannel2)); joinTestChannel(1);
AddStep("Select channel 2", () => clickDrawable(getChannelListItem(testChannel2))); AddStep("Select channel 2", () => clickDrawable(getChannelListItem(testChannel2)));
AddUntilStep("Channel 2 loading", () => !channelIsVisible && chatOverlay.GetSlowLoadingChannel(testChannel2).LoadState == LoadState.Loading); AddUntilStep("Channel 2 loading", () => !channelIsVisible && chatOverlay.GetSlowLoadingChannel(testChannel2).LoadState == LoadState.Loading);
@ -461,15 +460,13 @@ namespace osu.Game.Tests.Visual.Online
Channel pmChannel1 = createPrivateChannel(); Channel pmChannel1 = createPrivateChannel();
Channel pmChannel2 = createPrivateChannel(); Channel pmChannel2 = createPrivateChannel();
AddStep("Show overlay with channels", () => joinTestChannel(0);
{ joinTestChannel(1);
channelManager.JoinChannel(testChannel1); joinChannel(pmChannel1);
channelManager.JoinChannel(testChannel2); joinChannel(pmChannel2);
channelManager.JoinChannel(pmChannel1); joinChannel(announceChannel);
channelManager.JoinChannel(pmChannel2);
channelManager.JoinChannel(announceChannel); AddStep("Show overlay", () => chatOverlay.Show());
chatOverlay.Show();
});
AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1))); AddStep("Select channel 1", () => clickDrawable(getChannelListItem(testChannel1)));
waitForChannel1Visible(); waitForChannel1Visible();
@ -490,6 +487,18 @@ namespace osu.Game.Tests.Visual.Online
waitForChannel1Visible(); waitForChannel1Visible();
} }
private void joinTestChannel(int i)
{
AddStep($"Join test channel {i}", () => channelManager.JoinChannel(testChannels[i]));
AddUntilStep("wait for join completed", () => testChannels[i].Joined.Value);
}
private void joinChannel(Channel channel)
{
AddStep($"Join channel {channel}", () => channelManager.JoinChannel(channel));
AddUntilStep("wait for join completed", () => channel.Joined.Value);
}
private void waitForChannel1Visible() => private void waitForChannel1Visible() =>
AddUntilStep("Channel 1 is visible", () => channelIsVisible && currentDrawableChannel?.Channel == testChannel1); AddUntilStep("Channel 1 is visible", () => channelIsVisible && currentDrawableChannel?.Channel == testChannel1);