-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30408 from OliBomby/clean-editor-test
Move TestTouchInputAfterTouchingComposeArea to separate test scene
- Loading branch information
Showing
2 changed files
with
87 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,14 @@ | ||
| // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using System.Linq; | ||
| using NUnit.Framework; | ||
| using osu.Framework.Graphics; | ||
| using osu.Framework.Graphics.Containers; | ||
| using osu.Framework.Input; | ||
| using osu.Framework.Testing; | ||
| using osu.Game.Rulesets.Osu.Objects; | ||
| using osu.Game.Rulesets.UI; | ||
| using osu.Game.Screens.Edit.Components.RadioButtons; | ||
| using osu.Game.Screens.Edit.Compose.Components; | ||
| using osu.Game.Tests.Visual; | ||
| using osuTK; | ||
| using osuTK.Input; | ||
|
|
||
| namespace osu.Game.Rulesets.Osu.Tests.Editor | ||
| { | ||
| [TestFixture] | ||
| public partial class TestSceneOsuEditor : EditorTestScene | ||
| { | ||
| protected override Ruleset CreateEditorRuleset() => new OsuRuleset(); | ||
|
|
||
| [Test] | ||
| public void TestTouchInputAfterTouchingComposeArea() | ||
| { | ||
| AddStep("tap circle", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "HitCircle"))); | ||
|
|
||
| // this input is just for interacting with compose area | ||
| AddStep("tap playfield", () => tap(this.ChildrenOfType<Playfield>().Single())); | ||
|
|
||
| AddStep("move current time", () => InputManager.Key(Key.Right)); | ||
|
|
||
| AddStep("tap to place circle", () => tap(this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(10, 10)))); | ||
| AddAssert("circle placed correctly", () => | ||
| { | ||
| var circle = (HitCircle)EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate); | ||
| Assert.Multiple(() => | ||
| { | ||
| Assert.That(circle.Position.X, Is.EqualTo(10f).Within(0.01f)); | ||
| Assert.That(circle.Position.Y, Is.EqualTo(10f).Within(0.01f)); | ||
| }); | ||
| return true; | ||
| }); | ||
|
|
||
| AddStep("tap slider", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "Slider"))); | ||
|
|
||
| // this input is just for interacting with compose area | ||
| AddStep("tap playfield", () => tap(this.ChildrenOfType<Playfield>().Single())); | ||
|
|
||
| AddStep("move current time", () => InputManager.Key(Key.Right)); | ||
|
|
||
| AddStep("hold to draw slider", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(50, 20))))); | ||
| AddStep("drag to draw", () => InputManager.MoveTouchTo(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(200, 50))))); | ||
| AddAssert("selection not initiated", () => this.ChildrenOfType<DragBox>().All(d => d.State == Visibility.Hidden)); | ||
| AddStep("end", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, InputManager.CurrentState.Touch.GetTouchPosition(TouchSource.Touch1)!.Value))); | ||
| AddAssert("slider placed correctly", () => | ||
| { | ||
| var slider = (Slider)EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate); | ||
| Assert.Multiple(() => | ||
| { | ||
| Assert.That(slider.Position.X, Is.EqualTo(50f).Within(0.01f)); | ||
| Assert.That(slider.Position.Y, Is.EqualTo(20f).Within(0.01f)); | ||
| Assert.That(slider.Path.ControlPoints.Count, Is.EqualTo(2)); | ||
| Assert.That(slider.Path.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero)); | ||
| // the final position may be slightly off from the mouse position when drawing, account for that. | ||
| Assert.That(slider.Path.ControlPoints[1].Position.X, Is.EqualTo(150).Within(5)); | ||
| Assert.That(slider.Path.ControlPoints[1].Position.Y, Is.EqualTo(30).Within(5)); | ||
| }); | ||
| return true; | ||
| }); | ||
| } | ||
|
|
||
| private void tap(Drawable drawable) => tap(drawable.ScreenSpaceDrawQuad.Centre); | ||
|
|
||
| private void tap(Vector2 position) | ||
| { | ||
| InputManager.BeginTouch(new Touch(TouchSource.Touch1, position)); | ||
| InputManager.EndTouch(new Touch(TouchSource.Touch1, position)); | ||
| } | ||
| } | ||
| } |
87 changes: 87 additions & 0 deletions
87
osu.Game.Rulesets.Osu.Tests/Editor/TestSceneSliderDrawing.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence. | ||
| // See the LICENCE file in the repository root for full licence text. | ||
|
|
||
| using System.Linq; | ||
| using NUnit.Framework; | ||
| using osu.Framework.Graphics; | ||
| using osu.Framework.Graphics.Containers; | ||
| using osu.Framework.Input; | ||
| using osu.Framework.Testing; | ||
| using osu.Game.Beatmaps; | ||
| using osu.Game.Rulesets.Osu.Objects; | ||
| using osu.Game.Rulesets.UI; | ||
| using osu.Game.Screens.Edit.Components.RadioButtons; | ||
| using osu.Game.Screens.Edit.Compose.Components; | ||
| using osu.Game.Tests.Beatmaps; | ||
| using osuTK; | ||
| using osuTK.Input; | ||
|
|
||
| namespace osu.Game.Rulesets.Osu.Tests.Editor | ||
| { | ||
| [TestFixture] | ||
| public partial class TestSceneSliderDrawing : TestSceneOsuEditor | ||
| { | ||
| protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => new TestBeatmap(ruleset, false); | ||
|
|
||
| [Test] | ||
| public void TestTouchInputAfterTouchingComposeArea() | ||
| { | ||
| AddStep("tap circle", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "HitCircle"))); | ||
|
|
||
| // this input is just for interacting with compose area | ||
| AddStep("tap playfield", () => tap(this.ChildrenOfType<Playfield>().Single())); | ||
|
|
||
| AddStep("move current time", () => InputManager.Key(Key.Right)); | ||
|
|
||
| AddStep("tap to place circle", () => tap(this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(10, 10)))); | ||
| AddAssert("circle placed correctly", () => | ||
| { | ||
| var circle = (HitCircle)EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate); | ||
| Assert.Multiple(() => | ||
| { | ||
| Assert.That(circle.Position.X, Is.EqualTo(10f).Within(0.01f)); | ||
| Assert.That(circle.Position.Y, Is.EqualTo(10f).Within(0.01f)); | ||
| }); | ||
| return true; | ||
| }); | ||
|
|
||
| AddStep("tap slider", () => tap(this.ChildrenOfType<EditorRadioButton>().Single(b => b.Button.Label == "Slider"))); | ||
|
|
||
| // this input is just for interacting with compose area | ||
| AddStep("tap playfield", () => tap(this.ChildrenOfType<Playfield>().Single())); | ||
|
|
||
| AddStep("move current time", () => InputManager.Key(Key.Right)); | ||
|
|
||
| AddStep("hold to draw slider", () => InputManager.BeginTouch(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(50, 20))))); | ||
| AddStep("drag to draw", () => InputManager.MoveTouchTo(new Touch(TouchSource.Touch1, this.ChildrenOfType<Playfield>().Single().ToScreenSpace(new Vector2(200, 50))))); | ||
| AddAssert("selection not initiated", () => this.ChildrenOfType<DragBox>().All(d => d.State == Visibility.Hidden)); | ||
| AddStep("end", () => InputManager.EndTouch(new Touch(TouchSource.Touch1, InputManager.CurrentState.Touch.GetTouchPosition(TouchSource.Touch1)!.Value))); | ||
| AddAssert("slider placed correctly", () => | ||
| { | ||
| var slider = (Slider)EditorBeatmap.HitObjects.Single(h => h.StartTime == EditorClock.CurrentTimeAccurate); | ||
| Assert.Multiple(() => | ||
| { | ||
| Assert.That(slider.Position.X, Is.EqualTo(50f).Within(0.01f)); | ||
| Assert.That(slider.Position.Y, Is.EqualTo(20f).Within(0.01f)); | ||
| Assert.That(slider.Path.ControlPoints.Count, Is.EqualTo(2)); | ||
| Assert.That(slider.Path.ControlPoints[0].Position, Is.EqualTo(Vector2.Zero)); | ||
| // the final position may be slightly off from the mouse position when drawing, account for that. | ||
| Assert.That(slider.Path.ControlPoints[1].Position.X, Is.EqualTo(150).Within(5)); | ||
| Assert.That(slider.Path.ControlPoints[1].Position.Y, Is.EqualTo(30).Within(5)); | ||
| }); | ||
| return true; | ||
| }); | ||
| } | ||
|
|
||
| private void tap(Drawable drawable) => tap(drawable.ScreenSpaceDrawQuad.Centre); | ||
|
|
||
| private void tap(Vector2 position) | ||
| { | ||
| InputManager.BeginTouch(new Touch(TouchSource.Touch1, position)); | ||
| InputManager.EndTouch(new Touch(TouchSource.Touch1, position)); | ||
| } | ||
| } | ||
| } |