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

Merge branch 'master' into fix-no-break-info

Browse Source
This commit is contained in:
Dean Herbert 2020-03-28 12:39:37 +09:00 committed by GitHub
commit e9dc545429
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Tests/Visual/Menus/TestSceneLoader.cs
View File

@ -36,8 +36,6 @@ namespace osu.Game.Tests.Visual.Menus
[Test] [Test]
public void TestInstantLoad() public void TestInstantLoad()
{ {
// visual only, very impossible to test this using asserts.
AddStep("load immediately", () => AddStep("load immediately", () =>
{ {
loader = new TestLoader(); loader = new TestLoader();
@ -46,12 +44,17 @@ namespace osu.Game.Tests.Visual.Menus
LoadScreen(loader); LoadScreen(loader);
}); });
AddAssert("spinner did not display", () => loader.LoadingSpinner?.Alpha == 0); spinnerNotPresentOrHidden();
AddUntilStep("loaded", () => loader.ScreenLoaded); AddUntilStep("loaded", () => loader.ScreenLoaded);
AddUntilStep("not current", () => !loader.IsCurrentScreen()); AddUntilStep("not current", () => !loader.IsCurrentScreen());
spinnerNotPresentOrHidden();
} }
private void spinnerNotPresentOrHidden() =>
AddAssert("spinner did not display", () => loader.LoadingSpinner == null || loader.LoadingSpinner.Alpha == 0);
[Test] [Test]
public void TestDelayedLoad() public void TestDelayedLoad()
{ {