Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode

osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenBeatmap.cs

@@ -35,7 +35,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Background
 {
     [TestFixture]
-    public class TestCaseBackgroundScreenBeatmap : ManualInputManagerTestCase
+    public class TestSceneBackgroundScreenBeatmap : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Components/TestSceneIdleTracker.cs

@@ -12,14 +12,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Components
 {
     [TestFixture]
-    public class TestCaseIdleTracker : ManualInputManagerTestCase
+    public class TestSceneIdleTracker : ManualInputManagerTestScene
     {
         private readonly IdleTrackingBox box1;
         private readonly IdleTrackingBox box2;
         private readonly IdleTrackingBox box3;
         private readonly IdleTrackingBox box4;
 
-        public TestCaseIdleTracker()
+        public TestSceneIdleTracker()
         {
             Children = new Drawable[]
             {

osu.Game.Tests/Visual/Components/TestScenePollingComponent.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Components
 {
-    public class TestCasePollingComponent : OsuTestCase
+    public class TestScenePollingComponent : OsuTestScene
     {
         private Container pollBox;
         private TestPoller poller;

osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs

@@ -10,7 +10,7 @@ using osu.Game.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Components
 {
-    public class TestCasePreviewTrackManager : OsuTestCase, IPreviewTrackOwner
+    public class TestScenePreviewTrackManager : OsuTestScene, IPreviewTrackOwner
     {
         private readonly PreviewTrackManager trackManager = new TestPreviewTrackManager();
 

osu.Game.Tests/Visual/Editor/TestSceneBeatDivisorControl.cs

@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestCaseBeatDivisorControl : OsuTestCase
+    public class TestSceneBeatDivisorControl : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BindableBeatDivisor) };
 

osu.Game.Tests/Visual/Editor/TestSceneEditorCompose.cs

@@ -12,7 +12,7 @@ using osu.Game.Tests.Beatmaps;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorCompose : EditorClockTestCase
+    public class TestSceneEditorCompose : EditorClockTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ComposeScreen) };
 

osu.Game.Tests/Visual/Editor/TestSceneEditorComposeRadioButtons.cs

@@ -10,11 +10,11 @@ using osu.Game.Screens.Edit.Components.RadioButtons;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorComposeRadioButtons : OsuTestCase
+    public class TestSceneEditorComposeRadioButtons : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableRadioButton) };
 
-        public TestCaseEditorComposeRadioButtons()
+        public TestSceneEditorComposeRadioButtons()
         {
             RadioButtonCollection collection;
             Add(collection = new RadioButtonCollection

osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs

@@ -19,7 +19,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorComposeTimeline : EditorClockTestCase
+    public class TestSceneEditorComposeTimeline : EditorClockTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Editor/TestSceneEditorMenuBar.cs

@@ -13,11 +13,11 @@ using osu.Game.Screens.Edit.Components.Menus;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorMenuBar : OsuTestCase
+    public class TestSceneEditorMenuBar : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(EditorMenuBar), typeof(ScreenSelectionTabControl) };
 
-        public TestCaseEditorMenuBar()
+        public TestSceneEditorMenuBar()
         {
             Add(new Container
             {

osu.Game.Tests/Visual/Editor/TestSceneEditorSeekSnapping.cs

@@ -17,9 +17,9 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorSeekSnapping : EditorClockTestCase
+    public class TestSceneEditorSeekSnapping : EditorClockTestScene
     {
-        public TestCaseEditorSeekSnapping()
+        public TestSceneEditorSeekSnapping()
         {
             BeatDivisor.Value = 4;
         }

osu.Game.Tests/Visual/Editor/TestSceneEditorSummaryTimeline.cs

@@ -14,7 +14,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseEditorSummaryTimeline : EditorClockTestCase
+    public class TestSceneEditorSummaryTimeline : EditorClockTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(SummaryTimeline) };
 

osu.Game.Tests/Visual/Editor/TestSceneHitObjectComposer.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
     [Cached(Type = typeof(IPlacementHandler))]
-    public class TestCaseHitObjectComposer : OsuTestCase, IPlacementHandler
+    public class TestSceneHitObjectComposer : OsuTestScene, IPlacementHandler
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Editor/TestScenePlaybackControl.cs

@@ -13,7 +13,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCasePlaybackControl : OsuTestCase
+    public class TestScenePlaybackControl : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

osu.Game.Tests/Visual/Editor/TestSceneWaveContainer.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseWaveContainer : OsuTestCase
+    public class TestSceneWaveContainer : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)

osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Editor
 {
     [TestFixture]
-    public class TestCaseWaveform : OsuTestCase
+    public class TestSceneWaveform : OsuTestScene
     {
         private WorkingBeatmap waveformBeatmap;
 

osu.Game.Tests/Visual/Editor/TestSceneZoomableScrollContainer.cs

@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Editor
 {
-    public class TestCaseZoomableScrollContainer : ManualInputManagerTestCase
+    public class TestSceneZoomableScrollContainer : ManualInputManagerTestScene
     {
         private ZoomableScrollContainer scrollContainer;
         private Drawable innerBox;

osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("Player instantiated with an autoplay mod.")]
-    public class TestCaseAutoplay : AllPlayersTestCase
+    public class TestSceneAutoplay : AllPlayersTestScene
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {

osu.Game.Tests/Visual/Gameplay/TestSceneBreakOverlay.cs

@@ -9,11 +9,11 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseBreakOverlay : OsuTestCase
+    public class TestSceneBreakOverlay : OsuTestScene
     {
         private readonly BreakOverlay breakOverlay;
 
-        public TestCaseBreakOverlay()
+        public TestSceneBreakOverlay()
         {
             Child = breakOverlay = new BreakOverlay(true);
 

osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCaseFrameStabilityContainer : OsuTestCase
+    public class TestSceneFrameStabilityContainer : OsuTestScene
     {
         private readonly ManualClock manualClock;
 
@@ -18,7 +18,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private ClockConsumingChild consumer;
 
-        public TestCaseFrameStabilityContainer()
+        public TestSceneFrameStabilityContainer()
         {
             Child = mainContainer = new Container
             {

osu.Game.Tests/Visual/Gameplay/TestSceneGameplayMenuOverlay.cs

@@ -17,7 +17,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("player pause/fail screens")]
-    public class TestCaseGameplayMenuOverlay : ManualInputManagerTestCase
+    public class TestSceneGameplayMenuOverlay : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(FailOverlay), typeof(PauseOverlay) };
 

osu.Game.Tests/Visual/Gameplay/TestSceneHoldForMenuButton.cs

@@ -13,7 +13,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("'Hold to Quit' UI element")]
-    public class TestCaseHoldForMenuButton : ManualInputManagerTestCase
+    public class TestSceneHoldForMenuButton : ManualInputManagerTestScene
     {
         private bool exitAction;
 

osu.Game.Tests/Visual/Gameplay/TestSceneKeyCounter.cs

@@ -14,7 +14,7 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseKeyCounter : ManualInputManagerTestCase
+    public class TestSceneKeyCounter : ManualInputManagerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -23,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             typeof(KeyCounterDisplay)
         };
 
-        public TestCaseKeyCounter()
+        public TestSceneKeyCounter()
         {
             KeyCounterKeyboard rewindTestKeyCounterKeyboard;
             KeyCounterDisplay kc = new KeyCounterDisplay

osu.Game.Tests/Visual/Gameplay/TestSceneMedalOverlay.cs

@@ -11,7 +11,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseMedalOverlay : OsuTestCase
+    public class TestSceneMedalOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Gameplay
             typeof(DrawableMedal),
         };
 
-        public TestCaseMedalOverlay()
+        public TestSceneMedalOverlay()
         {
             AddStep(@"display", () =>
             {

osu.Game.Tests/Visual/Gameplay/TestScenePause.cs

@@ -18,7 +18,7 @@ using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCasePause : PlayerTestCase
+    public class TestScenePause : PlayerTestScene
     {
         protected new PausePlayer Player => (PausePlayer)base.Player;
 
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Container<Drawable> Content => content;
 
-        public TestCasePause()
+        public TestScenePause()
             : base(new OsuRuleset())
         {
             base.Content.Add(content = new MenuCursorContainer { RelativeSizeAxes = Axes.Both });
@@ -86,8 +86,8 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddStep("move cursor outside", () => InputManager.MoveMouseTo(Player.ScreenSpaceDrawQuad.TopLeft - new Vector2(10)));
 
             pauseAndConfirm();
-            resumeAndConfirm();
 
+            resume();
             pause();
 
             confirmClockRunning(true);

osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs

@@ -20,7 +20,7 @@ using osu.Game.Tests.Beatmaps;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCasePlayerLoader : ManualInputManagerTestCase
+    public class TestScenePlayerLoader : ManualInputManagerTestScene
     {
         private PlayerLoader loader;
         private OsuScreenStack stack;

osu.Game.Tests/Visual/Gameplay/TestScenePlayerReferenceLeaking.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCasePlayerReferenceLeaking : AllPlayersTestCase
+    public class TestScenePlayerReferenceLeaking : AllPlayersTestScene
     {
         private readonly WeakList<WorkingBeatmap> workingWeakReferences = new WeakList<WorkingBeatmap>();
 

osu.Game.Tests/Visual/Gameplay/TestSceneReplay.cs

@@ -13,7 +13,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [Description("Player instantiated with a replay.")]
-    public class TestCaseReplay : AllPlayersTestCase
+    public class TestSceneReplay : AllPlayersTestScene
     {
         protected override Player CreatePlayer(Ruleset ruleset)
         {

osu.Game.Tests/Visual/Gameplay/TestSceneReplaySettingsOverlay.cs

@@ -10,9 +10,9 @@ using osu.Game.Screens.Play.PlayerSettings;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseReplaySettingsOverlay : OsuTestCase
+    public class TestSceneReplaySettingsOverlay : OsuTestScene
     {
-        public TestCaseReplaySettingsOverlay()
+        public TestSceneReplaySettingsOverlay()
         {
             ExampleContainer container;
 

osu.Game.Tests/Visual/Gameplay/TestSceneResults.cs

@@ -16,7 +16,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseResults : ScreenTestCase
+    public class TestSceneResults : ScreenTestScene
     {
         private BeatmapManager beatmaps;
 

osu.Game.Tests/Visual/Gameplay/TestSceneScoreCounter.cs

@@ -12,9 +12,9 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseScoreCounter : OsuTestCase
+    public class TestSceneScoreCounter : OsuTestScene
     {
-        public TestCaseScoreCounter()
+        public TestSceneScoreCounter()
         {
             int numerator = 0, denominator = 0;
 

osu.Game.Tests/Visual/Gameplay/TestSceneScrollingHitObjects.cs

@@ -21,7 +21,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseScrollingHitObjects : OsuTestCase
+    public class TestSceneScrollingHitObjects : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Playfield) };
 
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Gameplay
         private readonly ScrollingTestContainer[] scrollContainers = new ScrollingTestContainer[4];
         private readonly TestPlayfield[] playfields = new TestPlayfield[4];
 
-        public TestCaseScrollingHitObjects()
+        public TestSceneScrollingHitObjects()
         {
             Add(new GridContainer
             {

osu.Game.Tests/Visual/Gameplay/TestSceneSkinReloadable.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
-    public class TestCaseSkinReloadable : OsuTestCase
+    public class TestSceneSkinReloadable : OsuTestScene
     {
         [Test]
         public void TestInitialLoad()

osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs

@@ -7,7 +7,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseSkipOverlay : OsuTestCase
+    public class TestSceneSkipOverlay : OsuTestScene
     {
         protected override void LoadComplete()
         {

osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs

@@ -13,7 +13,7 @@ using osu.Game.Screens.Play;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseSongProgress : OsuTestCase
+    public class TestSceneSongProgress : OsuTestScene
     {
         private readonly SongProgress progress;
         private readonly TestSongProgressGraph graph;
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         private readonly FramedClock framedClock;
 
-        public TestCaseSongProgress()
+        public TestSceneSongProgress()
         {
             clock = new StopwatchClock(true);
 

osu.Game.Tests/Visual/Gameplay/TestSceneStoryboard.cs

@@ -16,12 +16,12 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Gameplay
 {
     [TestFixture]
-    public class TestCaseStoryboard : OsuTestCase
+    public class TestSceneStoryboard : OsuTestScene
     {
         private readonly Container<DrawableStoryboard> storyboardContainer;
         private DrawableStoryboard storyboard;
 
-        public TestCaseStoryboard()
+        public TestSceneStoryboard()
         {
             Clock = new FramedClock();
 

osu.Game.Tests/Visual/Menus/TestSceneDisclaimer.cs

@@ -8,7 +8,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Menus
 {
-    public class TestCaseDisclaimer : ScreenTestCase
+    public class TestSceneDisclaimer : ScreenTestScene
     {
         [Cached(typeof(IAPIProvider))]
         private readonly DummyAPIAccess api = new DummyAPIAccess();

osu.Game.Tests/Visual/Menus/TestSceneIntroSequence.cs

@@ -14,14 +14,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestCaseIntroSequence : OsuTestCase
+    public class TestSceneIntroSequence : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(OsuLogo),
         };
 
-        public TestCaseIntroSequence()
+        public TestSceneIntroSequence()
         {
             OsuLogo logo;
 

osu.Game.Tests/Visual/Menus/TestSceneLoaderAnimation.cs

@@ -14,14 +14,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestCaseLoaderAnimation : ScreenTestCase
+    public class TestSceneLoaderAnimation : ScreenTestScene
     {
         private TestLoader loader;
 
         [Cached]
         private OsuLogo logo;
 
-        public TestCaseLoaderAnimation()
+        public TestSceneLoaderAnimation()
         {
             Child = logo = new OsuLogo
             {
@@ -58,7 +58,7 @@ namespace osu.Game.Tests.Visual.Menus
             bool logoVisible = false;
 
             AddStep("begin loading", () => LoadScreen(loader = new TestLoader()));
-            AddWaitStep("wait", 2);
+            AddWaitStep("wait", 3);
             AddStep("finish loading", () =>
             {
                 logoVisible = loader.Logo?.Alpha > 0;

osu.Game.Tests/Visual/Menus/TestSceneToolbar.cs

@@ -11,7 +11,7 @@ using osu.Game.Overlays.Toolbar;
 namespace osu.Game.Tests.Visual.Menus
 {
     [TestFixture]
-    public class TestCaseToolbar : OsuTestCase
+    public class TestSceneToolbar : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Menus
             typeof(ToolbarNotificationButton),
         };
 
-        public TestCaseToolbar()
+        public TestSceneToolbar()
         {
             var toolbar = new Toolbar { State = Visibility.Visible };
             ToolbarNotificationButton notificationButton = null;

osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs

@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseLoungeRoomsContainer : MultiplayerTestCase
+    public class TestSceneLoungeRoomsContainer : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHeader.cs

@@ -12,14 +12,14 @@ using osu.Game.Screens.Multi.Match.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchHeader : MultiplayerTestCase
+    public class TestSceneMatchHeader : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(Header)
         };
 
-        public TestCaseMatchHeader()
+        public TestSceneMatchHeader()
         {
             Room.Playlist.Add(new PlaylistItem
             {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchHostInfo.cs

@@ -10,7 +10,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchHostInfo : OsuTestCase
+    public class TestSceneMatchHostInfo : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private readonly Bindable<User> host = new Bindable<User>(new User { Username = "SomeHost" });
 
-        public TestCaseMatchHostInfo()
+        public TestSceneMatchHostInfo()
         {
             HostInfo hostInfo;
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchInfo.cs

@@ -14,7 +14,7 @@ using osu.Game.Screens.Multi.Match.Components;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMatchInfo : MultiplayerTestCase
+    public class TestSceneMatchInfo : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchLeaderboard.cs

@@ -12,9 +12,9 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchLeaderboard : MultiplayerTestCase
+    public class TestSceneMatchLeaderboard : MultiplayerTestScene
     {
-        public TestCaseMatchLeaderboard()
+        public TestSceneMatchLeaderboard()
         {
             Room.RoomID.Value = 3;
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchParticipants.cs

@@ -9,9 +9,9 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMatchParticipants : MultiplayerTestCase
+    public class TestSceneMatchParticipants : MultiplayerTestScene
     {
-        public TestCaseMatchParticipants()
+        public TestSceneMatchParticipants()
         {
             Add(new Participants { RelativeSizeAxes = Axes.Both });
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchResults.cs

@@ -18,7 +18,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchResults : MultiplayerTestCase
+    public class TestSceneMatchResults : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMatchSettingsOverlay.cs

@@ -17,7 +17,7 @@ using osu.Game.Screens.Multi.Match.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseMatchSettingsOverlay : MultiplayerTestCase
+    public class TestSceneMatchSettingsOverlay : MultiplayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiHeader.cs

@@ -10,9 +10,9 @@ using osu.Game.Screens.Multi;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMultiHeader : OsuTestCase
+    public class TestSceneMultiHeader : OsuTestScene
     {
-        public TestCaseMultiHeader()
+        public TestSceneMultiHeader()
         {
             int index = 0;
 

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiScreen.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Multi.Lounge.Components;
 namespace osu.Game.Tests.Visual.Multiplayer
 {
     [TestFixture]
-    public class TestCaseMultiScreen : ScreenTestCase
+    public class TestSceneMultiScreen : ScreenTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(FilterControl)
         };
 
-        public TestCaseMultiScreen()
+        public TestSceneMultiScreen()
         {
             Screens.Multi.Multiplayer multi = new Screens.Multi.Multiplayer();
 

osu.Game.Tests/Visual/Multiplayer/TestSceneRoomStatus.cs

@@ -11,7 +11,7 @@ using osu.Game.Screens.Multi.Lounge.Components;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
-    public class TestCaseRoomStatus : OsuTestCase
+    public class TestSceneRoomStatus : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -20,7 +20,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
             typeof(RoomStatusPlaying)
         };
 
-        public TestCaseRoomStatus()
+        public TestSceneRoomStatus()
         {
             Child = new FillFlowContainer
             {

osu.Game.Tests/Visual/Online/TestSceneAccountCreationOverlay.cs

@@ -13,7 +13,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseAccountCreationOverlay : OsuTestCase
+    public class TestSceneAccountCreationOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual.Online
         [Cached(typeof(IAPIProvider))]
         private DummyAPIAccess api = new DummyAPIAccess();
 
-        public TestCaseAccountCreationOverlay()
+        public TestSceneAccountCreationOverlay()
         {
             Container userPanelArea;
             AccountCreationOverlay accountCreation;

osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs

@@ -17,7 +17,7 @@ using System.Linq;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseBeatmapSetOverlay : OsuTestCase
+    public class TestSceneBeatmapSetOverlay : OsuTestScene
     {
         private readonly BeatmapSetOverlay overlay;
 
@@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(SuccessRate),
         };
 
-        public TestCaseBeatmapSetOverlay()
+        public TestSceneBeatmapSetOverlay()
         {
             Add(overlay = new BeatmapSetOverlay());
         }

osu.Game.Tests/Visual/Online/TestSceneChannelTabControl.cs

@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseChannelTabControl : OsuTestCase
+    public class TestSceneChannelTabControl : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private readonly ChannelTabControl channelTabControl;
 
-        public TestCaseChannelTabControl()
+        public TestSceneChannelTabControl()
         {
             SpriteText currentText;
             Add(new Container

osu.Game.Tests/Visual/Online/TestSceneChatDisplay.cs

@@ -15,7 +15,7 @@ using osu.Game.Overlays.Chat.Tabs;
 namespace osu.Game.Tests.Visual.Online
 {
     [Description("Testing chat api and overlay")]
-    public class TestCaseChatDisplay : OsuTestCase
+    public class TestSceneChatDisplay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Online/TestSceneChatLink.cs

@@ -21,7 +21,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseChatLink : OsuTestCase
+    public class TestSceneChatLink : OsuTestScene
     {
         private readonly TestChatLineContainer textContainer;
         private readonly DialogOverlay dialogOverlay;
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(MessageFormatter)
         };
 
-        public TestCaseChatLink()
+        public TestSceneChatLink()
         {
             Add(dialogOverlay = new DialogOverlay { Depth = float.MinValue });
             Add(textContainer = new TestChatLineContainer

osu.Game.Tests/Visual/Online/TestSceneDirectOverlay.cs

@@ -11,7 +11,7 @@ using osu.Game.Rulesets;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseDirect : OsuTestCase
+    public class TestSceneDirectOverlay : OsuTestScene
     {
         private DirectOverlay direct;
         private RulesetStore rulesets;

osu.Game.Tests/Visual/Online/TestSceneDirectPanel.cs

@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseDirectPanel : OsuTestCase
+    public class TestSceneDirectPanel : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/Online/TestSceneExternalLinkButton.cs

@@ -8,11 +8,11 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseExternalLinkButton : OsuTestCase
+    public class TestSceneExternalLinkButton : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ExternalLinkButton) };
 
-        public TestCaseExternalLinkButton()
+        public TestSceneExternalLinkButton()
         {
             Child = new ExternalLinkButton("https://osu.ppy.sh/home")
             {

osu.Game.Tests/Visual/Online/TestSceneFullscreenOverlay.cs

@@ -0,0 +1,40 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Overlays;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Online
+{
+    [TestFixture]
+    public class TestSceneFullscreenOverlay : OsuTestScene
+    {
+        private FullscreenOverlay overlay;
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            Add(overlay = new TestFullscreenOverlay());
+            AddStep(@"toggle", overlay.ToggleVisibility);
+        }
+
+        private class TestFullscreenOverlay : FullscreenOverlay
+        {
+            public TestFullscreenOverlay()
+            {
+                Children = new Drawable[]
+                {
+                    new Box
+                    {
+                        Colour = Color4.Black,
+                        RelativeSizeAxes = Axes.Both,
+                    },
+                };
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/Online/TestSceneGraph.cs

@@ -10,9 +10,9 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseGraph : OsuTestCase
+    public class TestSceneGraph : OsuTestScene
     {
-        public TestCaseGraph()
+        public TestSceneGraph()
         {
             BarGraph graph;
 

osu.Game.Tests/Visual/Online/TestSceneHistoricalSection.cs

@@ -15,7 +15,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseHistoricalSection : OsuTestCase
+    public class TestSceneHistoricalSection : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes =>
             new[]
@@ -26,7 +26,7 @@ namespace osu.Game.Tests.Visual.Online
                 typeof(DrawableProfileRow)
             };
 
-        public TestCaseHistoricalSection()
+        public TestSceneHistoricalSection()
         {
             HistoricalSection section;
 

osu.Game.Tests/Visual/Online/TestSceneRankGraph.cs

@@ -16,7 +16,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseRankGraph : OsuTestCase
+    public class TestSceneRankGraph : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(LineGraph)
         };
 
-        public TestCaseRankGraph()
+        public TestSceneRankGraph()
         {
             RankGraph graph;
 

osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs

@@ -18,7 +18,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseScoresContainer : OsuTestCase
+    public class TestSceneScoresContainer : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.Online
 
         private readonly Box background;
 
-        public TestCaseScoresContainer()
+        public TestSceneScoresContainer()
         {
             ScoresContainer scoresContainer;
 

osu.Game.Tests/Visual/Online/TestSceneSocialOverlay.cs

@@ -11,19 +11,18 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseSocial : OsuTestCase
+    public class TestSceneSocialOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(UserPanel),
             typeof(SocialPanel),
             typeof(FilterControl),
-            typeof(SocialOverlay),
             typeof(SocialGridPanel),
             typeof(SocialListPanel)
         };
 
-        public TestCaseSocial()
+        public TestSceneSocialOverlay()
         {
             SocialOverlay s = new SocialOverlay
             {

osu.Game.Tests/Visual/Online/TestSceneStandAloneChatDisplay.cs

@@ -9,7 +9,7 @@ using osuTK;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseStandAloneChatDisplay : OsuTestCase
+    public class TestSceneStandAloneChatDisplay : OsuTestScene
     {
         private readonly Channel testChannel = new Channel();
 
@@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.Online
         private readonly StandAloneChatDisplay chatDisplay;
         private readonly StandAloneChatDisplay chatDisplay2;
 
-        public TestCaseStandAloneChatDisplay()
+        public TestSceneStandAloneChatDisplay()
         {
             Add(channelManager);
 

osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs

@@ -10,9 +10,9 @@ using osuTK;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseUserPanel : OsuTestCase
+    public class TestSceneUserPanel : OsuTestScene
     {
-        public TestCaseUserPanel()
+        public TestSceneUserPanel()
         {
             UserPanel flyte;
             UserPanel peppy;

osu.Game.Tests/Visual/Online/TestSceneUserProfileHeader.cs

@@ -14,7 +14,7 @@ using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual.Online
 {
-    public class TestCaseUserProfileHeader : OsuTestCase
+    public class TestSceneUserProfileHeader : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -33,12 +33,12 @@ namespace osu.Game.Tests.Visual.Online
 
         private readonly ProfileHeader header;
 
-        public TestCaseUserProfileHeader()
+        public TestSceneUserProfileHeader()
         {
             header = new ProfileHeader();
             Add(header);
 
-            AddStep("Show offline dummy", () => header.User.Value = TestCaseUserProfile.TEST_USER);
+            AddStep("Show offline dummy", () => header.User.Value = TestSceneUserProfileOverlay.TEST_USER);
 
             AddStep("Show null dummy", () => header.User.Value = new User
             {

osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs

@@ -17,7 +17,7 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseUserProfile : OsuTestCase
+    public class TestSceneUserProfileOverlay : OsuTestScene
     {
         private readonly TestUserProfileOverlay profile;
 
@@ -27,7 +27,6 @@ namespace osu.Game.Tests.Visual.Online
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ProfileHeader),
-            typeof(UserProfileOverlay),
             typeof(RankGraph),
             typeof(LineGraph),
             typeof(SectionsContainer<>),
@@ -72,7 +71,7 @@ namespace osu.Game.Tests.Visual.Online
             Achievements = new User.UserAchievement[0],
         };
 
-        public TestCaseUserProfile()
+        public TestSceneUserProfileOverlay()
         {
             Add(profile = new TestUserProfileOverlay());
         }

osu.Game.Tests/Visual/Online/TestSceneUserProfileRecentSection.cs

@@ -17,7 +17,7 @@ using osu.Game.Overlays.Profile.Sections.Recent;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseUserProfileRecentSection : OsuTestCase
+    public class TestSceneUserProfileRecentSection : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.Online
             typeof(MedalIcon)
         };
 
-        public TestCaseUserProfileRecentSection()
+        public TestSceneUserProfileRecentSection()
         {
             Children = new Drawable[]
             {

osu.Game.Tests/Visual/Online/TestSceneUserRanks.cs

@@ -15,11 +15,11 @@ using osu.Game.Users;
 namespace osu.Game.Tests.Visual.Online
 {
     [TestFixture]
-    public class TestCaseUserRanks : OsuTestCase
+    public class TestSceneUserRanks : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(DrawableProfileScore), typeof(RanksSection) };
 
-        public TestCaseUserRanks()
+        public TestSceneUserRanks()
         {
             RanksSection ranks;
 

osu.Game.Tests/Visual/Settings/TestSceneKeyConfiguration.cs

@@ -7,19 +7,19 @@ using osu.Game.Overlays;
 namespace osu.Game.Tests.Visual.Settings
 {
     [TestFixture]
-    public class TestCaseKeyConfiguration : OsuTestCase
+    public class TestSceneKeyConfiguration : OsuTestScene
     {
-        private readonly KeyBindingOverlay overlay;
+        private readonly KeyBindingPanel panel;
 
-        public TestCaseKeyConfiguration()
+        public TestSceneKeyConfiguration()
         {
-            Child = overlay = new KeyBindingOverlay();
+            Child = panel = new KeyBindingPanel();
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            overlay.Show();
+            panel.Show();
         }
     }
 }

osu.Game.Tests/Visual/Settings/TestSceneSettings.cs

@@ -9,14 +9,14 @@ using osu.Game.Overlays;
 namespace osu.Game.Tests.Visual.Settings
 {
     [TestFixture]
-    public class TestCaseSettings : OsuTestCase
+    public class TestSceneSettings : OsuTestScene
     {
-        private readonly SettingsOverlay settings;
+        private readonly SettingsPanel settings;
         private readonly DialogOverlay dialogOverlay;
 
-        public TestCaseSettings()
+        public TestSceneSettings()
         {
-            settings = new MainSettings
+            settings = new SettingsOverlay
             {
                 State = Visibility.Visible
             };

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs

@@ -20,7 +20,7 @@ using osu.Game.Screens.Select.Filter;
 namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
-    public class TestCaseBeatmapCarousel : OsuTestCase
+    public class TestSceneBeatmapCarousel : OsuTestScene
     {
         private TestBeatmapCarousel carousel;
         private RulesetStore rulesets;

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetailArea.cs

@@ -14,11 +14,11 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
     [System.ComponentModel.Description("PlaySongSelect leaderboard/details area")]
-    public class TestCaseBeatmapDetailArea : OsuTestCase
+    public class TestSceneBeatmapDetailArea : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BeatmapDetails) };
 
-        public TestCaseBeatmapDetailArea()
+        public TestSceneBeatmapDetailArea()
         {
             BeatmapDetailArea detailsArea;
             Add(detailsArea = new BeatmapDetailArea

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapDetails.cs

@@ -10,9 +10,9 @@ using osu.Game.Screens.Select;
 namespace osu.Game.Tests.Visual.SongSelect
 {
     [Description("PlaySongSelect beatmap details")]
-    public class TestCaseBeatmapDetails : OsuTestCase
+    public class TestSceneBeatmapDetails : OsuTestScene
     {
-        public TestCaseBeatmapDetails()
+        public TestSceneBeatmapDetails()
         {
             BeatmapDetails details;
             Add(details = new BeatmapDetails

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs

@@ -24,7 +24,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
-    public class TestCaseBeatmapInfoWedge : OsuTestCase
+    public class TestSceneBeatmapInfoWedge : OsuTestScene
     {
         private RulesetStore rulesets;
         private TestBeatmapInfoWedge infoWedge;

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapOptionsOverlay.cs

@@ -10,9 +10,9 @@ using osuTK.Input;
 namespace osu.Game.Tests.Visual.SongSelect
 {
     [Description("bottom beatmap details")]
-    public class TestCaseBeatmapOptionsOverlay : OsuTestCase
+    public class TestSceneBeatmapOptionsOverlay : OsuTestScene
     {
-        public TestCaseBeatmapOptionsOverlay()
+        public TestSceneBeatmapOptionsOverlay()
         {
             var overlay = new BeatmapOptionsOverlay();
 

osu.Game.Tests/Visual/SongSelect/TestSceneLeaderboard.cs

@@ -18,7 +18,7 @@ using osuTK;
 namespace osu.Game.Tests.Visual.SongSelect
 {
     [Description("PlaySongSelect leaderboard")]
-    public class TestCaseLeaderboard : OsuTestCase
+    public class TestSceneLeaderboard : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private readonly FailableLeaderboard leaderboard;
 
-        public TestCaseLeaderboard()
+        public TestSceneLeaderboard()
         {
             Add(leaderboard = new FailableLeaderboard
             {

osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs

@@ -26,7 +26,7 @@ using osu.Game.Screens.Select.Filter;
 namespace osu.Game.Tests.Visual.SongSelect
 {
     [TestFixture]
-    public class TestCasePlaySongSelect : ScreenTestCase
+    public class TestScenePlaySongSelect : ScreenTestScene
     {
         private BeatmapManager manager;
 

osu.Game.Tests/Visual/TestCaseCharLookup.cs

@@ -1,16 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using osu.Game.Graphics.Sprites;
-
-namespace osu.Game.Tests.Visual
-{
-    public class TestCaseCharLookup : OsuTestCase
-    {
-        public TestCaseCharLookup()
-        {
-            AddStep("null", () => { });
-            AddStep("display acharacter", () => Add(new OsuSpriteText { Text = "振込申請" }));
-        }
-    }
-}

osu.Game.Tests/Visual/TestCaseOsuGame.cs

@@ -1,41 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Platform;
-using osu.Game.Screens.Menu;
-using osuTK.Graphics;
-
-namespace osu.Game.Tests.Visual
-{
-    [TestFixture]
-    public class TestCaseOsuGame : OsuTestCase
-    {
-        public override IReadOnlyList<Type> RequiredTypes => new[]
-        {
-            typeof(OsuLogo),
-        };
-
-        [BackgroundDependencyLoader]
-        private void load(GameHost host)
-        {
-            OsuGame game = new OsuGame();
-            game.SetHost(host);
-
-            Children = new Drawable[]
-            {
-                new Box
-                {
-                    RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Black,
-                },
-                game
-            };
-        }
-    }
-}

osu.Game.Tests/Visual/TestSceneOsuGame.cs

@@ -0,0 +1,127 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.Platform;
+using osu.Game.Audio;
+using osu.Game.Beatmaps;
+using osu.Game.Configuration;
+using osu.Game.Database;
+using osu.Game.Graphics;
+using osu.Game.Input;
+using osu.Game.Input.Bindings;
+using osu.Game.IO;
+using osu.Game.Online.API;
+using osu.Game.Online.Chat;
+using osu.Game.Overlays;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Scoring;
+using osu.Game.Screens.Menu;
+using osu.Game.Skinning;
+using osu.Game.Utils;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual
+{
+    [TestFixture]
+    public class TestSceneOsuGame : OsuTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OsuLogo),
+        };
+
+        private IReadOnlyList<Type> requiredGameDependencies => new[]
+        {
+            typeof(OsuGame),
+            typeof(RavenLogger),
+            typeof(OsuLogo),
+            typeof(IdleTracker),
+            typeof(OnScreenDisplay),
+            typeof(NotificationOverlay),
+            typeof(DirectOverlay),
+            typeof(SocialOverlay),
+            typeof(ChannelManager),
+            typeof(ChatOverlay),
+            typeof(SettingsOverlay),
+            typeof(UserProfileOverlay),
+            typeof(BeatmapSetOverlay),
+            typeof(LoginOverlay),
+            typeof(MusicController),
+            typeof(AccountCreationOverlay),
+            typeof(DialogOverlay),
+            typeof(ScreenshotManager)
+        };
+
+        private IReadOnlyList<Type> requiredGameBaseDependencies => new[]
+        {
+            typeof(OsuGameBase),
+            typeof(DatabaseContextFactory),
+            typeof(Bindable<RulesetInfo>),
+            typeof(IBindable<RulesetInfo>),
+            typeof(Bindable<IReadOnlyList<Mod>>),
+            typeof(IBindable<IReadOnlyList<Mod>>),
+            typeof(LargeTextureStore),
+            typeof(OsuConfigManager),
+            typeof(SkinManager),
+            typeof(ISkinSource),
+            typeof(IAPIProvider),
+            typeof(RulesetStore),
+            typeof(FileStore),
+            typeof(ScoreManager),
+            typeof(BeatmapManager),
+            typeof(KeyBindingStore),
+            typeof(SettingsStore),
+            typeof(RulesetConfigCache),
+            typeof(OsuColour),
+            typeof(IBindable<WorkingBeatmap>),
+            typeof(Bindable<WorkingBeatmap>),
+            typeof(GlobalActionContainer),
+            typeof(PreviewTrackManager),
+        };
+
+        [BackgroundDependencyLoader]
+        private void load(GameHost host, OsuGameBase gameBase)
+        {
+            OsuGame game = new OsuGame();
+            game.SetHost(host);
+
+            Children = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = Color4.Black,
+                },
+                game
+            };
+
+            AddUntilStep("wait for load", () => game.IsLoaded);
+
+            AddAssert("check OsuGame DI members", () =>
+            {
+                foreach (var type in requiredGameDependencies)
+                    if (game.Dependencies.Get(type) == null)
+                        throw new Exception($"{type} has not been cached");
+
+                return true;
+            });
+            AddAssert("check OsuGameBase DI members", () =>
+            {
+                foreach (var type in requiredGameBaseDependencies)
+                    if (gameBase.Dependencies.Get(type) == null)
+                        throw new Exception($"{type} has not been cached");
+
+                return true;
+            });
+        }
+    }
+}

osu.Game.Tests/Visual/TestSceneOsuScreenStack.cs

@@ -14,7 +14,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual
 {
     [TestFixture]
-    public class TestCaseOsuScreenStack : OsuTestCase
+    public class TestSceneOsuScreenStack : OsuTestScene
     {
         private TestOsuScreenStack stack;
 

osu.Game.Tests/Visual/Tournament/TestSceneDrawings.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Tournament.Teams;
 namespace osu.Game.Tests.Visual.Tournament
 {
     [Description("for tournament use")]
-    public class TestCaseDrawings : ScreenTestCase
+    public class TestSceneDrawings : ScreenTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

osu.Game.Tests/Visual/UserInterface/TestSceneBeatSyncedContainer.cs

@@ -20,11 +20,11 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseBeatSyncedContainer : OsuTestCase
+    public class TestSceneBeatSyncedContainer : OsuTestScene
     {
         private readonly MusicController mc;
 
-        public TestCaseBeatSyncedContainer()
+        public TestSceneBeatSyncedContainer()
         {
             Clock = new FramedClock();
             Clock.ProcessFrame();

osu.Game.Tests/Visual/UserInterface/TestSceneBreadcrumbs.cs

@@ -10,11 +10,11 @@ using osu.Game.Graphics.UserInterface;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseBreadcrumbs : OsuTestCase
+    public class TestSceneBreadcrumbs : OsuTestScene
     {
         private readonly BreadcrumbControl<BreadcrumbTab> breadcrumbs;
 
-        public TestCaseBreadcrumbs()
+        public TestSceneBreadcrumbs()
         {
             Add(breadcrumbs = new BreadcrumbControl<BreadcrumbTab>
             {

osu.Game.Tests/Visual/UserInterface/TestSceneButtonSystem.cs

@@ -15,7 +15,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseButtonSystem : OsuTestCase
+    public class TestSceneButtonSystem : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             typeof(Button)
         };
 
-        public TestCaseButtonSystem()
+        public TestSceneButtonSystem()
         {
             OsuLogo logo;
             ButtonSystem buttons;

osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs

@@ -15,14 +15,14 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseContextMenu : OsuTestCase
+    public class TestSceneContextMenu : OsuTestScene
     {
         private const int start_time = 0;
         private const int duration = 1000;
 
         private readonly Container container;
 
-        public TestCaseContextMenu()
+        public TestSceneContextMenu()
         {
             Add(new OsuContextMenuContainer
             {

osu.Game.Tests/Visual/UserInterface/TestSceneCursors.cs

@@ -17,12 +17,12 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseCursors : ManualInputManagerTestCase
+    public class TestSceneCursors : ManualInputManagerTestScene
     {
         private readonly MenuCursorContainer menuCursorContainer;
         private readonly CustomCursorBox[] cursorBoxes = new CustomCursorBox[6];
 
-        public TestCaseCursors()
+        public TestSceneCursors()
         {
             Child = menuCursorContainer = new MenuCursorContainer
             {

osu.Game.Tests/Visual/UserInterface/TestSceneDialogOverlay.cs

@@ -9,9 +9,9 @@ using osu.Game.Overlays.Dialog;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseDialogOverlay : OsuTestCase
+    public class TestSceneDialogOverlay : OsuTestScene
     {
-        public TestCaseDialogOverlay()
+        public TestSceneDialogOverlay()
         {
             DialogOverlay overlay;
 

osu.Game.Tests/Visual/UserInterface/TestSceneDrawableDate.cs

@@ -11,9 +11,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestCaseDrawableDate : OsuTestCase
+    public class TestSceneDrawableDate : OsuTestScene
     {
-        public TestCaseDrawableDate()
+        public TestSceneDrawableDate()
         {
             Child = new FillFlowContainer
             {

osu.Game.Tests/Visual/UserInterface/TestSceneHoldToConfirmOverlay.cs

@@ -10,11 +10,11 @@ using osu.Game.Screens.Menu;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestCaseHoldToConfirmOverlay : OsuTestCase
+    public class TestSceneHoldToConfirmOverlay : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(ExitConfirmOverlay) };
 
-        public TestCaseHoldToConfirmOverlay()
+        public TestSceneHoldToConfirmOverlay()
         {
             bool fired = false;
 

osu.Game.Tests/Visual/UserInterface/TestSceneIconButton.cs

@@ -14,9 +14,9 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseIconButton : OsuTestCase
+    public class TestSceneIconButton : OsuTestScene
     {
-        public TestCaseIconButton()
+        public TestSceneIconButton()
         {
             Child = new FillFlowContainer
             {

osu.Game.Tests/Visual/UserInterface/TestSceneLabelledTextBox.cs

@@ -12,7 +12,7 @@ using osu.Game.Screens.Edit.Setup.Components.LabelledComponents;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseLabelledTextBox : OsuTestCase
+    public class TestSceneLabelledTextBox : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs

@@ -9,9 +9,9 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestCaseLoadingAnimation : GridTestCase
+    public class TestSceneLoadingAnimation : GridTestScene //todo: this should be an OsuTestScene
     {
-        public TestCaseLoadingAnimation()
+        public TestSceneLoadingAnimation()
             : base(2, 2)
         {
             LoadingAnimation loading;

osu.Game.Tests/Visual/UserInterface/TestSceneLogoTrackingContainer.cs

@@ -18,7 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Tests.Visual.UserInterface
 {
-    public class TestCaseLogoTrackingContainer : OsuTestCase
+    public class TestSceneLogoTrackingContainer : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/UserInterface/TestSceneMods.cs

@@ -24,7 +24,7 @@ using osuTK.Graphics;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [Description("mod select and icon display")]
-    public class TestCaseMods : OsuTestCase
+    public class TestSceneMods : OsuTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tests/Visual/UserInterface/TestSceneMusicController.cs

@@ -10,9 +10,9 @@ using osu.Game.Overlays;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseMusicController : OsuTestCase
+    public class TestSceneMusicController : OsuTestScene
     {
-        public TestCaseMusicController()
+        public TestSceneMusicController()
         {
             Clock = new FramedClock();
 

osu.Game.Tests/Visual/UserInterface/TestSceneNotificationOverlay.cs

@@ -15,7 +15,7 @@ using osu.Game.Overlays.Notifications;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseNotificationOverlay : OsuTestCase
+    public class TestSceneNotificationOverlay : OsuTestScene
     {
         private readonly NotificationOverlay manager;
         private readonly List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual.UserInterface
             typeof(Notification)
         };
 
-        public TestCaseNotificationOverlay()
+        public TestSceneNotificationOverlay()
         {
             progressingNotifications.Clear();
 

osu.Game.Tests/Visual/UserInterface/TestSceneOnScreenDisplay.cs

@@ -11,7 +11,7 @@ using osu.Game.Overlays;
 namespace osu.Game.Tests.Visual.UserInterface
 {
     [TestFixture]
-    public class TestCaseOnScreenDisplay : OsuTestCase
+    public class TestSceneOnScreenDisplay : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()