RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-17 04:27:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable NRT in TestScenePresentScore

Browse Source
This commit is contained in:
Bartłomiej Dach 2024-05-20 14:46:28 +02:00
parent 2aa9328830
commit 85f85dee9e
No known key found for this signature in database
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/Navigation/TestScenePresentScore.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
#nullable disable
using System; using System;
using System.Linq; using System.Linq;
using NUnit.Framework; using NUnit.Framework;
@ -26,7 +24,7 @@ namespace osu.Game.Tests.Visual.Navigation
{ {
public partial class TestScenePresentScore : OsuGameTestScene public partial class TestScenePresentScore : OsuGameTestScene
{ {
private BeatmapSetInfo beatmap; private BeatmapSetInfo beatmap = null!;
[SetUpSteps] [SetUpSteps]
public new void SetUpSteps() public new void SetUpSteps()
@ -64,7 +62,7 @@ namespace osu.Game.Tests.Visual.Navigation
Ruleset = new OsuRuleset().RulesetInfo Ruleset = new OsuRuleset().RulesetInfo
}, },
} }
})?.Value; })!.Value;
}); });
} }
@ -171,9 +169,9 @@ namespace osu.Game.Tests.Visual.Navigation
AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu); AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
} }
private Func<ScoreInfo> importScore(int i, RulesetInfo ruleset = null) private Func<ScoreInfo> importScore(int i, RulesetInfo? ruleset = null)
{ {
ScoreInfo imported = null; ScoreInfo? imported = null;
AddStep($"import score {i}", () => AddStep($"import score {i}", () =>
{ {
imported = Game.ScoreManager.Import(new ScoreInfo imported = Game.ScoreManager.Import(new ScoreInfo
@ -188,14 +186,14 @@ namespace osu.Game.Tests.Visual.Navigation
AddAssert($"import {i} succeeded", () => imported != null); AddAssert($"import {i} succeeded", () => imported != null);
return () => imported; return () => imported!;
} }
/// <summary> /// <summary>
/// Some tests test waiting for a particular screen twice in a row, but expect a new instance each time. /// Some tests test waiting for a particular screen twice in a row, but expect a new instance each time.
/// There's a case where they may succeed incorrectly if we don't compare against the previous instance. /// There's a case where they may succeed incorrectly if we don't compare against the previous instance.
/// </summary> /// </summary>
private IScreen lastWaitedScreen; private IScreen lastWaitedScreen = null!;
private void presentAndConfirm(Func<ScoreInfo> getImport, ScorePresentType type) private void presentAndConfirm(Func<ScoreInfo> getImport, ScorePresentType type)
{ {