mirror of
https://github.com/ppy/osu.git
synced 2025-01-15 12:42:54 +08:00
Allow tests to be run in non-sequential order
This commit is contained in:
parent
4ec064e179
commit
da2ba5bf09
@ -5,7 +5,6 @@ using NUnit.Framework;
|
|||||||
using osu.Framework.Graphics;
|
using osu.Framework.Graphics;
|
||||||
using osu.Framework.Graphics.Containers;
|
using osu.Framework.Graphics.Containers;
|
||||||
using osu.Framework.Graphics.Shapes;
|
using osu.Framework.Graphics.Shapes;
|
||||||
using osu.Framework.Testing;
|
|
||||||
using osu.Game.Input;
|
using osu.Game.Input;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
@ -15,20 +14,19 @@ namespace osu.Game.Tests.Visual.Components
|
|||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class TestSceneIdleTracker : ManualInputManagerTestScene
|
public class TestSceneIdleTracker : ManualInputManagerTestScene
|
||||||
{
|
{
|
||||||
private readonly IdleTrackingBox box1;
|
private IdleTrackingBox box1;
|
||||||
private readonly IdleTrackingBox box2;
|
private IdleTrackingBox box2;
|
||||||
private readonly IdleTrackingBox box3;
|
private IdleTrackingBox box3;
|
||||||
private readonly IdleTrackingBox box4;
|
private IdleTrackingBox box4;
|
||||||
|
|
||||||
[SetUpSteps]
|
private IdleTrackingBox[] boxes;
|
||||||
public void SetUpSteps()
|
|
||||||
{
|
|
||||||
AddStep("reset mouse position", () => InputManager.MoveMouseTo(Vector2.Zero));
|
|
||||||
}
|
|
||||||
|
|
||||||
public TestSceneIdleTracker()
|
[SetUp]
|
||||||
|
public void SetUp() => Schedule(() =>
|
||||||
{
|
{
|
||||||
Children = new Drawable[]
|
InputManager.MoveMouseTo(Vector2.Zero);
|
||||||
|
|
||||||
|
Children = boxes = new IdleTrackingBox[]
|
||||||
{
|
{
|
||||||
box1 = new IdleTrackingBox(2000)
|
box1 = new IdleTrackingBox(2000)
|
||||||
{
|
{
|
||||||
@ -63,7 +61,7 @@ namespace osu.Game.Tests.Visual.Components
|
|||||||
Origin = Anchor.BottomRight,
|
Origin = Anchor.BottomRight,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
});
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestNudge()
|
public void TestNudge()
|
||||||
@ -74,10 +72,10 @@ namespace osu.Game.Tests.Visual.Components
|
|||||||
|
|
||||||
AddStep("nudge mouse", () => InputManager.MoveMouseTo(box1.ScreenSpaceDrawQuad.Centre + new Vector2(1)));
|
AddStep("nudge mouse", () => InputManager.MoveMouseTo(box1.ScreenSpaceDrawQuad.Centre + new Vector2(1)));
|
||||||
|
|
||||||
checkIdleStatus(box1, false);
|
checkIdleStatus(1, false);
|
||||||
checkIdleStatus(box2, true);
|
checkIdleStatus(2, true);
|
||||||
checkIdleStatus(box3, true);
|
checkIdleStatus(3, true);
|
||||||
checkIdleStatus(box4, true);
|
checkIdleStatus(4, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -85,18 +83,18 @@ namespace osu.Game.Tests.Visual.Components
|
|||||||
{
|
{
|
||||||
AddStep("move to top right", () => InputManager.MoveMouseTo(box2));
|
AddStep("move to top right", () => InputManager.MoveMouseTo(box2));
|
||||||
|
|
||||||
checkIdleStatus(box1, true);
|
checkIdleStatus(1, true);
|
||||||
checkIdleStatus(box2, false);
|
checkIdleStatus(2, false);
|
||||||
checkIdleStatus(box3, true);
|
checkIdleStatus(3, true);
|
||||||
checkIdleStatus(box4, true);
|
checkIdleStatus(4, true);
|
||||||
|
|
||||||
AddStep("move to bottom left", () => InputManager.MoveMouseTo(box3));
|
AddStep("move to bottom left", () => InputManager.MoveMouseTo(box3));
|
||||||
AddStep("move to bottom right", () => InputManager.MoveMouseTo(box4));
|
AddStep("move to bottom right", () => InputManager.MoveMouseTo(box4));
|
||||||
|
|
||||||
checkIdleStatus(box1, true);
|
checkIdleStatus(1, true);
|
||||||
checkIdleStatus(box2, false);
|
checkIdleStatus(2, false);
|
||||||
checkIdleStatus(box3, false);
|
checkIdleStatus(3, false);
|
||||||
checkIdleStatus(box4, false);
|
checkIdleStatus(4, false);
|
||||||
|
|
||||||
waitForAllIdle();
|
waitForAllIdle();
|
||||||
}
|
}
|
||||||
@ -106,38 +104,38 @@ namespace osu.Game.Tests.Visual.Components
|
|||||||
{
|
{
|
||||||
AddStep("move to centre", () => InputManager.MoveMouseTo(Content));
|
AddStep("move to centre", () => InputManager.MoveMouseTo(Content));
|
||||||
|
|
||||||
checkIdleStatus(box1, false);
|
checkIdleStatus(1, false);
|
||||||
checkIdleStatus(box2, false);
|
checkIdleStatus(2, false);
|
||||||
checkIdleStatus(box3, false);
|
checkIdleStatus(3, false);
|
||||||
checkIdleStatus(box4, false);
|
checkIdleStatus(4, false);
|
||||||
|
|
||||||
AddUntilStep("Wait for idle", () => box1.IsIdle);
|
AddUntilStep("Wait for idle", () => box1.IsIdle);
|
||||||
|
|
||||||
checkIdleStatus(box1, true);
|
checkIdleStatus(1, true);
|
||||||
checkIdleStatus(box2, false);
|
checkIdleStatus(2, false);
|
||||||
checkIdleStatus(box3, false);
|
checkIdleStatus(3, false);
|
||||||
checkIdleStatus(box4, false);
|
checkIdleStatus(4, false);
|
||||||
|
|
||||||
AddUntilStep("Wait for idle", () => box2.IsIdle);
|
AddUntilStep("Wait for idle", () => box2.IsIdle);
|
||||||
|
|
||||||
checkIdleStatus(box1, true);
|
checkIdleStatus(1, true);
|
||||||
checkIdleStatus(box2, true);
|
checkIdleStatus(2, true);
|
||||||
checkIdleStatus(box3, false);
|
checkIdleStatus(3, false);
|
||||||
checkIdleStatus(box4, false);
|
checkIdleStatus(4, false);
|
||||||
|
|
||||||
AddUntilStep("Wait for idle", () => box3.IsIdle);
|
AddUntilStep("Wait for idle", () => box3.IsIdle);
|
||||||
|
|
||||||
checkIdleStatus(box1, true);
|
checkIdleStatus(1, true);
|
||||||
checkIdleStatus(box2, true);
|
checkIdleStatus(2, true);
|
||||||
checkIdleStatus(box3, true);
|
checkIdleStatus(3, true);
|
||||||
checkIdleStatus(box4, false);
|
checkIdleStatus(4, false);
|
||||||
|
|
||||||
waitForAllIdle();
|
waitForAllIdle();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkIdleStatus(IdleTrackingBox box, bool expectedIdle)
|
private void checkIdleStatus(int box, bool expectedIdle)
|
||||||
{
|
{
|
||||||
AddAssert($"{box.Name} is {(expectedIdle ? "idle" : "active")}", () => box.IsIdle == expectedIdle);
|
AddAssert($"box {box} is {(expectedIdle ? "idle" : "active")}", () => boxes[box - 1].IsIdle == expectedIdle);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void waitForAllIdle()
|
private void waitForAllIdle()
|
||||||
|
Loading…
Reference in New Issue
Block a user