diff --git a/.idea/.idea.osu/.idea/.name b/.idea/.idea.osu/.idea/.name deleted file mode 100644 index 21cb4db60e..0000000000 --- a/.idea/.idea.osu/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -osu \ No newline at end of file diff --git a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs index 69faf99416..38c66ef2e6 100644 --- a/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs +++ b/osu.Game.Tests/Visual/TestCaseBackgroundScreenBeatmap.cs @@ -2,7 +2,7 @@ // See the LICENCE file in the repository root for full licence text. using System; -using NUnit.Framework.Internal; +using NUnit.Framework; using osu.Framework.Allocation; using osu.Game.Configuration; using osu.Game.Graphics; @@ -13,22 +13,25 @@ using osu.Game.Screens.Play; namespace osu.Game.Tests.Visual { + [TestFixture] public class TestCaseBackgroundScreenBeatmap : TestCasePlayer { - - [BackgroundDependencyLoader] - private void load(OsuConfigManager manager) - { - LoadScreen(new DimAccessiblePlayer()); - } - [Test] public void EnableUserDimTest() { AddStep("Test User Dimming", () => ((DimAccessiblePlayer)Player).EnableScreenDim()); + AddWaitStep(5, "Wait for dim"); AddAssert("Check screen dim", () => ((DimAccessiblePlayer)Player).AssertDimState()); } + [Test] + public void DisableUserDimTest() + { + AddStep("Test User Dimming", () => ((DimAccessiblePlayer)Player).DisableScreenDim()); + AddWaitStep(5, "Wait for dim"); + AddAssert("Check screen dim", () => ((DimAccessiblePlayer)Player).AssertUndimmed()); + } + protected override Player CreatePlayer(Ruleset ruleset) => new DimAccessiblePlayer(); private class DimAccessiblePlayer : Player @@ -49,17 +52,23 @@ namespace osu.Game.Tests.Visual return ((FadeAccessibleBackground)Background).AssertDimState(); } + public bool AssertUndimmed() + { + return ((FadeAccessibleBackground)Background).AssertUndimmed(); + } + private class FadeAccessibleBackground : BackgroundScreenBeatmap { public bool AssertDimState() { return FadeContainer.Colour == OsuColour.Gray(BackgroundOpacity); } + + public bool AssertUndimmed() + { + return FadeContainer.Colour == OsuColour.Gray(1.0f); + } } } } - - internal class SetupAttribute : Attribute - { - } }