This commit is contained in:
David Zhao
2019-06-26 17:44:24 +09:00
parent 1ca9717e13
commit 2394b11f11

View File

@ -60,7 +60,7 @@ namespace osu.Game.Tests.Visual.UserInterface
channelManager.LeaveChannel(channel1); channelManager.LeaveChannel(channel1);
channelManager.LeaveChannel(channel2); channelManager.LeaveChannel(channel2);
}); });
AddStep("Hide chat", () => chatOverlay.Hide()); AddStep("Show chat", () => chatOverlay.Show());
} }
/// <summary> /// <summary>
@ -70,7 +70,6 @@ namespace osu.Game.Tests.Visual.UserInterface
[Test] [Test]
public void TestToggleChatWithNoChannelsJoined() public void TestToggleChatWithNoChannelsJoined()
{ {
AddStep("Toggle chat overlay", () => chatOverlay.Show());
AddAssert("Channel selection overlay was toggled", () => chatOverlay.SelectionOverlayState == Visibility.Visible); AddAssert("Channel selection overlay was toggled", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
AddAssert("Chat overlay was shown", () => chatOverlay.State.Value == Visibility.Visible); AddAssert("Chat overlay was shown", () => chatOverlay.State.Value == Visibility.Visible);
AddStep("Close chat overlay", () => chatOverlay.Hide()); AddStep("Close chat overlay", () => chatOverlay.Hide());
@ -82,18 +81,17 @@ namespace osu.Game.Tests.Visual.UserInterface
public void TestToggleChatWithChannelJoined() public void TestToggleChatWithChannelJoined()
{ {
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Toggle chat overlay", () => chatOverlay.Show());
AddAssert("Channel selection overlay was not toggled", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
AddAssert("Chat overlay was shown", () => chatOverlay.State.Value == Visibility.Visible);
AddStep("Close chat overlay", () => chatOverlay.Hide()); AddStep("Close chat overlay", () => chatOverlay.Hide());
AddAssert("Channel selection overlay was hidden", () => chatOverlay.SelectionOverlayState == Visibility.Hidden); AddAssert("Channel selection overlay was hidden", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
AddAssert("Chat overlay was hidden", () => chatOverlay.State.Value == Visibility.Hidden); AddAssert("Chat overlay was hidden", () => chatOverlay.State.Value == Visibility.Hidden);
AddStep("Close chat overlay", () => chatOverlay.Show());
AddAssert("Channel selection overlay was not toggled", () => chatOverlay.SelectionOverlayState == Visibility.Hidden);
AddAssert("Chat overlay was shown", () => chatOverlay.State.Value == Visibility.Visible);
} }
[Test] [Test]
public void TestTabbingAwayClosesSelector() public void TestTabbingAwayClosesSelector()
{ {
AddStep("Toggle chat overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Join channel 2", () => channelManager.JoinChannel(channel2)); AddStep("Join channel 2", () => channelManager.JoinChannel(channel2));
@ -106,7 +104,6 @@ namespace osu.Game.Tests.Visual.UserInterface
[Test] [Test]
public void TestCloseChannelWhileSelectorClosed() public void TestCloseChannelWhileSelectorClosed()
{ {
AddStep("Toggle chat overlay", () => chatOverlay.Show());
AddStep("Join channel 1", () => channelManager.JoinChannel(channel1)); AddStep("Join channel 1", () => channelManager.JoinChannel(channel1));
AddStep("Join channel 2", () => channelManager.JoinChannel(channel2)); AddStep("Join channel 2", () => channelManager.JoinChannel(channel2));
AddStep("Switch to channel 2", () => clickDrawable(chatOverlay.AvailableTabs.First())); AddStep("Switch to channel 2", () => clickDrawable(chatOverlay.AvailableTabs.First()));