h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 11:43:01 +08:00
Code Issues Releases Wiki Activity

Fix regressed tests due to schedule changes

Browse Source
This commit is contained in:
Dean Herbert 2020-09-13 23:22:19 +09:00
parent 320e314356
commit 3e37f27a66
1 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
osu.Game.Tests/Beatmaps/TestSceneEditorBeatmap.cs
View File

@ -23,15 +23,19 @@ namespace osu.Game.Tests.Beatmaps
[Test] [Test]
public void TestHitObjectAddEvent() public void TestHitObjectAddEvent()
{ {
var editorBeatmap = new EditorBeatmap(new OsuBeatmap());
HitObject addedObject = null;
editorBeatmap.HitObjectAdded += h => addedObject = h;
var hitCircle = new HitCircle(); var hitCircle = new HitCircle();
editorBeatmap.Add(hitCircle); HitObject addedObject = null;
Assert.That(addedObject, Is.EqualTo(hitCircle)); EditorBeatmap editorBeatmap = null;
AddStep("add beatmap", () =>
{
Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
editorBeatmap.HitObjectAdded += h => addedObject = h;
});
AddStep("add hitobject", () => editorBeatmap.Add(hitCircle));
AddAssert("received add event", () => addedObject == hitCircle);
} }
/// <summary> /// <summary>
@ -41,13 +45,15 @@ namespace osu.Game.Tests.Beatmaps
public void HitObjectRemoveEvent() public void HitObjectRemoveEvent()
{ {
var hitCircle = new HitCircle(); var hitCircle = new HitCircle();
var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
HitObject removedObject = null; HitObject removedObject = null;
EditorBeatmap editorBeatmap = null;
AddStep("add beatmap", () =>
{
Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
editorBeatmap.HitObjectRemoved += h => removedObject = h; editorBeatmap.HitObjectRemoved += h => removedObject = h;
});
editorBeatmap.Remove(hitCircle); AddStep("remove hitobject", () => editorBeatmap.Remove(editorBeatmap.HitObjects.First()));
Assert.That(removedObject, Is.EqualTo(hitCircle)); AddAssert("received remove event", () => removedObject == hitCircle);
} }
/// <summary> /// <summary>
@ -58,9 +64,7 @@ namespace osu.Game.Tests.Beatmaps
public void TestInitialHitObjectStartTimeChangeEvent() public void TestInitialHitObjectStartTimeChangeEvent()
{ {
var hitCircle = new HitCircle(); var hitCircle = new HitCircle();
HitObject changedObject = null; HitObject changedObject = null;
AddStep("add beatmap", () => AddStep("add beatmap", () =>
{ {
EditorBeatmap editorBeatmap; EditorBeatmap editorBeatmap;
@ -68,7 +72,6 @@ namespace osu.Game.Tests.Beatmaps
Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } }); Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
editorBeatmap.HitObjectUpdated += h => changedObject = h; editorBeatmap.HitObjectUpdated += h => changedObject = h;
}); });
AddStep("change start time", () => hitCircle.StartTime = 1000); AddStep("change start time", () => hitCircle.StartTime = 1000);
AddAssert("received change event", () => changedObject == hitCircle); AddAssert("received change event", () => changedObject == hitCircle);
} }
@ -82,18 +85,14 @@ namespace osu.Game.Tests.Beatmaps
{ {
EditorBeatmap editorBeatmap = null; EditorBeatmap editorBeatmap = null;
HitObject changedObject = null; HitObject changedObject = null;
AddStep("add beatmap", () => AddStep("add beatmap", () =>
{ {
Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap()); Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
editorBeatmap.HitObjectUpdated += h => changedObject = h; editorBeatmap.HitObjectUpdated += h => changedObject = h;
}); });
var hitCircle = new HitCircle(); var hitCircle = new HitCircle();
AddStep("add object", () => editorBeatmap.Add(hitCircle)); AddStep("add object", () => editorBeatmap.Add(hitCircle));
AddAssert("event not received", () => changedObject == null); AddAssert("event not received", () => changedObject == null);
AddStep("change start time", () => hitCircle.StartTime = 1000); AddStep("change start time", () => hitCircle.StartTime = 1000);
AddAssert("event received", () => changedObject == hitCircle); AddAssert("event received", () => changedObject == hitCircle);
} }
@ -106,13 +105,10 @@ namespace osu.Game.Tests.Beatmaps
{ {
var hitCircle = new HitCircle(); var hitCircle = new HitCircle();
var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } }); var editorBeatmap = new EditorBeatmap(new OsuBeatmap { HitObjects = { hitCircle } });
HitObject changedObject = null; HitObject changedObject = null;
editorBeatmap.HitObjectUpdated += h => changedObject = h; editorBeatmap.HitObjectUpdated += h => changedObject = h;
editorBeatmap.Remove(hitCircle); editorBeatmap.Remove(hitCircle);
Assert.That(changedObject, Is.Null); Assert.That(changedObject, Is.Null);
hitCircle.StartTime = 1000; hitCircle.StartTime = 1000;
Assert.That(changedObject, Is.Null); Assert.That(changedObject, Is.Null);
} }
@ -147,6 +143,7 @@ namespace osu.Game.Tests.Beatmaps
public void TestResortWhenStartTimeChanged() public void TestResortWhenStartTimeChanged()
{ {
var hitCircle = new HitCircle { StartTime = 1000 }; var hitCircle = new HitCircle { StartTime = 1000 };
var editorBeatmap = new EditorBeatmap(new OsuBeatmap var editorBeatmap = new EditorBeatmap(new OsuBeatmap
{ {
HitObjects = HitObjects =
@ -173,7 +170,6 @@ namespace osu.Game.Tests.Beatmaps
var updatedObjects = new List<HitObject>(); var updatedObjects = new List<HitObject>();
var allHitObjects = new List<HitObject>(); var allHitObjects = new List<HitObject>();
EditorBeatmap editorBeatmap = null; EditorBeatmap editorBeatmap = null;
AddStep("add beatmap", () => AddStep("add beatmap", () =>
{ {
updatedObjects.Clear(); updatedObjects.Clear();
@ -187,11 +183,9 @@ namespace osu.Game.Tests.Beatmaps
allHitObjects.Add(h); allHitObjects.Add(h);
} }
}); });
AddStep("change all start times", () => AddStep("change all start times", () =>
{ {
editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h); editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
allHitObjects[i].StartTime += 10; allHitObjects[i].StartTime += 10;
}); });
@ -208,7 +202,6 @@ namespace osu.Game.Tests.Beatmaps
{ {
var updatedObjects = new List<HitObject>(); var updatedObjects = new List<HitObject>();
EditorBeatmap editorBeatmap = null; EditorBeatmap editorBeatmap = null;
AddStep("add beatmap", () => AddStep("add beatmap", () =>
{ {
updatedObjects.Clear(); updatedObjects.Clear();
@ -216,15 +209,12 @@ namespace osu.Game.Tests.Beatmaps
Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap()); Child = editorBeatmap = new EditorBeatmap(new OsuBeatmap());
editorBeatmap.Add(new HitCircle()); editorBeatmap.Add(new HitCircle());
}); });
AddStep("change start time twice", () => AddStep("change start time twice", () =>
{ {
editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h); editorBeatmap.HitObjectUpdated += h => updatedObjects.Add(h);
editorBeatmap.HitObjects[0].StartTime = 10; editorBeatmap.HitObjects[0].StartTime = 10;
editorBeatmap.HitObjects[0].StartTime = 20; editorBeatmap.HitObjects[0].StartTime = 20;
}); });
AddAssert("only updated once", () => updatedObjects.Count == 1); AddAssert("only updated once", () => updatedObjects.Count == 1);
} }
} }