mirror of
https://github.com/ppy/osu.git
synced 2025-02-15 17:23:52 +08:00
Consolidate loader animation tests (#4836)
Consolidate loader animation tests Co-authored-by: Dean Herbert <pe@ppy.sh>
This commit is contained in:
commit
7c80dbd635
@ -53,38 +53,12 @@ namespace osu.Game.Tests.Visual.Menus
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestShortLoad()
|
public void TestDelayedLoad()
|
||||||
{
|
{
|
||||||
bool logoVisible = false;
|
|
||||||
|
|
||||||
AddStep("begin loading", () => LoadScreen(loader = new TestLoader()));
|
AddStep("begin loading", () => LoadScreen(loader = new TestLoader()));
|
||||||
AddWaitStep("wait", 3);
|
AddUntilStep("wait for logo visible", () => loader.Logo?.Alpha > 0);
|
||||||
AddStep("finish loading", () =>
|
AddStep("finish loading", () => loader.AllowLoad.Set());
|
||||||
{
|
|
||||||
logoVisible = loader.Logo?.Alpha > 0;
|
|
||||||
loader.AllowLoad.Set();
|
|
||||||
});
|
|
||||||
|
|
||||||
AddAssert("loaded", () => loader.Logo != null && loader.ScreenLoaded);
|
AddAssert("loaded", () => loader.Logo != null && loader.ScreenLoaded);
|
||||||
AddAssert("logo was visible", () => logoVisible);
|
|
||||||
AddUntilStep("logo gone", () => loader.Logo?.Alpha == 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
|
||||||
public void TestLongLoad()
|
|
||||||
{
|
|
||||||
bool logoVisible = false;
|
|
||||||
|
|
||||||
AddStep("begin loading", () => LoadScreen(loader = new TestLoader()));
|
|
||||||
AddWaitStep("wait", 10);
|
|
||||||
AddStep("finish loading", () =>
|
|
||||||
{
|
|
||||||
logoVisible = loader.Logo?.Alpha > 0;
|
|
||||||
loader.AllowLoad.Set();
|
|
||||||
});
|
|
||||||
|
|
||||||
AddAssert("loaded", () => loader.Logo != null && loader.ScreenLoaded);
|
|
||||||
AddAssert("logo was visible", () => logoVisible);
|
|
||||||
AddUntilStep("logo gone", () => loader.Logo?.Alpha == 0);
|
AddUntilStep("logo gone", () => loader.Logo?.Alpha == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user