From b967b93b8847060064c3f8c9476200e7dc60f58a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 12 Feb 2019 19:53:08 +0900
Subject: [PATCH] Fix regressions in tests

---
 osu.Game.Tests/Visual/TestCasePlayerLoader.cs | 14 ++++++++++++--
 osu.Game/Tests/Visual/OsuTestCase.cs          |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCasePlayerLoader.cs b/osu.Game.Tests/Visual/TestCasePlayerLoader.cs
index 82ce7e125a..16cb94c65e 100644
--- a/osu.Game.Tests/Visual/TestCasePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/TestCasePlayerLoader.cs
@@ -3,6 +3,7 @@
 
 using System.Threading;
 using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
 using osu.Game.Screens.Play;
@@ -12,28 +13,37 @@ namespace osu.Game.Tests.Visual
     public class TestCasePlayerLoader : ManualInputManagerTestCase
     {
         private PlayerLoader loader;
+        private ScreenStack stack;
 
         [BackgroundDependencyLoader]
         private void load(OsuGameBase game)
         {
             Beatmap.Value = new DummyWorkingBeatmap(game);
 
-            AddStep("load dummy beatmap", () => Add(loader = new PlayerLoader(() => new Player
+            InputManager.Add(stack = new ScreenStack { RelativeSizeAxes = Axes.Both });
+
+            AddStep("load dummy beatmap", () => stack.Push(loader = new PlayerLoader(() => new Player
             {
                 AllowPause = false,
                 AllowLeadIn = false,
                 AllowResults = false,
             })));
 
+            AddUntilStep(() => loader.IsCurrentScreen(), "wait for current");
+
             AddStep("mouse in centre", () => InputManager.MoveMouseTo(loader.ScreenSpaceDrawQuad.Centre));
 
             AddUntilStep(() => !loader.IsCurrentScreen(), "wait for no longer current");
 
+            AddStep("exit loader", () => loader.Exit());
+
+            AddUntilStep(() => !loader.IsAlive, "wait for no longer alive");
+
             AddStep("load slow dummy beatmap", () =>
             {
                 SlowLoadPlayer slow = null;
 
-                Add(loader = new PlayerLoader(() => slow = new SlowLoadPlayer
+                stack.Push(loader = new PlayerLoader(() => slow = new SlowLoadPlayer
                 {
                     AllowPause = false,
                     AllowLeadIn = false,
diff --git a/osu.Game/Tests/Visual/OsuTestCase.cs b/osu.Game/Tests/Visual/OsuTestCase.cs
index 3dfcd0febd..74cd4684da 100644
--- a/osu.Game/Tests/Visual/OsuTestCase.cs
+++ b/osu.Game/Tests/Visual/OsuTestCase.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Tests.Visual
             // This is the earliest we can get OsuGameBase, which is used by the dummy working beatmap to find textures
             beatmap.Default = new DummyWorkingBeatmap(Dependencies.Get<OsuGameBase>());
 
-            Dependencies.CacheAs<BindableBeatmap>(beatmap);
+            Dependencies.CacheAs<Bindable<WorkingBeatmap>>(beatmap);
             Dependencies.CacheAs<IBindable<WorkingBeatmap>>(beatmap);
 
             Dependencies.CacheAs(Ruleset);