sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 09:27:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5131 from peppy/fix-timing-tests

Browse Source 
Fix test timing regressions due to increased step count
This commit is contained in:
Dan Balasescu 2019-06-24 11:49:16 +09:00 committed by GitHub
commit e89fb409ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs
View File

@ -14,16 +14,21 @@ 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;
public TestSceneIdleTracker() private IdleTrackingBox[] boxes;
[SetUp]
public void SetUp() => Schedule(() =>
{ {
Children = new Drawable[] InputManager.MoveMouseTo(Vector2.Zero);
Children = boxes = new[]
{ {
box1 = new IdleTrackingBox(1000) box1 = new IdleTrackingBox(2000)
{ {
Name = "TopLeft", Name = "TopLeft",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -31,7 +36,7 @@ namespace osu.Game.Tests.Visual.Components
Anchor = Anchor.TopLeft, Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft, Origin = Anchor.TopLeft,
}, },
box2 = new IdleTrackingBox(2000) box2 = new IdleTrackingBox(4000)
{ {
Name = "TopRight", Name = "TopRight",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -39,7 +44,7 @@ namespace osu.Game.Tests.Visual.Components
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
}, },
box3 = new IdleTrackingBox(3000) box3 = new IdleTrackingBox(6000)
{ {
Name = "BottomLeft", Name = "BottomLeft",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -47,7 +52,7 @@ namespace osu.Game.Tests.Visual.Components
Anchor = Anchor.BottomLeft, Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
}, },
box4 = new IdleTrackingBox(4000) box4 = new IdleTrackingBox(8000)
{ {
Name = "BottomRight", Name = "BottomRight",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -56,7 +61,7 @@ namespace osu.Game.Tests.Visual.Components
Origin = Anchor.BottomRight, Origin = Anchor.BottomRight,
}, },
}; };
} });
[Test] [Test]
public void TestNudge() public void TestNudge()
@ -67,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]
@ -78,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();
} }
@ -99,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()