Merge remote-tracking branch 'upstream/master' into test-scene-create-ruleset

# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs
#	osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs
#	osu.Game/Tests/Visual/ModTestScene.cs
#	osu.Game/Tests/Visual/OsuTestScene.cs
This commit is contained in:
Salman Ahmed
2020-06-03 22:00:02 +03:00
578 changed files with 10062 additions and 4242 deletions

View File

@ -14,11 +14,6 @@ namespace osu.Game.Tests.Visual
{
protected sealed override bool HasCustomSteps => true;
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(ModTestScene)
};
private ModTestData currentTestData;
protected void CreateModTest(ModTestData testData) => CreateTest(() =>
@ -59,12 +54,14 @@ namespace osu.Game.Tests.Visual
protected class ModTestPlayer : TestPlayer
{
protected override bool AllowFail { get; }
private readonly bool allowFail;
protected override bool CheckModsAllowFailure() => allowFail;
public ModTestPlayer(bool allowFail)
: base(false, false)
{
AllowFail = allowFail;
this.allowFail = allowFail;
}
}