h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 16:25:32 +08:00
Code Issues Releases Wiki Activity

Test Class Fixes

Browse Source
This commit is contained in:
Leon Gebler 2020-10-13 19:20:15 +02:00
parent 663b806974
commit 28d3295f9f
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Tests/Visual/UserInterface/TestSceneModSettings.cs
View File

@ -9,6 +9,7 @@ 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.Utils; using osu.Framework.Utils;
using osu.Framework.Testing;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -30,8 +31,6 @@ namespace osu.Game.Tests.Visual.UserInterface
private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2(); private readonly Mod testCustomisableAutoOpenMod = new TestModCustomisable2();
private readonly Mod testCustomisableMenuCoveredMod = new TestModCustomisable1();
[SetUp] [SetUp]
public void SetUp() => Schedule(() => public void SetUp() => Schedule(() =>
{ {
@ -107,8 +106,8 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("change mod settings menu width to full screen", () => modSelect.SetModSettingsWidth(1.0f)); AddStep("change mod settings menu width to full screen", () => modSelect.SetModSettingsWidth(1.0f));
AddStep("select cm2", () => modSelect.SelectMod(testCustomisableAutoOpenMod)); AddStep("select cm2", () => modSelect.SelectMod(testCustomisableAutoOpenMod));
AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1); AddAssert("Customisation opened", () => modSelect.ModSettingsContainer.Alpha == 1);
AddStep("hover over mod behind settings menu", () => InputManager.MoveMouseTo(modSelect.GetModButton(testCustomisableMenuCoveredMod))); AddStep("hover over mod behind settings menu", () => InputManager.MoveMouseTo(modSelect.GetModButton(testCustomisableMod)));
AddAssert("Mod is not considered hovered over", () => !modSelect.GetModButton(testCustomisableMenuCoveredMod).IsHovered); AddAssert("Mod is not considered hovered over", () => !modSelect.GetModButton(testCustomisableMod).IsHovered);
AddStep("left click mod", () => InputManager.Click(MouseButton.Left)); AddStep("left click mod", () => InputManager.Click(MouseButton.Left));
AddAssert("only cm2 is active", () => SelectedMods.Value.Count == 1); AddAssert("only cm2 is active", () => SelectedMods.Value.Count == 1);
AddStep("right click mod", () => InputManager.Click(MouseButton.Right)); AddStep("right click mod", () => InputManager.Click(MouseButton.Right));
@ -143,19 +142,14 @@ namespace osu.Game.Tests.Visual.UserInterface
public ModButton GetModButton(Mod mod) public ModButton GetModButton(Mod mod)
{ {
return ModSectionsContainer.Children.Single(s => s.ModType == mod.Type) return ModSectionsContainer.ChildrenOfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType()));
.ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType()));
} }
public void SelectMod(Mod mod) => public void SelectMod(Mod mod) =>
GetModButton(mod).SelectNext(1); GetModButton(mod).SelectNext(1);
public float SetModSettingsWidth(float newWidth) public void SetModSettingsWidth(float newWidth) =>
{
float oldWidth = ModSettingsContainer.Width;
ModSettingsContainer.Width = newWidth; ModSettingsContainer.Width = newWidth;
return oldWidth;
}
} }
public class TestRulesetInfo : RulesetInfo public class TestRulesetInfo : RulesetInfo