h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 09:27:34 +08:00
Code Issues Releases Wiki Activity

Update tests to check for correct platform action keys

Browse Source
This commit is contained in:
Dean Herbert 2021-06-03 15:34:06 +09:00
parent e74fe68c96
commit b917d6d80c
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,8 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input;
using osu.Framework.Platform;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API; using osu.Game.Online.API;
@ -38,6 +40,9 @@ namespace osu.Game.Tests.Visual.Online
private Channel channel2 => channels[1]; private Channel channel2 => channels[1];
private Channel channel3 => channels[2]; private Channel channel3 => channels[2];
[Resolved]
private GameHost host { get; set; }
public TestSceneChatOverlay() public TestSceneChatOverlay()
{ {
channels = Enumerable.Range(1, 10) channels = Enumerable.Range(1, 10)
@ -231,7 +236,7 @@ namespace osu.Game.Tests.Visual.Online
} }
[Test] [Test]
public void TestCtrlWShortcut() public void TestCloseTabShortcut()
{ {
AddStep("Join 2 channels", () => AddStep("Join 2 channels", () =>
{ {
@ -241,7 +246,7 @@ namespace osu.Game.Tests.Visual.Online
// Want to close channel 2 // Want to close channel 2
AddStep("Select channel 2", () => clickDrawable(chatOverlay.TabMap[channel2])); AddStep("Select channel 2", () => clickDrawable(chatOverlay.TabMap[channel2]));
AddStep("Press Ctrl + W", pressControlW); AddStep("Press keys", pressCloseDocumentKeys);
// Channel 2 should be closed // Channel 2 should be closed
AddAssert("Channel 1 open", () => channelManager.JoinedChannels.Contains(channel1)); AddAssert("Channel 1 open", () => channelManager.JoinedChannels.Contains(channel1));
@ -250,13 +255,13 @@ namespace osu.Game.Tests.Visual.Online
// Want to close channel 1 // Want to close channel 1
AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1])); AddStep("Select channel 1", () => clickDrawable(chatOverlay.TabMap[channel1]));
AddStep("Press Ctrl + W", pressControlW); AddStep("Press keys", pressCloseDocumentKeys);
// Channel 1 and channel 2 should be closed // Channel 1 and channel 2 should be closed
AddAssert("All channels closed", () => !channelManager.JoinedChannels.Any()); AddAssert("All channels closed", () => !channelManager.JoinedChannels.Any());
} }
[Test] [Test]
public void TestCtrlTShortcut() public void TestNewTabShortcut()
{ {
AddStep("Join 2 channels", () => AddStep("Join 2 channels", () =>
{ {
@ -265,14 +270,14 @@ namespace osu.Game.Tests.Visual.Online
}); });
// Want to join another channel // Want to join another channel
AddStep("Press Ctrl + T", pressControlT); AddStep("Press keys", pressNewTabKeys);
// Selector should be visible // Selector should be visible
AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible); AddAssert("Selector is visible", () => chatOverlay.SelectionOverlayState == Visibility.Visible);
} }
[Test] [Test]
public void TestCtrlShiftTShortcut() public void TestRestoreTabShortcut()
{ {
AddStep("Join 3 channels", () => AddStep("Join 3 channels", () =>
{ {
@ -282,7 +287,7 @@ namespace osu.Game.Tests.Visual.Online
}); });
// Should do nothing // Should do nothing
AddStep("Press Ctrl + Shift + T", pressControlShiftT); AddStep("Press keys", pressRestoreTabKeys);
AddAssert("All channels still open", () => channelManager.JoinedChannels.Count == 3); AddAssert("All channels still open", () => channelManager.JoinedChannels.Count == 3);
// Close channel 1 // Close channel 1
@ -292,7 +297,7 @@ namespace osu.Game.Tests.Visual.Online
AddAssert("Other channels still open", () => channelManager.JoinedChannels.Count == 2); AddAssert("Other channels still open", () => channelManager.JoinedChannels.Count == 2);
// Reopen channel 1 // Reopen channel 1
AddStep("Press Ctrl + Shift + T", pressControlShiftT); AddStep("Press keys", pressRestoreTabKeys);
AddAssert("All channels now open", () => channelManager.JoinedChannels.Count == 3); AddAssert("All channels now open", () => channelManager.JoinedChannels.Count == 3);
AddAssert("Current channel is channel 1", () => currentChannel == channel1); AddAssert("Current channel is channel 1", () => currentChannel == channel1);
@ -305,13 +310,13 @@ namespace osu.Game.Tests.Visual.Online
AddAssert("Current channel is channel 3", () => currentChannel == channel3); AddAssert("Current channel is channel 3", () => currentChannel == channel3);
// Should first re-open channel 2 // Should first re-open channel 2
AddStep("Press Ctrl + Shift + T", pressControlShiftT); AddStep("Press keys", pressRestoreTabKeys);
AddAssert("Channel 1 still closed", () => !channelManager.JoinedChannels.Contains(channel1)); AddAssert("Channel 1 still closed", () => !channelManager.JoinedChannels.Contains(channel1));
AddAssert("Channel 2 now open", () => channelManager.JoinedChannels.Contains(channel2)); AddAssert("Channel 2 now open", () => channelManager.JoinedChannels.Contains(channel2));
AddAssert("Current channel is channel 2", () => currentChannel == channel2); AddAssert("Current channel is channel 2", () => currentChannel == channel2);
// Should then re-open channel 1 // Should then re-open channel 1
AddStep("Press Ctrl + Shift + T", pressControlShiftT); AddStep("Press keys", pressRestoreTabKeys);
AddAssert("All channels now open", () => channelManager.JoinedChannels.Count == 3); AddAssert("All channels now open", () => channelManager.JoinedChannels.Count == 3);
AddAssert("Current channel is channel 1", () => currentChannel == channel1); AddAssert("Current channel is channel 1", () => currentChannel == channel1);
} }
@ -324,27 +329,21 @@ namespace osu.Game.Tests.Visual.Online
InputManager.ReleaseKey(Key.AltLeft); InputManager.ReleaseKey(Key.AltLeft);
} }
private void pressControlW() private void pressCloseDocumentKeys() => pressKeysFor(PlatformActionType.DocumentClose);
{
InputManager.PressKey(Key.ControlLeft);
InputManager.Key(Key.W);
InputManager.ReleaseKey(Key.ControlLeft);
}
private void pressControlT() private void pressNewTabKeys() => pressKeysFor(PlatformActionType.TabNew);
{
InputManager.PressKey(Key.ControlLeft);
InputManager.Key(Key.T);
InputManager.ReleaseKey(Key.ControlLeft);
}
private void pressControlShiftT() private void pressRestoreTabKeys() => pressKeysFor(PlatformActionType.TabRestore);
private void pressKeysFor(PlatformActionType type)
{ {
InputManager.PressKey(Key.ControlLeft); var binding = host.PlatformKeyBindings.First(b => ((PlatformAction)b.Action).ActionType == type);
InputManager.PressKey(Key.ShiftLeft);
InputManager.Key(Key.T); foreach (var k in binding.KeyCombination.Keys)
InputManager.ReleaseKey(Key.ShiftLeft); InputManager.PressKey((Key)k);
InputManager.ReleaseKey(Key.ControlLeft);
foreach (var k in binding.KeyCombination.Keys)
InputManager.ReleaseKey((Key)k);
} }
private void clickDrawable(Drawable d) private void clickDrawable(Drawable d)