Add test coverage of pause from resume overlay

This commit is contained in:
Dean Herbert 2021-02-15 15:57:34 +09:00
parent 1aea840504
commit 4f264758a4

View File

@ -69,13 +69,14 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("wait for hitobjects", () => Player.HealthProcessor.Health.Value < 1); AddUntilStep("wait for hitobjects", () => Player.HealthProcessor.Health.Value < 1);
pauseAndConfirm(); pauseAndConfirm();
resume(); resume();
confirmPausedWithNoOverlay(); confirmPausedWithNoOverlay();
pauseAndConfirm(); pauseAndConfirm();
AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden); AddUntilStep("resume overlay is not active", () => Player.DrawableRuleset.ResumeOverlay.State.Value == Visibility.Hidden);
confirmPaused(); confirmPaused();
confirmNotExited();
} }
[Test] [Test]
@ -100,7 +101,7 @@ namespace osu.Game.Tests.Visual.Gameplay
pauseExternally(); pauseExternally();
confirmResumed(); confirmResumed();
AddAssert("not exited", () => Player.IsCurrentScreen()); confirmNotExited();
} }
[Test] [Test]
@ -114,7 +115,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("pause via exit key", () => Player.ExitViaPause()); AddStep("pause via exit key", () => Player.ExitViaPause());
confirmResumed(); confirmResumed();
AddAssert("not exited", () => Player.IsCurrentScreen()); confirmNotExited();
} }
[Test] [Test]
@ -277,7 +278,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private void exitAndConfirm() private void exitAndConfirm()
{ {
AddUntilStep("player not exited", () => Player.IsCurrentScreen()); confirmNotExited();
AddStep("exit", () => Player.Exit()); AddStep("exit", () => Player.Exit());
confirmExited(); confirmExited();
confirmNoTrackAdjustments(); confirmNoTrackAdjustments();
@ -286,7 +287,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private void confirmPaused() private void confirmPaused()
{ {
confirmClockRunning(false); confirmClockRunning(false);
AddAssert("player not exited", () => Player.IsCurrentScreen()); confirmNotExited();
AddAssert("player not failed", () => !Player.HasFailed); AddAssert("player not failed", () => !Player.HasFailed);
AddAssert("pause overlay shown", () => Player.PauseOverlayVisible); AddAssert("pause overlay shown", () => Player.PauseOverlayVisible);
} }
@ -303,10 +304,8 @@ namespace osu.Game.Tests.Visual.Gameplay
confirmPauseOverlayShown(false); confirmPauseOverlayShown(false);
} }
private void confirmExited() private void confirmExited() => AddUntilStep("player exited", () => !Player.IsCurrentScreen());
{ private void confirmNotExited() => AddAssert("player not exited", () => Player.IsCurrentScreen());
AddUntilStep("player exited", () => !Player.IsCurrentScreen());
}
private void confirmNoTrackAdjustments() private void confirmNoTrackAdjustments()
{ {