h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 14:33:01 +08:00
Code Issues Releases Wiki Activity

Rename some methods (they weren't Asserting)

Browse Source
This commit is contained in:
Dean Herbert 2019-02-26 09:54:28 +09:00
parent 568e90c70b
commit 14e427fed7
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs
View File

@ -114,7 +114,7 @@ namespace osu.Game.Tests.Visual
createSongSelect(); createSongSelect();
AddStep("Start player loader", () => songSelect.Push(playerLoader = new DimAccessiblePlayerLoader(player = new DimAccessiblePlayer()))); AddStep("Start player loader", () => songSelect.Push(playerLoader = new DimAccessiblePlayerLoader(player = new DimAccessiblePlayer())));
AddUntilStep(() => playerLoader?.IsLoaded ?? false, "Wait for Player Loader to load"); AddUntilStep(() => playerLoader?.IsLoaded ?? false, "Wait for Player Loader to load");
AddAssert("Background retained from song select", () => songSelect.AssertBackgroundCurrent()); AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
AddStep("Trigger background preview", () => AddStep("Trigger background preview", () =>
{ {
InputManager.MoveMouseTo(playerLoader.ScreenPos); InputManager.MoveMouseTo(playerLoader.ScreenPos);
@ -122,7 +122,7 @@ namespace osu.Game.Tests.Visual
}); });
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Screen is dimmed", () => songSelect.AssertDimmed()); AddAssert("Screen is dimmed", () => songSelect.IsBackgroundDimmed());
} }
/// <summary> /// <summary>
@ -142,14 +142,14 @@ namespace osu.Game.Tests.Visual
InputManager.MoveMouseTo(playerLoader.ScreenPos); InputManager.MoveMouseTo(playerLoader.ScreenPos);
}); });
AddUntilStep(() => player?.IsLoaded ?? false, "Wait for player to load"); AddUntilStep(() => player?.IsLoaded ?? false, "Wait for player to load");
AddAssert("Background retained from song select", () => songSelect.AssertBackgroundCurrent()); AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
AddStep("Trigger background preview when loaded", () => AddStep("Trigger background preview when loaded", () =>
{ {
InputManager.MoveMouseTo(playerLoader.VisualSettingsPos); InputManager.MoveMouseTo(playerLoader.VisualSettingsPos);
InputManager.MoveMouseTo(playerLoader.ScreenPos); InputManager.MoveMouseTo(playerLoader.ScreenPos);
}); });
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Screen is dimmed", () => songSelect.AssertDimmed()); AddAssert("Screen is dimmed", () => songSelect.IsBackgroundDimmed());
} }
/// <summary> /// <summary>
@ -165,10 +165,10 @@ namespace osu.Game.Tests.Visual
player.StoryboardEnabled.Value = true; player.StoryboardEnabled.Value = true;
}); });
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Background is invisible", () => songSelect.AssertInvisible()); AddAssert("Background is invisible", () => songSelect.IsBackgroundInvisible());
AddStep("Disable storyboard", () => player.ReplacesBackground.Value = false); AddStep("Disable storyboard", () => player.ReplacesBackground.Value = false);
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Background is visible", () => songSelect.AssertVisible()); AddAssert("Background is visible", () => songSelect.IsBackgroundVisible());
} }
/// <summary> /// <summary>
@ -193,7 +193,7 @@ namespace osu.Game.Tests.Visual
return true; return true;
}, "Wait for song select is current"); }, "Wait for song select is current");
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Background is visible", () => songSelect.AssertVisible()); AddAssert("Background is visible", () => songSelect.IsBackgroundVisible());
} }
/// <summary> /// <summary>
@ -205,7 +205,7 @@ namespace osu.Game.Tests.Visual
performSetup(); performSetup();
AddStep("Test User Undimming", () => songSelect.DimEnabled.Value = false); AddStep("Test User Undimming", () => songSelect.DimEnabled.Value = false);
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Screen is undimmed", () => songSelect.AssertUndimmed()); AddAssert("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
} }
/// <summary> /// <summary>
@ -217,7 +217,7 @@ namespace osu.Game.Tests.Visual
performSetup(); performSetup();
AddStep("Test User Dimming", () => songSelect.DimEnabled.Value = true); AddStep("Test User Dimming", () => songSelect.DimEnabled.Value = true);
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Screen is dimmed", () => songSelect.AssertDimmed()); AddAssert("Screen is dimmed", () => songSelect.IsBackgroundDimmed());
} }
/// <summary> /// <summary>
@ -233,7 +233,7 @@ namespace osu.Game.Tests.Visual
player.Exit(); player.Exit();
}); });
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Screen is dimmed", () => songSelect.AssertDimmed()); AddAssert("Screen is dimmed", () => songSelect.IsBackgroundDimmed());
} }
/// <summary> /// <summary>
@ -245,8 +245,8 @@ namespace osu.Game.Tests.Visual
performSetup(); performSetup();
AddStep("Transition to Results", () => player.Push(new FadeAccesibleResults(new ScoreInfo { User = new User { Username = "osu!" }}))); AddStep("Transition to Results", () => player.Push(new FadeAccesibleResults(new ScoreInfo { User = new User { Username = "osu!" }})));
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Screen is undimmed", () => songSelect.AssertUndimmed()); AddAssert("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
AddAssert("Background retained from song select", () => songSelect.AssertBackgroundCurrent()); AddAssert("Background retained from song select", () => songSelect.IsBackgroundCurrent());
} }
/// <summary> /// <summary>
@ -266,7 +266,7 @@ namespace osu.Game.Tests.Visual
return true; return true;
}, "Wait for song select is current"); }, "Wait for song select is current");
AddWaitStep(5, "Wait for dim"); AddWaitStep(5, "Wait for dim");
AddAssert("Screen is undimmed", () => songSelect.AssertUndimmed()); AddAssert("Screen is undimmed", () => songSelect.IsBackgroundUndimmed());
} }
private class DummySongSelect : OsuScreen private class DummySongSelect : OsuScreen
@ -286,34 +286,19 @@ namespace osu.Game.Tests.Visual
DimEnabled.BindTo(((FadeAccessibleBackground)Background).EnableUserDim); DimEnabled.BindTo(((FadeAccessibleBackground)Background).EnableUserDim);
} }
public bool AssertDimmed() public bool IsBackgroundDimmed() => ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1 - (float)dimLevel.Value);
{
return ((FadeAccessibleBackground)Background).CurrentColour == OsuColour.Gray(1 - (float)dimLevel.Value);
}
public bool AssertUndimmed() public bool IsBackgroundUndimmed() => ((FadeAccessibleBackground)Background).CurrentColour == Color4.White;
{
return ((FadeAccessibleBackground)Background).CurrentColour == Color4.White;
}
public bool AssertInvisible() public bool IsBackgroundInvisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 0;
{
return ((FadeAccessibleBackground)Background).CurrentAlpha == 0;
}
public bool AssertVisible() public bool IsBackgroundVisible() => ((FadeAccessibleBackground)Background).CurrentAlpha == 1;
{
return ((FadeAccessibleBackground)Background).CurrentAlpha == 1;
}
/// <summary> /// <summary>
/// Make sure every time a screen gets pushed, the background doesn't get replaced /// Make sure every time a screen gets pushed, the background doesn't get replaced
/// </summary> /// </summary>
/// <returns>Whether or not the original background (The one created in DummySongSelect) is still the current background</returns> /// <returns>Whether or not the original background (The one created in DummySongSelect) is still the current background</returns>
public bool AssertBackgroundCurrent() public bool IsBackgroundCurrent() => ((FadeAccessibleBackground)Background).IsCurrentScreen();
{
return ((FadeAccessibleBackground)Background).IsCurrentScreen();
}
} }
private class FadeAccesibleResults : SoloResults private class FadeAccesibleResults : SoloResults