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

Add more tests and fix one remaining issue case

Browse Source
This commit is contained in:
Dean Herbert
2018-07-20 11:32:00 +09:00
parent d7f1766ee2
commit 64ead0fdf7
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
osu.Game.Tests/Visual/TestCasePlaySongSelect.cs
View File

@ -82,11 +82,10 @@ namespace osu.Game.Tests.Visual
public virtual void SetUp()
{
manager?.Delete(manager.GetAllUsableBeatmapSets());
Child = songSelect = new TestSongSelect();
}
//[Test]
[Test]
public void TestDummy()
{
AddAssert("dummy selected", () => songSelect.CurrentBeatmap == defaultBeatmap);
@ -99,7 +98,7 @@ namespace osu.Game.Tests.Visual
AddAssert("random map selected", () => songSelect.CurrentBeatmap != defaultBeatmap);
}
//[Test]
[Test]
public void TestSorting()
{
addManyTestMaps();
@ -114,24 +113,35 @@ namespace osu.Game.Tests.Visual
}
[Test]
public void TestRulesetChange()
public void ImportUnderDifferentRuleset()
{
AddStep("change ruleset", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == 2));
AddStep("import test maps", () =>
{
manager.Import(createTestBeatmapSet(0, rulesets.AvailableRulesets.Where(r => r.ID == 0).ToArray()));
manager.Import(createTestBeatmapSet(1, rulesets.AvailableRulesets.Where(r => r.ID == 2).ToArray()));
});
AddStep("change ruleset", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == 1));
changeRuleset(2);
importForRuleset(0);
AddUntilStep(() => songSelect.Carousel.SelectedBeatmap == null, "no selection");
AddStep("change ruleset", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == 0));
}
[Test]
public void ImportUnderCurrentRuleset()
{
changeRuleset(2);
importForRuleset(2);
importForRuleset(1);
AddUntilStep(() => songSelect.Carousel.SelectedBeatmap.RulesetID == 2, "has selection");
changeRuleset(1);
AddUntilStep(() => songSelect.Carousel.SelectedBeatmap.RulesetID == 1, "has selection");
changeRuleset(0);
AddUntilStep(() => songSelect.Carousel.SelectedBeatmap == null, "no selection");
}
private void importForRuleset(int id) => AddStep($"import test map for ruleset {id}", () => manager.Import(createTestBeatmapSet(getImportId(), rulesets.AvailableRulesets.Where(r => r.ID == id).ToArray())));
private static int importId;
private int getImportId() => ++importId;
private void changeRuleset(int id) => AddStep($"change ruleset to {id}", () => Ruleset.Value = rulesets.AvailableRulesets.First(r => r.ID == id));
private void addManyTestMaps()
{
AddStep("import test maps", () =>
@ -143,18 +153,16 @@ namespace osu.Game.Tests.Visual
});
}
private BeatmapSetInfo createTestBeatmapSet(int idOffset, RulesetInfo[] rulesets)
private BeatmapSetInfo createTestBeatmapSet(int setId, RulesetInfo[] rulesets)
{
int j = 0;
RulesetInfo getRuleset() => rulesets[j++ % rulesets.Length];
var beatmaps = new List<BeatmapInfo>();
int setId = 1234 + idOffset;
for (int i = 0; i < 6; i++)
{
int beatmapId = 1234 + idOffset + i;
int beatmapId = setId * 10 + i;
beatmaps.Add(new BeatmapInfo
{
@ -169,7 +177,6 @@ namespace osu.Game.Tests.Visual
});
}
return new BeatmapSetInfo
{
OnlineBeatmapSetID = setId,