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

Move IBeatmap arg into context

Browse Source
This commit is contained in:
Naxess
2021-05-13 11:24:22 +02:00
parent b37cb3bdbe
commit 19800f5f7f
18 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Editing/Checks/CheckAudioQualityTest.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Tests.Editing.Checks
mock.SetupGet(w => w.Beatmap).Returns(beatmap);
mock.SetupGet(w => w.Track).Returns((Track)null);
Assert.That(check.Run(beatmap, new BeatmapVerifierContext(mock.Object)), Is.Empty);
Assert.That(check.Run(new BeatmapVerifierContext(beatmap, mock.Object)), Is.Empty);
}
[Test]
@ -49,7 +49,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(192);
Assert.That(check.Run(beatmap, context), Is.Empty);
Assert.That(check.Run(context), Is.Empty);
}
[Test]
@ -57,7 +57,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(null);
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@ -68,7 +68,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(0);
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateNoBitrate);
@ -79,7 +79,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(320);
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooHighBitrate);
@ -90,7 +90,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(64);
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run( context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckAudioQuality.IssueTemplateTooLowBitrate);
@ -98,7 +98,7 @@ namespace osu.Game.Tests.Editing.Checks
private BeatmapVerifierContext getContext(int? audioBitrate)
{
return new BeatmapVerifierContext(getMockWorkingBeatmap(audioBitrate).Object);
return new BeatmapVerifierContext(beatmap, getMockWorkingBeatmap(audioBitrate).Object);
}
/// <summary>

14
osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Tests.Editing.Checks
beatmap.Metadata.BackgroundFile = null;
var context = getContext(null, System.Array.Empty<byte>());
Assert.That(check.Run(beatmap, context), Is.Empty);
Assert.That(check.Run(context), Is.Empty);
}
[Test]
@ -64,7 +64,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(new Texture(1920, 1080));
Assert.That(check.Run(beatmap, context), Is.Empty);
Assert.That(check.Run(context), Is.Empty);
}
[Test]
@ -72,7 +72,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(new Texture(3840, 2160));
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooHighResolution);
@ -83,7 +83,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(new Texture(640, 480));
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateLowResolution);
@ -94,7 +94,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(new Texture(100, 100));
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooLowResolution);
@ -105,7 +105,7 @@ namespace osu.Game.Tests.Editing.Checks
{
var context = getContext(new Texture(1920, 1080), new byte[1024 * 1024 * 3]);
var issues = check.Run(beatmap, context).ToList();
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckBackgroundQuality.IssueTemplateTooUncompressed);
@ -113,7 +113,7 @@ namespace osu.Game.Tests.Editing.Checks
private BeatmapVerifierContext getContext(Texture background, [CanBeNull] byte[] fileBytes = null)
{
return new BeatmapVerifierContext(getMockWorkingBeatmap(background, fileBytes).Object);
return new BeatmapVerifierContext(beatmap, getMockWorkingBeatmap(background, fileBytes).Object);
}
/// <summary>

15
osu.Game.Tests/Editing/Checks/CheckConcurrentObjectsTest.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using Moq;
using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Checks;
using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Objects;
@ -105,7 +106,7 @@ namespace osu.Game.Tests.Editing.Checks
new HitCircle { StartTime = 300 }
};
var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
var issues = check.Run(getContext(hitobjects)).ToList();
Assert.That(issues, Has.Count.EqualTo(3));
Assert.That(issues.Where(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent).ToList(), Has.Count.EqualTo(2));
@ -164,12 +165,12 @@ namespace osu.Game.Tests.Editing.Checks
private void assertOk(List<HitObject> hitobjects)
{
Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
}
private void assertConcurrentSame(List<HitObject> hitobjects, int count = 1)
{
var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
var issues = check.Run(getContext(hitobjects)).ToList();
Assert.That(issues, Has.Count.EqualTo(count));
Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentSame));
@ -177,18 +178,18 @@ namespace osu.Game.Tests.Editing.Checks
private void assertConcurrentDifferent(List<HitObject> hitobjects, int count = 1)
{
var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
var issues = check.Run(getContext(hitobjects)).ToList();
Assert.That(issues, Has.Count.EqualTo(count));
Assert.That(issues.All(issue => issue.Template is CheckConcurrentObjects.IssueTemplateConcurrentDifferent));
}
private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
{
return new Beatmap<HitObject>
return new BeatmapVerifierContext(new Beatmap<HitObject>
{
HitObjects = hitobjects
};
}, null);
}
}
}

12
osu.Game.Tests/Editing/Checks/CheckFilePresenceTest.cs
View File

@ -46,8 +46,8 @@ namespace osu.Game.Tests.Editing.Checks
[Test]
public void TestBackgroundSetAndInFiles()
{
var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
Assert.That(check.Run(beatmap, context), Is.Empty);
var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
Assert.That(check.Run(context), Is.Empty);
}
[Test]
@ -55,8 +55,8 @@ namespace osu.Game.Tests.Editing.Checks
{
beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
var issues = check.Run(beatmap, context).ToList();
var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateDoesNotExist);
@ -67,8 +67,8 @@ namespace osu.Game.Tests.Editing.Checks
{
beatmap.Metadata.BackgroundFile = null;
var context = new BeatmapVerifierContext(new TestWorkingBeatmap(beatmap));
var issues = check.Run(beatmap, context).ToList();
var context = new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));
var issues = check.Run(context).ToList();
Assert.That(issues, Has.Count.EqualTo(1));
Assert.That(issues.Single().Template is CheckFilePresence.IssueTemplateNoneSet);

15
osu.Game.Tests/Editing/Checks/CheckUnsnappedObjectsTest.cs
View File

@ -7,6 +7,7 @@ using Moq;
using NUnit.Framework;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Edit;
using osu.Game.Rulesets.Edit.Checks;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
@ -105,7 +106,7 @@ namespace osu.Game.Tests.Editing.Checks
getSliderMock(startTime: 98, endTime: 398.75d).Object
};
var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
var issues = check.Run(getContext(hitobjects)).ToList();
Assert.That(issues, Has.Count.EqualTo(2));
Assert.That(issues.Any(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@ -124,12 +125,12 @@ namespace osu.Game.Tests.Editing.Checks
private void assertOk(List<HitObject> hitobjects)
{
Assert.That(check.Run(getPlayableBeatmap(hitobjects), null), Is.Empty);
Assert.That(check.Run(getContext(hitobjects)), Is.Empty);
}
private void assert1Ms(List<HitObject> hitobjects, int count = 1)
{
var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
var issues = check.Run(getContext(hitobjects)).ToList();
Assert.That(issues, Has.Count.EqualTo(count));
Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateSmallUnsnap));
@ -137,19 +138,19 @@ namespace osu.Game.Tests.Editing.Checks
private void assert2Ms(List<HitObject> hitobjects, int count = 1)
{
var issues = check.Run(getPlayableBeatmap(hitobjects), null).ToList();
var issues = check.Run(getContext(hitobjects)).ToList();
Assert.That(issues, Has.Count.EqualTo(count));
Assert.That(issues.All(issue => issue.Template is CheckUnsnappedObjects.IssueTemplateLargeUnsnap));
}
private IBeatmap getPlayableBeatmap(List<HitObject> hitobjects)
private BeatmapVerifierContext getContext(List<HitObject> hitobjects)
{
return new Beatmap<HitObject>
return new BeatmapVerifierContext(new Beatmap<HitObject>
{
ControlPointInfo = cpi,
HitObjects = hitobjects
};
}, null);
}
}
}