Add the playable beatmap as check argument

This is different from the working beatmap's `.Beatmap` property in that it is mutated by the ruleset/editor.

So hit objects, for example, are actually of type `Slider` and such instead of the legacy `ConvertSlider`.

This should be preferred over `workingBeatmap.Beatmap`.
This commit is contained in:
Naxess
2021-04-20 01:31:51 +02:00
parent 9a69ca34a6
commit 8656176ab8
11 changed files with 36 additions and 29 deletions

View File

@ -55,7 +55,7 @@ namespace osu.Game.Tests.Editing.Checks
beatmap.Metadata.BackgroundFile = null;
var mock = getMockWorkingBeatmap(null, System.Array.Empty<byte>());
Assert.That(check.Run(mock.Object), Is.Empty);
Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
}
[Test]
@ -63,7 +63,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var mock = getMockWorkingBeatmap(new Texture(1920, 1080));
Assert.That(check.Run(mock.Object), Is.Empty);
Assert.That(check.Run(beatmap, mock.Object), Is.Empty);
}
[Test]
@ -71,7 +71,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var mock = getMockWorkingBeatmap(new Texture(3840, 2160));
var issues = check.Run(mock.Object).ToList();
var issues = check.Run(beatmap, mock.Object).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@ -82,7 +82,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var mock = getMockWorkingBeatmap(new Texture(640, 480));
var issues = check.Run(mock.Object).ToList();
var issues = check.Run(beatmap, mock.Object).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@ -93,7 +93,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var mock = getMockWorkingBeatmap(new Texture(100, 100));
var issues = check.Run(mock.Object).ToList();
var issues = check.Run(beatmap, mock.Object).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@ -104,7 +104,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var mock = getMockWorkingBeatmap(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
var issues = check.Run(mock.Object).ToList();
var issues = check.Run(beatmap, mock.Object).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);

View File

@ -15,13 +15,13 @@ namespace osu.Game.Tests.Editing.Checks
public class CheckFilePresenceTest
{
private CheckBackgroundPresence check;
private WorkingBeatmap beatmap;
private IBeatmap beatmap;
[SetUp]
public void Setup()
{
check = new CheckBackgroundPresence();
beatmap = new TestWorkingBeatmap(new Beatmap<HitObject>
beatmap = new Beatmap<HitObject>
{
BeatmapInfo = new BeatmapInfo
{
@ -34,13 +34,13 @@ namespace osu.Game.Tests.Editing.Checks
})
}
}
});
};
}
[Test]
public void TestBackgroundSetAndInFiles()
{
Assert.That(check.Run(beatmap), Is.Empty);
Assert.That(check.Run(beatmap, new TestWorkingBeatmap(beatmap)), Is.Empty);
}
[Test]
@ -48,7 +48,7 @@ namespace osu.Game.Tests.Editing.Checks
{
beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
var issues = check.Run(beatmap).ToList();
var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
@ -59,7 +59,7 @@ namespace osu.Game.Tests.Editing.Checks
{
beatmap.Metadata.BackgroundFile = null;
var issues = check.Run(beatmap).ToList();
var issues = check.Run(beatmap, new TestWorkingBeatmap(beatmap)).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);