sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 09:03:50 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7917 from smoogipoo/fix-drawableroom-async-test

Browse Source 
Fix possible test failures due to async loads
This commit is contained in:
Dean Herbert
2020-02-20 14:37:51 +09:00
committed by GitHub
parent bcddd5f2da 128a9cf075
commit 0cf0099fd5
1 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
View File

@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
typeof(DrawableRoomPlaylistItem) typeof(DrawableRoomPlaylistItem)
}; };
private DrawableRoomPlaylist playlist; private TestPlaylist playlist;
[Test] [Test]
public void TestNonEditableNonSelectable() public void TestNonEditableNonSelectable()
@ -211,9 +211,11 @@ namespace osu.Game.Tests.Visual.Multiplayer
private void assertDeleteButtonVisibility(int index, bool visible) private void assertDeleteButtonVisibility(int index, bool visible)
=> AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<IconButton>().ElementAt(2 + index * 2).Alpha > 0) == visible); => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<IconButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
private void createPlaylist(bool allowEdit, bool allowSelection) => AddStep("create playlist", () => private void createPlaylist(bool allowEdit, bool allowSelection)
{ {
Child = playlist = new DrawableRoomPlaylist(allowEdit, allowSelection) AddStep("create playlist", () =>
{
Child = playlist = new TestPlaylist(allowEdit, allowSelection)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -236,5 +238,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
}); });
} }
}); });
AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));
}
private class TestPlaylist : DrawableRoomPlaylist
{
public new IReadOnlyDictionary<PlaylistItem, RearrangeableListItem<PlaylistItem>> ItemMap => base.ItemMap;
public TestPlaylist(bool allowEdit, bool allowSelection)
: base(allowEdit, allowSelection)
{
}
}
} }
} }