mirror of
https://github.com/ppy/osu.git
synced 2025-01-26 23:43:03 +08:00
Add test coverage for key binding conflict resolution
This commit is contained in:
parent
b09252a8f8
commit
5d637520e7
@ -10,8 +10,11 @@ using osu.Framework.Testing;
|
|||||||
using osu.Framework.Threading;
|
using osu.Framework.Threading;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Graphics.UserInterface;
|
using osu.Game.Graphics.UserInterface;
|
||||||
|
using osu.Game.Graphics.UserInterfaceV2;
|
||||||
using osu.Game.Overlays;
|
using osu.Game.Overlays;
|
||||||
|
using osu.Game.Overlays.Settings;
|
||||||
using osu.Game.Overlays.Settings.Sections.Input;
|
using osu.Game.Overlays.Settings.Sections.Input;
|
||||||
|
using osu.Game.Rulesets.Taiko;
|
||||||
using osuTK.Input;
|
using osuTK.Input;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual.Settings
|
namespace osu.Game.Tests.Visual.Settings
|
||||||
@ -288,6 +291,106 @@ namespace osu.Game.Tests.Visual.Settings
|
|||||||
AddUntilStep("all reset section bindings buttons shown", () => panel.ChildrenOfType<ResetButton>().All(button => button.Alpha == 1));
|
AddUntilStep("all reset section bindings buttons shown", () => panel.ChildrenOfType<ResetButton>().All(button => button.Alpha == 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestBindingConflictResolvedByRollback()
|
||||||
|
{
|
||||||
|
AddStep("reset taiko section to default", () =>
|
||||||
|
{
|
||||||
|
var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
|
||||||
|
section.ChildrenOfType<ResetButton>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
|
||||||
|
AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
|
||||||
|
scrollToAndStartBinding("Left (rim)");
|
||||||
|
AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
|
||||||
|
|
||||||
|
KeyBindingConflictPopover popover = null;
|
||||||
|
AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
|
||||||
|
AddStep("click first button", () => popover.ChildrenOfType<RoundedButton>().First().TriggerClick());
|
||||||
|
checkBinding("Left (centre)", "M1");
|
||||||
|
checkBinding("Left (rim)", "M2");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestBindingConflictResolvedByOverwrite()
|
||||||
|
{
|
||||||
|
AddStep("reset taiko section to default", () =>
|
||||||
|
{
|
||||||
|
var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
|
||||||
|
section.ChildrenOfType<ResetButton>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
|
||||||
|
AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
|
||||||
|
scrollToAndStartBinding("Left (rim)");
|
||||||
|
AddStep("attempt to bind M1 to two keys", () => InputManager.Click(MouseButton.Left));
|
||||||
|
|
||||||
|
KeyBindingConflictPopover popover = null;
|
||||||
|
AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
|
||||||
|
AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
|
||||||
|
checkBinding("Left (centre)", string.Empty);
|
||||||
|
checkBinding("Left (rim)", "M1");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestBindingConflictCausedByResetToDefaultOfSingleRow()
|
||||||
|
{
|
||||||
|
AddStep("reset taiko section to default", () =>
|
||||||
|
{
|
||||||
|
var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
|
||||||
|
section.ChildrenOfType<ResetButton>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
|
||||||
|
AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
|
||||||
|
scrollToAndStartBinding("Left (centre)");
|
||||||
|
AddStep("clear binding", () =>
|
||||||
|
{
|
||||||
|
var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
|
||||||
|
row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
scrollToAndStartBinding("Left (rim)");
|
||||||
|
AddStep("bind M1", () => InputManager.Click(MouseButton.Left));
|
||||||
|
|
||||||
|
AddStep("reset Left (centre) to default", () =>
|
||||||
|
{
|
||||||
|
var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
|
||||||
|
row.ChildrenOfType<RevertToDefaultButton<bool>>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
|
||||||
|
KeyBindingConflictPopover popover = null;
|
||||||
|
AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Not.Null);
|
||||||
|
AddStep("click second button", () => popover.ChildrenOfType<RoundedButton>().ElementAt(1).TriggerClick());
|
||||||
|
checkBinding("Left (centre)", "M1");
|
||||||
|
checkBinding("Left (rim)", string.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void TestResettingEntireSectionDoesNotCauseBindingConflicts()
|
||||||
|
{
|
||||||
|
AddStep("reset taiko section to default", () =>
|
||||||
|
{
|
||||||
|
var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
|
||||||
|
section.ChildrenOfType<ResetButton>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
AddStep("move mouse to centre", () => InputManager.MoveMouseTo(panel.ScreenSpaceDrawQuad.Centre));
|
||||||
|
AddUntilStep("wait for collapsed", () => panel.ChildrenOfType<SettingsSidebar>().Single().Expanded.Value, () => Is.False);
|
||||||
|
scrollToAndStartBinding("Left (centre)");
|
||||||
|
AddStep("clear binding", () =>
|
||||||
|
{
|
||||||
|
var row = panel.ChildrenOfType<KeyBindingRow>().First(r => r.ChildrenOfType<OsuSpriteText>().Any(s => s.Text.ToString() == "Left (centre)"));
|
||||||
|
row.ChildrenOfType<KeyBindingRow.ClearButton>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
scrollToAndStartBinding("Left (rim)");
|
||||||
|
AddStep("bind M1", () => InputManager.Click(MouseButton.Left));
|
||||||
|
|
||||||
|
AddStep("reset taiko section to default", () =>
|
||||||
|
{
|
||||||
|
var section = panel.ChildrenOfType<VariantBindingsSubsection>().First(section => new TaikoRuleset().RulesetInfo.Equals(section.Ruleset));
|
||||||
|
section.ChildrenOfType<ResetButton>().Single().TriggerClick();
|
||||||
|
});
|
||||||
|
AddWaitStep("wait a bit", 3);
|
||||||
|
AddUntilStep("conflict popover not shown", () => panel.ChildrenOfType<KeyBindingConflictPopover>().SingleOrDefault(), () => Is.Null);
|
||||||
|
}
|
||||||
|
|
||||||
private void checkBinding(string name, string keyName)
|
private void checkBinding(string name, string keyName)
|
||||||
{
|
{
|
||||||
AddAssert($"Check {name} is bound to {keyName}", () =>
|
AddAssert($"Check {name} is bound to {keyName}", () =>
|
||||||
|
Loading…
Reference in New Issue
Block a user