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

Centralise creation of playlist in test scene

Browse Source
This commit is contained in:
Salman Ahmed
2022-07-14 02:19:23 +03:00
parent 102d0415f1
commit 099a7e90d6
1 changed files with 46 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,14 +245,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
[Test] [Test]
public void TestExpiredItems() public void TestExpiredItems()
{ {
AddStep("create playlist", () => createPlaylist(p =>
{ {
Child = playlist = new TestPlaylist p.Items.Clear();
{ p.Items.AddRange(new[]
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(500, 300),
Items =
{ {
new PlaylistItem(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo) new PlaylistItem(new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo)
{ {
@ -277,8 +273,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
new APIMod(new OsuModAutoplay()) new APIMod(new OsuModAutoplay())
} }
} }
} });
};
}); });
AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded)); AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));
@ -321,6 +316,29 @@ namespace osu.Game.Tests.Visual.Multiplayer
=> AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible",
() => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible); () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
private void createPlaylistWithBeatmaps(Func<IEnumerable<IBeatmapInfo>> beatmaps) => createPlaylist(p =>
{
int index = 0;
p.Items.Clear();
foreach (var b in beatmaps())
{
p.Items.Add(new PlaylistItem(b)
{
ID = index++,
OwnerID = 2,
RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
RequiredMods = new[]
{
new APIMod(new OsuModHardRock()),
new APIMod(new OsuModDoubleTime()),
new APIMod(new OsuModAutoplay())
}
});
}
});
private void createPlaylist(Action<TestPlaylist> setupPlaylist = null) private void createPlaylist(Action<TestPlaylist> setupPlaylist = null)
{ {
AddStep("create playlist", () => AddStep("create playlist", () =>
@ -332,8 +350,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
Size = new Vector2(500, 300) Size = new Vector2(500, 300)
}; };
setupPlaylist?.Invoke(playlist);
for (int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
{ {
playlist.Items.Add(new PlaylistItem(i % 2 == 1 playlist.Items.Add(new PlaylistItem(i % 2 == 1
@ -360,39 +376,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
} }
}); });
} }
});
AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded)); setupPlaylist?.Invoke(playlist);
}
private void createPlaylistWithBeatmaps(Func<IEnumerable<IBeatmapInfo>> beatmaps)
{
AddStep("create playlist", () =>
{
Child = playlist = new TestPlaylist
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(500, 300)
};
int index = 0;
foreach (var b in beatmaps())
{
playlist.Items.Add(new PlaylistItem(b)
{
ID = index++,
OwnerID = 2,
RulesetID = new OsuRuleset().RulesetInfo.OnlineID,
RequiredMods = new[]
{
new APIMod(new OsuModHardRock()),
new APIMod(new OsuModDoubleTime()),
new APIMod(new OsuModAutoplay())
}
});
}
}); });
AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded)); AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));