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

Refactor test to only allow init of actions

Browse Source
This commit is contained in:
Joseph Madamba 2024-02-27 22:42:36 -08:00
parent 351160f94e
commit dee57c7e72
2 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs
View File

@ -3,7 +3,6 @@
#nullable disable
using System;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
@ -26,6 +25,8 @@ namespace osu.Game.Tests.Visual.Gameplay
private GlobalActionContainer globalActionContainer;
private bool triggeredRetryButton;
[BackgroundDependencyLoader]
private void load(OsuGameBase game)
{
@ -35,12 +36,18 @@ namespace osu.Game.Tests.Visual.Gameplay
[SetUp]
public void SetUp() => Schedule(() =>
{
triggeredRetryButton = false;
globalActionContainer.Children = new Drawable[]
{
pauseOverlay = new PauseOverlay
{
OnResume = () => Logger.Log(@"Resume"),
OnRetry = () => Logger.Log(@"Retry"),
OnRetry = () =>
{
Logger.Log(@"Retry");
triggeredRetryButton = true;
},
OnQuit = () => Logger.Log(@"Quit"),
},
failOverlay = new FailOverlay
@ -224,17 +231,9 @@ namespace osu.Game.Tests.Visual.Gameplay
{
showOverlay();
bool triggered = false;
AddStep("Click retry button", () =>
{
var lastAction = pauseOverlay.OnRetry;
pauseOverlay.OnRetry = () => triggered = true;
AddStep("Click retry button", () => getButton(1).TriggerClick());
getButton(1).TriggerClick();
pauseOverlay.OnRetry = lastAction;
});
AddAssert("Action was triggered", () => triggered);
AddAssert("Retry was triggered", () => triggeredRetryButton);
AddAssert("Overlay is closed", () => pauseOverlay.State.Value == Visibility.Hidden);
}
@ -252,25 +251,9 @@ namespace osu.Game.Tests.Visual.Gameplay
InputManager.Key(Key.Down);
});
bool triggered = false;
Action lastAction = null;
AddStep("Press enter", () =>
{
lastAction = pauseOverlay.OnRetry;
pauseOverlay.OnRetry = () => triggered = true;
InputManager.Key(Key.Enter);
});
AddStep("Press enter", () => InputManager.Key(Key.Enter));
AddAssert("Action was triggered", () =>
{
if (lastAction != null)
{
pauseOverlay.OnRetry = lastAction;
lastAction = null;
}
return triggered;
});
AddAssert("Retry was triggered", () => triggeredRetryButton);
AddAssert("Overlay is closed", () => pauseOverlay.State.Value == Visibility.Hidden);
}

6
osu.Game/Screens/Play/GameplayMenuOverlay.cs
View File

@ -38,9 +38,9 @@ namespace osu.Game.Screens.Play
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
public Action? OnResume;
public Action? OnRetry;
public Action? OnQuit;
public Action? OnResume { get; init; }
public Action? OnRetry { get; init; }
public Action? OnQuit { get; init; }
/// <summary>
/// Action that is invoked when <see cref="GlobalAction.Back"/> is triggered.