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

fix ResetBracketTeams tests

Browse Source 
also fixes formatting and var naming issues
This commit is contained in:
Dao Heng Liu 2023-07-19 01:59:40 +01:00
parent e67253ed1e
commit 68495c937d
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game.Tournament.Tests/Screens/TestSceneLadderEditorScreen.cs
View File

@ -3,9 +3,13 @@
#nullable disable
using System;
using System.Linq;
using Newtonsoft.Json;
using NUnit.Framework;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Logging;
using osu.Game.Graphics.Cursor;
using osu.Game.Tournament.Screens.Editors;
using osu.Framework.Testing;
@ -35,12 +39,16 @@ namespace osu.Game.Tournament.Tests.Screens
[Test]
public void TestResetBracketTeamsCancelled()
{
Bindable<string> matchBeforeReset = new Bindable<string>();
AddStep("save current match state", () =>
{
matchBeforeReset.Value = JsonConvert.SerializeObject(Ladder.CurrentMatch.Value);
});
AddStep("pull up context menu", () =>
{
InputManager.MoveMouseTo(ladderEditorScreen);
InputManager.Click(MouseButton.Right);
});
AddStep("click Reset teams button", () =>
{
InputManager.MoveMouseTo(osuContextMenuContainer.ChildrenOfType<DrawableOsuMenuItem>().Last(p =>
@ -48,19 +56,16 @@ namespace osu.Game.Tournament.Tests.Screens
InputManager.Click(MouseButton.Left);
});
AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
AddAssert("dialog displayed", () => DialogOverlay.CurrentDialog is LadderResetTeamsDialog);
AddStep("click cancel", () =>
{
InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
InputManager.MoveMouseTo(DialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().Last());
InputManager.Click(MouseButton.Left);
});
AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
AddUntilStep("dialog dismissed", () => DialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
AddAssert("assert ladder teams unchanged", () =>
{
return !Ladder.Matches.Any(m => m.Team1.Value == null && m.Team2.Value == null);
});
AddAssert("assert ladder teams unchanged", () => string.Equals(matchBeforeReset.Value, JsonConvert.SerializeObject(Ladder.CurrentMatch.Value), StringComparison.Ordinal));
}
[Test]
@ -79,22 +84,19 @@ namespace osu.Game.Tournament.Tests.Screens
InputManager.Click(MouseButton.Left);
});
AddAssert("dialog displayed", () => dialogOverlay.CurrentDialog is LadderResetTeamsDialog);
AddAssert("dialog displayed", () => DialogOverlay.CurrentDialog is LadderResetTeamsDialog);
AddStep("click confirmation", () =>
{
InputManager.MoveMouseTo(dialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().First());
InputManager.MoveMouseTo(DialogOverlay.CurrentDialog.ChildrenOfType<PopupDialogButton>().First());
InputManager.PressButton(MouseButton.Left);
});
AddUntilStep("dialog dismissed", () => dialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
AddUntilStep("dialog dismissed", () => DialogOverlay.CurrentDialog is not LadderResetTeamsDialog);
AddStep("release mouse button", () => InputManager.ReleaseButton(MouseButton.Left));
AddAssert("assert ladder teams reset", () =>
{
return Ladder.Matches.All(m => m.Team1.Value == null && m.Team2.Value == null);
});
AddAssert("assert ladder teams reset", () => Ladder.CurrentMatch.Value.Team1.Value == null && Ladder.CurrentMatch.Value.Team2.Value == null);
}
}
}

6
osu.Game.Tournament.Tests/TournamentTestScene.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Tournament.Tests
public abstract partial class TournamentTestScene : OsuManualInputManagerTestScene
{
private TournamentMatch match;
protected DialogOverlay dialogOverlay;
protected DialogOverlay DialogOverlay;
[Cached]
protected LadderInfo Ladder { get; private set; } = new LadderInfo();
@ -48,9 +48,9 @@ namespace osu.Game.Tournament.Tests
Ruleset.BindTo(Ladder.Ruleset);
Dependencies.CacheAs(new StableInfo(storage));
Add(dialogOverlay = new DialogOverlay { Depth = -1 });
Add(DialogOverlay = new DialogOverlay { Depth = -1 });
Dependencies.CacheAs<IDialogOverlay>(dialogOverlay);
Dependencies.CacheAs<IDialogOverlay>(DialogOverlay);
}
[SetUpSteps]

1
osu.Game.Tournament/Screens/Editors/Components/TournamentClearAllDialog.cs
View File

@ -8,7 +8,6 @@ using osu.Game.Overlays.Dialog;
namespace osu.Game.Tournament.Screens.Editors.Components
{
public partial class TournamentClearAllDialog : DangerousActionDialog
{
public TournamentClearAllDialog(IList storage)
{