Rename test cases to test scenes inline with the framework change

This commit is contained in:
Roman Kapustin
2019-05-14 22:37:25 +03:00
parent c04cdd170a
commit 459a285cd8
158 changed files with 261 additions and 261 deletions

View File

@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual
/// A base class which runs <see cref="Player"/> test for all available rulesets.
/// Steps to be run for each ruleset should be added via <see cref="AddCheckSteps"/>.
/// </summary>
public abstract class AllPlayersTestCase : RateAdjustedBeatmapTestCase
public abstract class AllPlayersTestScene : RateAdjustedBeatmapTestScene
{
protected Player Player;

View File

@ -15,12 +15,12 @@ namespace osu.Game.Tests.Visual
/// Provides a clock, beat-divisor, and scrolling capability for test cases of editor components that
/// are preferrably tested within the presence of a clock and seek controls.
/// </summary>
public abstract class EditorClockTestCase : OsuTestCase
public abstract class EditorClockTestScene : OsuTestScene
{
protected readonly BindableBeatDivisor BeatDivisor = new BindableBeatDivisor();
protected new readonly EditorClock Clock;
protected EditorClockTestCase()
protected EditorClockTestScene()
{
Clock = new EditorClock(new ControlPointInfo(), 5000, BeatDivisor) { IsCoupled = false };
}

View File

@ -10,13 +10,13 @@ using osu.Game.Tests.Beatmaps;
namespace osu.Game.Tests.Visual
{
public abstract class EditorTestCase : ScreenTestCase
public abstract class EditorTestScene : ScreenTestScene
{
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Editor), typeof(EditorScreen) };
private readonly Ruleset ruleset;
protected EditorTestCase(Ruleset ruleset)
protected EditorTestScene(Ruleset ruleset)
{
this.ruleset = ruleset;
}

View File

@ -8,14 +8,14 @@ using osu.Game.Graphics.Cursor;
namespace osu.Game.Tests.Visual
{
public abstract class ManualInputManagerTestCase : OsuTestCase
public abstract class ManualInputManagerTestScene : OsuTestScene
{
protected override Container<Drawable> Content => content;
private readonly Container content;
protected readonly ManualInputManager InputManager;
protected ManualInputManagerTestCase()
protected ManualInputManagerTestScene()
{
base.Content.Add(InputManager = new ManualInputManager
{

View File

@ -7,7 +7,7 @@ using osu.Game.Online.Multiplayer;
namespace osu.Game.Tests.Visual
{
public abstract class MultiplayerTestCase : ScreenTestCase
public abstract class MultiplayerTestScene : ScreenTestScene
{
[Cached]
private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());

View File

@ -15,7 +15,7 @@ using osu.Game.Rulesets.Mods;
namespace osu.Game.Tests.Visual
{
public abstract class OsuTestCase : TestScene
public abstract class OsuTestScene : TestScene
{
[Cached(typeof(Bindable<WorkingBeatmap>))]
[Cached(typeof(IBindable<WorkingBeatmap>))]
@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual
return Dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
}
protected OsuTestCase()
protected OsuTestScene()
{
localStorage = new Lazy<Storage>(() => new NativeStorage($"{GetType().Name}-{Guid.NewGuid()}"));
}
@ -76,9 +76,9 @@ namespace osu.Game.Tests.Visual
}
}
protected override ITestSceneTestRunner CreateRunner() => new OsuTestCaseTestRunner();
protected override ITestSceneTestRunner CreateRunner() => new OsuTestSceneTestRunner();
public class OsuTestCaseTestRunner : OsuGameBase, ITestSceneTestRunner
public class OsuTestSceneTestRunner : OsuGameBase, ITestSceneTestRunner
{
private TestSceneTestRunner.TestRunner runner;

View File

@ -13,12 +13,12 @@ using osu.Game.Screens.Edit.Compose;
namespace osu.Game.Tests.Visual
{
[Cached(Type = typeof(IPlacementHandler))]
public abstract class PlacementBlueprintTestCase : OsuTestCase, IPlacementHandler
public abstract class PlacementBlueprintTestScene : OsuTestScene, IPlacementHandler
{
protected readonly Container HitObjectContainer;
private PlacementBlueprint currentBlueprint;
protected PlacementBlueprintTestCase()
protected PlacementBlueprintTestScene()
{
Beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize = 2;

View File

@ -13,13 +13,13 @@ using osu.Game.Tests.Beatmaps;
namespace osu.Game.Tests.Visual
{
public abstract class PlayerTestCase : RateAdjustedBeatmapTestCase
public abstract class PlayerTestScene : RateAdjustedBeatmapTestScene
{
private readonly Ruleset ruleset;
protected Player Player;
protected PlayerTestCase(Ruleset ruleset)
protected PlayerTestScene(Ruleset ruleset)
{
this.ruleset = ruleset;
}

View File

@ -6,7 +6,7 @@ namespace osu.Game.Tests.Visual
/// <summary>
/// Test case which adjusts the beatmap's rate to match any speed adjustments in visual tests.
/// </summary>
public abstract class RateAdjustedBeatmapTestCase : ScreenTestCase
public abstract class RateAdjustedBeatmapTestScene : ScreenTestScene
{
protected override void Update()
{

View File

@ -10,7 +10,7 @@ namespace osu.Game.Tests.Visual
/// <summary>
/// A test case which can be used to test a screen (that relies on OnEntering being called to execute startup instructions).
/// </summary>
public abstract class ScreenTestCase : ManualInputManagerTestCase
public abstract class ScreenTestScene : ManualInputManagerTestScene
{
private readonly OsuScreenStack stack;
@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual
protected override Container<Drawable> Content => content;
protected ScreenTestCase()
protected ScreenTestScene()
{
base.Content.AddRange(new Drawable[]
{

View File

@ -10,14 +10,14 @@ using osu.Game.Rulesets.Edit;
namespace osu.Game.Tests.Visual
{
public abstract class SelectionBlueprintTestCase : OsuTestCase
public abstract class SelectionBlueprintTestScene : OsuTestScene
{
private SelectionBlueprint blueprint;
protected override Container<Drawable> Content => content ?? base.Content;
private readonly Container content;
protected SelectionBlueprintTestCase()
protected SelectionBlueprintTestScene()
{
base.Content.Add(content = new Container
{