Make opening chat overlay opt-in to add coverage for unloaded chat overlays

Causes `TestHighlightWhileChatNeverOpen` to fail as expected.
This commit is contained in:
Salman Ahmed 2022-03-17 08:19:38 +03:00
parent 07433d0540
commit 46e66e66e4

View File

@ -122,6 +122,8 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestHideOverlay() public void TestHideOverlay()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddAssert("Chat overlay is visible", () => chatOverlay.State.Value == Visibility.Visible); AddAssert("Chat overlay is visible", () => chatOverlay.State.Value == Visibility.Visible);
AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible); AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
@ -134,6 +136,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestChannelSelection() public void TestChannelSelection()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible); AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
AddStep("Setup get message response", () => onGetMessages = channel => AddStep("Setup get message response", () => onGetMessages = channel =>
{ {
@ -169,6 +172,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestSearchInSelector() public void TestSearchInSelector()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Search for 'no. 2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "no. 2"); AddStep("Search for 'no. 2'", () => chatOverlay.ChildrenOfType<SearchTextBox>().First().Text = "no. 2");
AddUntilStep("Only channel 2 visible", () => AddUntilStep("Only channel 2 visible", () =>
{ {
@ -180,6 +184,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestChannelShortcutKeys() public void TestChannelShortcutKeys()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join channels", () => channels.ForEach(channel => channelManager.JoinChannel(channel))); AddStep("Join channels", () => channels.ForEach(channel => channelManager.JoinChannel(channel)));
AddStep("Close channel selector", () => InputManager.Key(Key.Escape)); AddStep("Close channel selector", () => InputManager.Key(Key.Escape));
AddUntilStep("Wait for close", () => chatOverlay.SelectionOverlayState == Visibility.Hidden); AddUntilStep("Wait for close", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
@ -199,6 +204,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestCloseChannelBehaviour() public void TestCloseChannelBehaviour()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddUntilStep("Join until dropdown has channels", () => AddUntilStep("Join until dropdown has channels", () =>
{ {
if (visibleChannels.Count() < joinedChannels.Count()) if (visibleChannels.Count() < joinedChannels.Count())
@ -269,6 +275,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestChannelCloseButton() public void TestChannelCloseButton()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join 2 channels", () => AddStep("Join 2 channels", () =>
{ {
channelManager.JoinChannel(channel1); channelManager.JoinChannel(channel1);
@ -289,6 +296,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestCloseTabShortcut() public void TestCloseTabShortcut()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join 2 channels", () => AddStep("Join 2 channels", () =>
{ {
channelManager.JoinChannel(channel1); channelManager.JoinChannel(channel1);
@ -314,6 +322,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestNewTabShortcut() public void TestNewTabShortcut()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join 2 channels", () => AddStep("Join 2 channels", () =>
{ {
channelManager.JoinChannel(channel1); channelManager.JoinChannel(channel1);
@ -330,6 +339,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestRestoreTabShortcut() public void TestRestoreTabShortcut()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join 3 channels", () => AddStep("Join 3 channels", () =>
{ {
channelManager.JoinChannel(channel1); channelManager.JoinChannel(channel1);
@ -375,6 +385,7 @@ namespace osu.Game.Tests.Visual.Online
[Test] [Test]
public void TestChatCommand() public void TestChatCommand()
{ {
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1])); AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
@ -398,6 +409,8 @@ namespace osu.Game.Tests.Visual.Online
{ {
Channel multiplayerChannel = null; Channel multiplayerChannel = null;
AddStep("open chat overlay", () => chatOverlay.Show());
AddStep("join multiplayer channel", () => channelManager.JoinChannel(multiplayerChannel = new Channel(new APIUser()) AddStep("join multiplayer channel", () => channelManager.JoinChannel(multiplayerChannel = new Channel(new APIUser())
{ {
Name = "#mp_1", Name = "#mp_1",
@ -417,6 +430,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Message message = null; Message message = null;
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1])); AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
@ -443,6 +457,7 @@ namespace osu.Game.Tests.Visual.Online
{ {
Message message = null; Message message = null;
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1])); AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
@ -471,6 +486,8 @@ namespace osu.Game.Tests.Visual.Online
{ {
Message message = null; Message message = null;
AddStep("Open chat overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1])); AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
@ -496,14 +513,11 @@ namespace osu.Game.Tests.Visual.Online
} }
[Test] [Test]
public void TestHighlightWhileChatHidden() public void TestHighlightWhileChatNeverOpen()
{ {
Message message = null; Message message = null;
AddStep("hide chat", () => chatOverlay.Hide());
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
AddStep("Send message in channel 1", () => AddStep("Send message in channel 1", () =>
{ {
@ -520,7 +534,7 @@ namespace osu.Game.Tests.Visual.Online
}); });
}); });
AddStep("Highlight message and show chat", () => AddStep("Highlight message and open chat", () =>
{ {
chatOverlay.HighlightMessage(message, channel1); chatOverlay.HighlightMessage(message, channel1);
chatOverlay.Show(); chatOverlay.Show();
@ -571,8 +585,6 @@ namespace osu.Game.Tests.Visual.Online
ChannelManager, ChannelManager,
ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, }, ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, },
}; };
ChatOverlay.Show();
} }
} }