Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move test beatmap from TestCasePlayer into an instantiable class #2205

Merged
merged 6 commits into from Mar 13, 2018
Merged

Move test beatmap from TestCasePlayer into an instantiable class #2205

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7406cb2
Split out test beatmap from TestCasePlayer into instantiable class
smoogipoo Mar 12, 2018
b91524d
Give TestWorkingBeatmap's track a valid length
smoogipoo Mar 12, 2018
13c2043
Fix build issues
smoogipoo Mar 12, 2018
706c26c
Remove extra whitespace
smoogipoo Mar 13, 2018
e32eec9
No more caching
smoogipoo Mar 13, 2018
e9cd97c
Merge branch 'master' into test-beatmap
peppy Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions osu.Game.Rulesets.Catch/Tests/TestCaseBananaShower.cs
View file
Open in desktop
Expand Up @@ -28,16 +28,14 @@ public TestCaseBananaShower()
{
}

protected override Beatmap CreateBeatmap()
protected override Beatmap CreateBeatmap(Ruleset ruleset)
{
var beatmap = new Beatmap
{
BeatmapInfo = new BeatmapInfo
{
BaseDifficulty = new BeatmapDifficulty
{
CircleSize = 6,
}
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
Ruleset = ruleset.RulesetInfo
}
};

Expand Down
9 changes: 4 additions & 5 deletions osu.Game.Rulesets.Catch/Tests/TestCaseCatchStacker.cs
View file
Open in desktop
Expand Up @@ -15,19 +15,18 @@ public TestCaseCatchStacker()
{
}

protected override Beatmap CreateBeatmap()
protected override Beatmap CreateBeatmap(Ruleset ruleset)
{
var beatmap = new Beatmap
{
BeatmapInfo = new BeatmapInfo
{
BaseDifficulty = new BeatmapDifficulty
{
CircleSize = 6,
}
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 },
Ruleset = ruleset.RulesetInfo
}
};


for (int i = 0; i < 512; i++)
beatmap.HitObjects.Add(new Fruit { X = 0.5f + i / 2048f * (i % 10 - 5), StartTime = i * 100, NewCombo = i % 8 == 0 });

Expand Down
5 changes: 3 additions & 2 deletions osu.Game.Rulesets.Catch/Tests/TestCaseHyperdash.cs
View file
Open in desktop
Expand Up @@ -15,9 +15,10 @@ public TestCaseHyperdash()
{
}

protected override Beatmap CreateBeatmap()
protected override Beatmap CreateBeatmap(Ruleset ruleset)
{
var beatmap = new Beatmap();
var beatmap = new Beatmap { BeatmapInfo = { Ruleset = ruleset.RulesetInfo } };


for (int i = 0; i < 512; i++)
if (i % 5 < 3)
Expand Down