aecw/osu-framework
1
0
Fork 0
mirror of https://github.com/SK-la/osu-framework.git synced 2026-03-15 03:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove ManualInputManagerTestScene.InitialMousePosition

Browse Source 
It had no actual consumers other than a test testing specifically it.
This commit is contained in:
Bartłomiej Dach
2025-05-22 10:49:45 +02:00
parent 48d87c105d
commit e589119c83
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Framework.Tests/Visual/Input/TestSceneMouseStates.cs
View File

@@ -101,7 +101,6 @@ namespace osu.Framework.Tests.Visual.Input
};
});
// InitialMousePosition cannot be used here because the event counters should be reset after the initial mouse move.
AddStep("move mouse to center", () => InputManager.MoveMouseTo(actionContainer));
AddStep("reset event counters", () =>
{

13
osu.Framework.Tests/Visual/Testing/TestSceneManualInputManagerTestScene.cs
View File

@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
#nullable disable
using System.Linq;
using NUnit.Framework;
using osu.Framework.Graphics;
@@ -17,8 +15,6 @@ namespace osu.Framework.Tests.Visual.Testing
{
public partial class TestSceneManualInputManagerTestScene : ManualInputManagerTestScene
{
protected override Vector2 InitialMousePosition => new Vector2(10f);
[Test]
public void TestResetInput()
{
@@ -29,7 +25,7 @@ namespace osu.Framework.Tests.Visual.Testing
AddStep("reset input", ResetInput);
AddAssert("mouse position reset", () => InputManager.CurrentState.Mouse.Position == InitialMousePosition);
AddAssert("mouse position is zero", () => InputManager.CurrentState.Mouse.Position, () => Is.EqualTo(Vector2.Zero));
AddAssert("all input states released", () =>
!InputManager.CurrentState.Mouse.Buttons.HasAnyButtonPressed &&
!InputManager.CurrentState.Keyboard.Keys.HasAnyButtonPressed &&
@@ -39,7 +35,7 @@ namespace osu.Framework.Tests.Visual.Testing
[Test]
public void TestPlatformAction()
{
BasicTextBox textbox = null;
BasicTextBox textbox = null!;
AddStep("add textbox", () => Child = textbox = new BasicTextBox
{
@@ -65,7 +61,7 @@ namespace osu.Framework.Tests.Visual.Testing
[Test]
public void TestHoldLeftFromMaskedPosition()
{
TestCursor cursor = null;
TestCursor cursor = null!;
AddStep("retrieve cursor", () => cursor = (TestCursor)InputManager.ChildrenOfType<TestCursorContainer>().Single().ActiveCursor);
@@ -78,8 +74,5 @@ namespace osu.Framework.Tests.Visual.Testing
AddStep("move mouse to content", () => InputManager.MoveMouseTo(Content));
AddAssert("cursor still holding", () => cursor.Left.IsPresent);
}
[Test]
public void TestMousePositionSetToInitial() => AddAssert("mouse position set to initial", () => InputManager.CurrentState.Mouse.Position == InitialMousePosition);
}
}

7
osu.Framework/Testing/ManualInputManagerTestScene.cs
View File

@@ -22,11 +22,6 @@ namespace osu.Framework.Testing
{
protected override Container<Drawable> Content { get; } = new Container { RelativeSizeAxes = Axes.Both };
/// <summary>
/// The position which is used to initialize the mouse position before at setup.
/// </summary>
protected virtual Vector2 InitialMousePosition => Vector2.Zero;
/// <summary>
/// The <see cref="ManualInputManager"/>.
/// </summary>
@@ -127,7 +122,7 @@ namespace osu.Framework.Testing
var currentState = InputManager.CurrentState;
var mouse = currentState.Mouse;
InputManager.MoveMouseTo(InitialMousePosition);
InputManager.MoveMouseTo(Vector2.Zero);
mouse.Buttons.ForEach(InputManager.ReleaseButton);
var keyboard = currentState.Keyboard;