mirror of
https://github.com/ppy/osu
synced 2024-12-15 11:25:29 +00:00
Merge branch 'master' into scrolling-container-origin-adjust
This commit is contained in:
commit
acef2b50e6
@ -67,9 +67,7 @@ namespace osu.Game.Tests.Visual.UserInterface
|
||||
|
||||
AddRepeatStep(@"add many simple", sendManyNotifications, 3);
|
||||
|
||||
AddWaitStep("wait some", 5);
|
||||
|
||||
checkProgressingCount(0);
|
||||
waitForCompletion();
|
||||
|
||||
AddStep(@"progress #3", sendUploadProgress);
|
||||
|
||||
@ -77,9 +75,7 @@ namespace osu.Game.Tests.Visual.UserInterface
|
||||
|
||||
checkDisplayedCount(33);
|
||||
|
||||
AddWaitStep("wait some", 10);
|
||||
|
||||
checkProgressingCount(0);
|
||||
waitForCompletion();
|
||||
}
|
||||
|
||||
[Test]
|
||||
@ -109,9 +105,9 @@ namespace osu.Game.Tests.Visual.UserInterface
|
||||
|
||||
AddStep(@"background progress #1", sendBackgroundUploadProgress);
|
||||
|
||||
AddWaitStep("wait some", 5);
|
||||
checkProgressingCount(1);
|
||||
|
||||
checkProgressingCount(0);
|
||||
waitForCompletion();
|
||||
|
||||
checkDisplayedCount(2);
|
||||
|
||||
@ -190,6 +186,8 @@ namespace osu.Game.Tests.Visual.UserInterface
|
||||
|
||||
private void checkProgressingCount(int expected) => AddAssert($"progressing count is {expected}", () => progressingNotifications.Count == expected);
|
||||
|
||||
private void waitForCompletion() => AddUntilStep("wait for notification progress completion", () => progressingNotifications.Count == 0);
|
||||
|
||||
private void sendBarrage()
|
||||
{
|
||||
switch (RNG.Next(0, 4))
|
||||
|
Loading…
Reference in New Issue
Block a user