RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-04-01 22:48:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into scrolling-container-origin-adjust

Browse Source
This commit is contained in:
Dean Herbert 2019-12-27 09:29:06 +09:00 committed by GitHub
commit acef2b50e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs
View File

@ -67,9 +67,7 @@ namespace osu.Game.Tests.Visual.UserInterface
AddRepeatStep(@"add many simple", sendManyNotifications, 3); AddRepeatStep(@"add many simple", sendManyNotifications, 3);
AddWaitStep("wait some", 5); waitForCompletion();
checkProgressingCount(0);
AddStep(@"progress #3", sendUploadProgress); AddStep(@"progress #3", sendUploadProgress);
@ -77,9 +75,7 @@ namespace osu.Game.Tests.Visual.UserInterface
checkDisplayedCount(33); checkDisplayedCount(33);
AddWaitStep("wait some", 10); waitForCompletion();
checkProgressingCount(0);
} }
[Test] [Test]
@ -109,9 +105,9 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep(@"background progress #1", sendBackgroundUploadProgress); AddStep(@"background progress #1", sendBackgroundUploadProgress);
AddWaitStep("wait some", 5); checkProgressingCount(1);
checkProgressingCount(0); waitForCompletion();
checkDisplayedCount(2); 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 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() private void sendBarrage()
{ {
switch (RNG.Next(0, 4)) switch (RNG.Next(0, 4))