From 868367511e5eb181e48499449d6933f87ec4964c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Mar 2019 13:16:46 +0900
Subject: [PATCH] Add ManualInputManager to screen tests

Also sanitises content init order (ctor for content; bdl for other)
---
 .../Visual/Multiplayer/TestCaseLoungeRoomsContainer.cs    | 3 ++-
 osu.Game.Tests/Visual/Tournament/TestCaseDrawings.cs      | 4 +++-
 osu.Game/Tests/Visual/ManualInputManagerTestCase.cs       | 3 +--
 osu.Game/Tests/Visual/PlayerTestCase.cs                   | 5 +++++
 osu.Game/Tests/Visual/ScreenTestCase.cs                   | 8 +++++---
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestCaseLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestCaseLoungeRoomsContainer.cs
index 34de61cb5b..497da33a05 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestCaseLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestCaseLoungeRoomsContainer.cs
@@ -27,7 +27,8 @@ public class TestCaseLoungeRoomsContainer : MultiplayerTestCase
         [Cached(Type = typeof(IRoomManager))]
         private TestRoomManager roomManager = new TestRoomManager();
 
-        public TestCaseLoungeRoomsContainer()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             RoomsContainer container;
 
diff --git a/osu.Game.Tests/Visual/Tournament/TestCaseDrawings.cs b/osu.Game.Tests/Visual/Tournament/TestCaseDrawings.cs
index 9453d0a5b2..53fb60bcb6 100644
--- a/osu.Game.Tests/Visual/Tournament/TestCaseDrawings.cs
+++ b/osu.Game.Tests/Visual/Tournament/TestCaseDrawings.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using System.ComponentModel;
+using osu.Framework.Allocation;
 using osu.Game.Screens.Tournament;
 using osu.Game.Screens.Tournament.Teams;
 
@@ -11,7 +12,8 @@ namespace osu.Game.Tests.Visual.Tournament
     [Description("for tournament use")]
     public class TestCaseDrawings : ScreenTestCase
     {
-        public TestCaseDrawings()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             LoadScreen(new Drawings
             {
diff --git a/osu.Game/Tests/Visual/ManualInputManagerTestCase.cs b/osu.Game/Tests/Visual/ManualInputManagerTestCase.cs
index 7c7c5938aa..f14ac833e4 100644
--- a/osu.Game/Tests/Visual/ManualInputManagerTestCase.cs
+++ b/osu.Game/Tests/Visual/ManualInputManagerTestCase.cs
@@ -14,8 +14,7 @@ public abstract class ManualInputManagerTestCase : OsuTestCase
 
         protected ManualInputManagerTestCase()
         {
-            base.Content.Add(InputManager = new ManualInputManager());
-            ReturnUserInput();
+            base.Content.Add(InputManager = new ManualInputManager { UseParentInput = true });
         }
 
         /// <summary>
diff --git a/osu.Game/Tests/Visual/PlayerTestCase.cs b/osu.Game/Tests/Visual/PlayerTestCase.cs
index 50cb839ed9..fb10244b12 100644
--- a/osu.Game/Tests/Visual/PlayerTestCase.cs
+++ b/osu.Game/Tests/Visual/PlayerTestCase.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
+using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing;
@@ -23,7 +24,11 @@ public abstract class PlayerTestCase : RateAdjustedBeatmapTestCase
         protected PlayerTestCase(Ruleset ruleset)
         {
             this.ruleset = ruleset;
+        }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
             Add(new Box
             {
                 RelativeSizeAxes = Axes.Both,
diff --git a/osu.Game/Tests/Visual/ScreenTestCase.cs b/osu.Game/Tests/Visual/ScreenTestCase.cs
index eec60d01c5..981f9acb63 100644
--- a/osu.Game/Tests/Visual/ScreenTestCase.cs
+++ b/osu.Game/Tests/Visual/ScreenTestCase.cs
@@ -1,6 +1,7 @@
 // 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.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Screens;
 
@@ -9,11 +10,12 @@ 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 : OsuTestCase
+    public abstract class ScreenTestCase : ManualInputManagerTestCase
     {
-        private readonly OsuScreenStack stack;
+        private OsuScreenStack stack;
 
-        protected ScreenTestCase()
+        [BackgroundDependencyLoader]
+        private void load()
         {
             Child = stack = new OsuScreenStack { RelativeSizeAxes = Axes.Both };
         }