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

split out method for reuse

Browse Source
This commit is contained in:
David Zhao 2019-06-10 18:34:24 +09:00
parent d7cb932606
commit 1aa865c3fb
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
View File

@ -138,7 +138,7 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
createSongSelect(); createSongSelect();
changeRuleset(2); changeRuleset(2);
importForRuleset(0); addRulesetImportStep(0);
AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmap == null); AddUntilStep("no selection", () => songSelect.Carousel.SelectedBeatmap == null);
} }
@ -147,8 +147,8 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
createSongSelect(); createSongSelect();
changeRuleset(2); changeRuleset(2);
importForRuleset(2); addRulesetImportStep(2);
importForRuleset(1); addRulesetImportStep(1);
AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap.RulesetID == 2); AddUntilStep("has selection", () => songSelect.Carousel.SelectedBeatmap.RulesetID == 2);
changeRuleset(1); changeRuleset(1);
@ -223,7 +223,7 @@ namespace osu.Game.Tests.Visual.SongSelect
}); });
AddRepeatStep($"Create beatmaps {test_count} times", () => AddRepeatStep($"Create beatmaps {test_count} times", () =>
{ {
manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == 0).ToArray())); importForRuleset(0);
Scheduler.AddDelayed(() => Scheduler.AddDelayed(() =>
{ {
@ -240,15 +240,16 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
int? previousID = null; int? previousID = null;
createSongSelect(); createSongSelect();
importForRuleset(0); addRulesetImportStep(0);
AddStep("Move to last difficulty", () => songSelect.Carousel.SelectBeatmap(songSelect.Carousel.BeatmapSets.First().Beatmaps.Last())); AddStep("Move to last difficulty", () => songSelect.Carousel.SelectBeatmap(songSelect.Carousel.BeatmapSets.First().Beatmaps.Last()));
AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID); AddStep("Store current ID", () => previousID = songSelect.Carousel.SelectedBeatmap.ID);
AddStep("Hide first beatmap", () => manager.Hide(songSelect.Carousel.SelectedBeatmapSet.Beatmaps.First())); AddStep("Hide first beatmap", () => manager.Hide(songSelect.Carousel.SelectedBeatmapSet.Beatmaps.First()));
AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmap.ID == previousID); AddAssert("Selected beatmap has not changed", () => songSelect.Carousel.SelectedBeatmap.ID == previousID);
} }
private void importForRuleset(int id) => AddStep($"import test map for ruleset {id}", private void addRulesetImportStep(int id) => AddStep($"import test map for ruleset {id}", () => importForRuleset(id));
() => manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray())));
private void importForRuleset(int id) => manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray()));
private static int importId; private static int importId;
private int getImportId() => ++importId; private int getImportId() => ++importId;