h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 11:42:54 +08:00
Code Issues Releases Wiki Activity

Fix formating.

Browse Source
This commit is contained in:
NullifiedJosh 2022-10-06 18:30:49 +08:00
parent 0f6a6287f2
commit 6543171169
No known key found for this signature in database
GPG Key ID: 6E3E27526CE3C16E
2 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game.Rulesets.Catch.Tests/TestSceneDrawableCatchRuleset.cs
View File

@ -4,7 +4,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Logging;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Game.Rulesets.Catch.Beatmaps; using osu.Game.Rulesets.Catch.Beatmaps;
using osu.Game.Rulesets.Catch.Mods; using osu.Game.Rulesets.Catch.Mods;
@ -15,45 +14,28 @@ using osu.Game.Tests.Visual;
namespace osu.Game.Rulesets.Catch.Tests namespace osu.Game.Rulesets.Catch.Tests
{ {
[TestFixture] [TestFixture]
public class TestSceneDrawableCatchRulesetWithRelax : OsuTestScene public class TestSceneDrawableCatchRuleset : OsuTestScene
{ {
[SetUpSteps]
public void SetUpSteps()
{
AddStep("create drawable ruleset with relax mod", () =>
{
Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>() {
new CatchModRelax()
});
});
AddUntilStep("wait for load", () => Child.IsLoaded);
}
[Test] [Test]
public void TestBasic() public void TestWithoutRelax()
{
AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any() == false);
}
}
[TestFixture]
public class TestSceneDrawableCatchRulesetWithoutRelax : OsuTestScene
{
[SetUpSteps]
public void SetUpSteps()
{ {
AddStep("create drawable ruleset without relax mod", () => AddStep("create drawable ruleset without relax mod", () =>
{ {
Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>()); Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod>());
}); });
AddUntilStep("wait for load", () => Child.IsLoaded); AddUntilStep("wait for load", () => Child.IsLoaded);
Logger.Log("Ready"); AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any());
} }
[Test] [Test]
public void TestBasic() public void TestWithRelax()
{ {
AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any()); AddStep("create drawable ruleset with relax mod", () =>
{
Child = new DrawableCatchRuleset(new CatchRuleset(), new CatchBeatmap(), new List<Mod> { new CatchModRelax() });
});
AddUntilStep("wait for load", () => Child.IsLoaded);
AddAssert("check if touch catcher is showing", () => this.ChildrenOfType<CatchTouchInputMapper>().Any() == false);
} }
} }
} }

2
osu.Game.Rulesets.Catch/UI/DrawableCatchRuleset.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Catch.UI
protected override bool UserScrollSpeedAdjustment => false; protected override bool UserScrollSpeedAdjustment => false;
private bool showMobileMapper = true; private readonly bool showMobileMapper = true;
public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null) public DrawableCatchRuleset(Ruleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
: base(ruleset, beatmap, mods) : base(ruleset, beatmap, mods)