From 9b474b656d40f3b452d5c981ee78461ac2f83cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Fri, 13 Oct 2023 15:03:41 +0200 Subject: [PATCH] Fix key binding panel test failures from introducing placeholder text Whoops. --- .../Visual/Settings/TestSceneKeyBindingPanel.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs index fcbb16bef6..1c4e89e1a2 100644 --- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs +++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs @@ -11,6 +11,7 @@ using osu.Framework.Threading; using osu.Game.Graphics.Sprites; using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterfaceV2; +using osu.Game.Localisation; using osu.Game.Overlays; using osu.Game.Overlays.Settings; using osu.Game.Overlays.Settings.Sections.Input; @@ -157,7 +158,9 @@ namespace osu.Game.Tests.Visual.Settings clickClearButton(); - AddAssert("first binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType().First().Text.Text.ToString())); + AddAssert("first binding cleared", + () => multiBindingRow.ChildrenOfType().First().Text.Text, + () => Is.EqualTo(InputSettingsStrings.ActionHasNoKeyBinding)); AddStep("click second binding", () => { @@ -169,7 +172,9 @@ namespace osu.Game.Tests.Visual.Settings clickClearButton(); - AddAssert("second binding cleared", () => string.IsNullOrEmpty(multiBindingRow.ChildrenOfType().ElementAt(1).Text.Text.ToString())); + AddAssert("second binding cleared", + () => multiBindingRow.ChildrenOfType().ElementAt(1).Text.Text, + () => Is.EqualTo(InputSettingsStrings.ActionHasNoKeyBinding)); void clickClearButton() { @@ -327,7 +332,7 @@ namespace osu.Game.Tests.Visual.Settings KeyBindingConflictPopover popover = null; AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType().SingleOrDefault(), () => Is.Not.Null); AddStep("click second button", () => popover.ChildrenOfType().ElementAt(1).TriggerClick()); - checkBinding("Left (centre)", string.Empty); + checkBinding("Left (centre)", InputSettingsStrings.ActionHasNoKeyBinding.ToString()); checkBinding("Left (rim)", "M1"); } @@ -360,7 +365,7 @@ namespace osu.Game.Tests.Visual.Settings AddUntilStep("wait for popover", () => popover = panel.ChildrenOfType().SingleOrDefault(), () => Is.Not.Null); AddStep("click second button", () => popover.ChildrenOfType().ElementAt(1).TriggerClick()); checkBinding("Left (centre)", "M1"); - checkBinding("Left (rim)", string.Empty); + checkBinding("Left (rim)", InputSettingsStrings.ActionHasNoKeyBinding.ToString()); } [Test]