h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 21:42:55 +08:00
Code Issues Releases Wiki Activity

Add missing null checks and avoid cross-test pollution

Browse Source
This commit is contained in:
Dean Herbert 2020-08-13 12:53:37 +09:00
parent 99bea6b8e9
commit 5b536aebe7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
View File

@ -49,6 +49,8 @@ namespace osu.Game.Tests.Visual.Gameplay
/// <param name="afterLoadAction">An action to run after container load.</param> /// <param name="afterLoadAction">An action to run after container load.</param>
public void ResetPlayer(bool interactive, Action beforeLoadAction = null, Action afterLoadAction = null) public void ResetPlayer(bool interactive, Action beforeLoadAction = null, Action afterLoadAction = null)
{ {
player = null;
audioManager.Volume.SetDefault(); audioManager.Volume.SetDefault();
InputManager.Clear(); InputManager.Clear();
@ -80,7 +82,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1); AddAssert("mod rate applied", () => Beatmap.Value.Track.Rate != 1);
AddStep("exit loader", () => loader.Exit()); AddStep("exit loader", () => loader.Exit());
AddUntilStep("wait for not current", () => !loader.IsCurrentScreen()); AddUntilStep("wait for not current", () => !loader.IsCurrentScreen());
AddAssert("player did not load", () => !player.IsLoaded); AddAssert("player did not load", () => player?.IsLoaded != true);
AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true); AddUntilStep("player disposed", () => loader.DisposalTask?.IsCompleted == true);
AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1); AddAssert("mod rate still applied", () => Beatmap.Value.Track.Rate != 1);
} }
@ -94,7 +96,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("wait for load ready", () => AddUntilStep("wait for load ready", () =>
{ {
moveMouse(); moveMouse();
return player.LoadState == LoadState.Ready; return player?.LoadState == LoadState.Ready;
}); });
AddRepeatStep("move mouse", moveMouse, 20); AddRepeatStep("move mouse", moveMouse, 20);
@ -222,7 +224,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false); AddStep("reset notification lock", () => sessionStatics.GetBindable<bool>(Static.MutedAudioNotificationShownOnce).Value = false);
AddStep("load player", () => ResetPlayer(false, beforeLoad, afterLoad)); AddStep("load player", () => ResetPlayer(false, beforeLoad, afterLoad));
AddUntilStep("wait for player", () => player.LoadState == LoadState.Ready); AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1); AddAssert("check for notification", () => container.NotificationOverlay.UnreadCount.Value == 1);
AddStep("click notification", () => AddStep("click notification", () =>