1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 02:15:37 +08:00

Further condense steps

This commit is contained in:
David Zhao 2019-04-05 15:48:48 +09:00
parent 37ffe47e4b
commit c693d1fad8

View File

@ -100,7 +100,12 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("Add tracking containers", addFacadeContainers); AddStep("Add tracking containers", addFacadeContainers);
AddStep("Move facade to random position", startTrackingRandom); AddStep("Move facade to random position", startTrackingRandom);
AddStep("Remove facade from FacadeContainer", removeFacade); AddStep("Remove facade from FacadeContainer", removeFacade);
AddStep("Transfer facade to a new container", addFacadeToNewContainer); AddStep("Transfer facade to a new container", () =>
{
transferContainer.Add(logoFacade);
transferContainerBox.Colour = Color4.Tomato;
moveLogoFacade();
});
waitForMove(); waitForMove();
AddAssert("Logo is tracking", () => trackingContainer.IsLogoTracking); AddAssert("Logo is tracking", () => trackingContainer.IsLogoTracking);
} }
@ -186,7 +191,11 @@ namespace osu.Game.Tests.Visual.UserInterface
public void SetFacadeSizeTest() public void SetFacadeSizeTest()
{ {
bool failed = false; bool failed = false;
AddStep("Add tracking containers", addFacadeContainers); AddStep("Set up scenario", () =>
{
failed = false;
addFacadeContainers();
});
AddStep("Try setting facade size", () => AddStep("Try setting facade size", () =>
{ {
try try
@ -203,13 +212,18 @@ namespace osu.Game.Tests.Visual.UserInterface
} }
[Test] [Test]
public void SetMultipleContainers() public void SetMultipleContainersTest()
{ {
bool failed = false; bool failed = false;
LogoTrackingContainer newContainer = new LogoTrackingContainer(); LogoTrackingContainer newContainer = new LogoTrackingContainer();
AddStep("Add tracking containers", addFacadeContainers); AddStep("Set up scenario", () =>
AddStep("Move facade to random position", startTrackingRandom); {
AddStep("Add logo to new container", () => newContainer.SetLogo(logo)); failed = false;
newContainer = new LogoTrackingContainer();
addFacadeContainers();
startTrackingRandom();
newContainer.SetLogo(logo);
});
AddStep("Try tracking new container", () => AddStep("Try tracking new container", () =>
{ {
try try
@ -272,13 +286,6 @@ namespace osu.Game.Tests.Visual.UserInterface
moveLogoFacade(); moveLogoFacade();
} }
private void addFacadeToNewContainer()
{
transferContainer.Add(logoFacade);
transferContainerBox.Colour = Color4.Tomato;
moveLogoFacade();
}
private void moveLogoFacade() private void moveLogoFacade()
{ {
if (logoFacade?.Transforms.Count == 0 && transferContainer?.Transforms.Count == 0) if (logoFacade?.Transforms.Count == 0 && transferContainer?.Transforms.Count == 0)