h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 16:12:54 +08:00
Code Issues Releases Wiki Activity

Update tests to refect new mappings

Browse Source
This commit is contained in:
Dean Herbert 2020-10-30 12:12:30 +09:00
parent 2ec2749cb4
commit fed4accfea
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/convert-samples-expected-conversion.json
View File

@ -6,20 +6,20 @@
"EndTime": 2750.0, "EndTime": 2750.0,
"Column": 1, "Column": 1,
"NodeSamples": [ "NodeSamples": [
["normal-hitnormal"], ["Gameplay/normal-hitnormal"],
["soft-hitnormal"], ["Gameplay/soft-hitnormal"],
["drum-hitnormal"] ["Gameplay/drum-hitnormal"]
], ],
"Samples": ["-hitnormal"] "Samples": ["Gameplay/-hitnormal"]
}, { }, {
"StartTime": 1875.0, "StartTime": 1875.0,
"EndTime": 2750.0, "EndTime": 2750.0,
"Column": 0, "Column": 0,
"NodeSamples": [ "NodeSamples": [
["soft-hitnormal"], ["Gameplay/soft-hitnormal"],
["drum-hitnormal"] ["Gameplay/drum-hitnormal"]
], ],
"Samples": ["-hitnormal"] "Samples": ["Gameplay/-hitnormal"]
}] }]
}, { }, {
"StartTime": 3750.0, "StartTime": 3750.0,
@ -27,7 +27,7 @@
"StartTime": 3750.0, "StartTime": 3750.0,
"EndTime": 3750.0, "EndTime": 3750.0,
"Column": 3, "Column": 3,
"Samples": ["normal-hitnormal"] "Samples": ["Gameplay/normal-hitnormal"]
}] }]
}] }]
} }

8
osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/mania-samples-expected-conversion.json
View File

@ -6,10 +6,10 @@
"EndTime": 1500.0, "EndTime": 1500.0,
"Column": 0, "Column": 0,
"NodeSamples": [ "NodeSamples": [
["normal-hitnormal"], ["Gameplay/normal-hitnormal"],
[] []
], ],
"Samples": ["normal-hitnormal"] "Samples": ["Gameplay/normal-hitnormal"]
}] }]
}, { }, {
"StartTime": 2000.0, "StartTime": 2000.0,
@ -18,10 +18,10 @@
"EndTime": 3000.0, "EndTime": 3000.0,
"Column": 2, "Column": 2,
"NodeSamples": [ "NodeSamples": [
["drum-hitnormal"], ["Gameplay/drum-hitnormal"],
[] []
], ],
"Samples": ["drum-hitnormal"] "Samples": ["Gameplay/drum-hitnormal"]
}] }]
}] }]
} }

6
osu.Game.Rulesets.Mania/Resources/Testing/Beatmaps/slider-convert-samples-expected-conversion.json
View File

@ -5,17 +5,17 @@
"StartTime": 8470.0, "StartTime": 8470.0,
"EndTime": 8470.0, "EndTime": 8470.0,
"Column": 0, "Column": 0,
"Samples": ["normal-hitnormal", "normal-hitclap"] "Samples": ["Gameplay/normal-hitnormal", "Gameplay/normal-hitclap"]
}, { }, {
"StartTime": 8626.470587768974, "StartTime": 8626.470587768974,
"EndTime": 8626.470587768974, "EndTime": 8626.470587768974,
"Column": 1, "Column": 1,
"Samples": ["normal-hitnormal"] "Samples": ["Gameplay/normal-hitnormal"]
}, { }, {
"StartTime": 8782.941175537948, "StartTime": 8782.941175537948,
"EndTime": 8782.941175537948, "EndTime": 8782.941175537948,
"Column": 2, "Column": 2,
"Samples": ["normal-hitnormal", "normal-hitclap"] "Samples": ["Gameplay/normal-hitnormal", "Gameplay/normal-hitclap"]
}] }]
}] }]
} }

18
osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
View File

@ -410,13 +410,13 @@ namespace osu.Game.Tests.Beatmaps.Formats
{ {
var hitObjects = decoder.Decode(stream).HitObjects; var hitObjects = decoder.Decode(stream).HitObjects;
Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[1]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[3]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[3]).LookupNames.First());
// The control point at the end time of the slider should be applied // The control point at the end time of the slider should be applied
Assert.AreEqual("soft-hitnormal8", getTestableSampleInfo(hitObjects[4]).LookupNames.First()); Assert.AreEqual("Gameplay/soft-hitnormal8", getTestableSampleInfo(hitObjects[4]).LookupNames.First());
} }
static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]); static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
@ -432,9 +432,9 @@ namespace osu.Game.Tests.Beatmaps.Formats
{ {
var hitObjects = decoder.Decode(stream).HitObjects; var hitObjects = decoder.Decode(stream).HitObjects;
Assert.AreEqual("normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[1]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal2", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
Assert.AreEqual("normal-hitnormal3", getTestableSampleInfo(hitObjects[2]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal3", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
} }
static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]); static HitSampleInfo getTestableSampleInfo(HitObject hitObject) => hitObject.SampleControlPoint.ApplyTo(hitObject.Samples[0]);
@ -452,7 +452,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[0]).LookupNames.First()); Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[0]).LookupNames.First());
Assert.AreEqual("hit_2.wav", getTestableSampleInfo(hitObjects[1]).LookupNames.First()); Assert.AreEqual("hit_2.wav", getTestableSampleInfo(hitObjects[1]).LookupNames.First());
Assert.AreEqual("normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First()); Assert.AreEqual("Gameplay/normal-hitnormal2", getTestableSampleInfo(hitObjects[2]).LookupNames.First());
Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[3]).LookupNames.First()); Assert.AreEqual("hit_1.wav", getTestableSampleInfo(hitObjects[3]).LookupNames.First());
Assert.AreEqual(70, getTestableSampleInfo(hitObjects[3]).Volume); Assert.AreEqual(70, getTestableSampleInfo(hitObjects[3]).Volume);
} }