sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Re-remove PopoverButton class with better test fix

Browse Source
This commit is contained in:
Dan Balasescu
2022-03-24 14:26:31 +09:00
parent 547418e47e
commit 90c7945bca
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Bindables;
using osu.Framework.Extensions; using osu.Framework.Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.UserInterface;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Framework.Utils; using osu.Framework.Utils;
@ -79,7 +80,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First(); var popoverButton = this.ChildrenOfType<Popover>().Single().ChildrenOfType<OsuButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
@ -97,7 +98,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First(); var popoverButton = this.ChildrenOfType<Popover>().Single().ChildrenOfType<OsuButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
@ -150,7 +151,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First(); var popoverButton = this.ChildrenOfType<Popover>().Single().ChildrenOfType<OsuButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });
@ -173,7 +174,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
ClickButtonWhenEnabled<CountdownButton>(); ClickButtonWhenEnabled<CountdownButton>();
AddStep("click the first countdown button", () => AddStep("click the first countdown button", () =>
{ {
var popoverButton = this.ChildrenOfType<CountdownButton.PopoverButton>().First(); var popoverButton = this.ChildrenOfType<Popover>().Single().ChildrenOfType<OsuButton>().First();
InputManager.MoveMouseTo(popoverButton); InputManager.MoveMouseTo(popoverButton);
InputManager.Click(MouseButton.Left); InputManager.Click(MouseButton.Left);
}); });

6
osu.Game/Screens/OnlinePlay/Multiplayer/Match/CountdownButton.cs
View File

@ -64,7 +64,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
foreach (var duration in available_delays) foreach (var duration in available_delays)
{ {
flow.Add(new PopoverButton flow.Add(new OsuButton
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = $"Start match in {duration.Humanize()}", Text = $"Start match in {duration.Humanize()}",
@ -79,9 +79,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
return new OsuPopover { Child = flow }; return new OsuPopover { Child = flow };
} }
public class PopoverButton : OsuButton
{
}
} }
} }