h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 06:33:17 +08:00
Code Issues Releases Wiki Activity

Resolve broken test scene

Browse Source
This commit is contained in:
smoogipoo 2020-04-23 10:37:05 +09:00
parent 7796593b2c
commit 40f11ed15c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/Editor/TestSceneEditorChangeStates.cs
View File

@ -19,7 +19,6 @@ namespace osu.Game.Tests.Visual.Editor
} }
private EditorBeatmap editorBeatmap; private EditorBeatmap editorBeatmap;
private TestEditor editor;
public override void SetUpSteps() public override void SetUpSteps()
{ {
@ -153,9 +152,11 @@ namespace osu.Game.Tests.Visual.Editor
AddAssert("no hitobject added", () => addedObject == null); AddAssert("no hitobject added", () => addedObject == null);
} }
private void addUndoSteps() => AddStep("undo", () => editor.Undo()); private void addUndoSteps() => AddStep("undo", () => ((TestEditor)Editor).Undo());
private void addRedoSteps() => AddStep("redo", () => editor.Redo()); private void addRedoSteps() => AddStep("redo", () => ((TestEditor)Editor).Redo());
protected override Screens.Edit.Editor CreateEditor() => new TestEditor();
private class TestEditor : Screens.Edit.Editor private class TestEditor : Screens.Edit.Editor
{ {

4
osu.Game/Tests/Visual/EditorTestScene.cs
View File

@ -36,9 +36,11 @@ namespace osu.Game.Tests.Visual
{ {
base.SetUpSteps(); base.SetUpSteps();
AddStep("load editor", () => LoadScreen(Editor = new Editor())); AddStep("load editor", () => LoadScreen(Editor = CreateEditor()));
AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true AddUntilStep("wait for editor to load", () => Editor.ChildrenOfType<HitObjectComposer>().FirstOrDefault()?.IsLoaded == true
&& Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true); && Editor.ChildrenOfType<TimelineArea>().FirstOrDefault()?.IsLoaded == true);
} }
protected virtual Editor CreateEditor() => new Editor();
} }
} }