Move to using test methods for better separation

This commit is contained in:
smoogipoo
2020-03-02 12:20:25 +09:00
parent 239cfddcbb
commit ce7cbf29ca
4 changed files with 48 additions and 30 deletions

View File

@ -16,6 +16,8 @@ namespace osu.Game.Tests.Visual
{
public abstract class ModSandboxTestScene : PlayerTestScene
{
protected sealed override bool HasCustomSteps => true;
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(ModSandboxTestScene)
@ -28,14 +30,15 @@ namespace osu.Game.Tests.Visual
private ModTestCaseData currentTest;
public override void SetUpSteps()
protected void CreateModTest(ModTestCaseData testCaseData) => CreateTest(() =>
{
foreach (var testCase in CreateTestCases())
{
AddStep(testCase.Name, () => currentTest = testCase);
base.SetUpSteps();
AddUntilStep("test passed", () => testCase.PassCondition?.Invoke() ?? true);
}
AddStep("set test data", () => currentTest = testCaseData);
});
public override void TearDownSteps()
{
AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? true);
base.TearDownSteps();
}
protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest?.Beatmap ?? base.CreateBeatmap(ruleset);
@ -51,11 +54,6 @@ namespace osu.Game.Tests.Visual
return CreateReplayPlayer(score);
}
/// <summary>
/// Creates the test cases for this test scene.
/// </summary>
protected abstract ModTestCaseData[] CreateTestCases();
/// <summary>
/// Creates the <see cref="TestPlayer"/> for a test case.
/// </summary>