From d8d7165164db8353541839e36889c44cda7b1e8d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 8 Nov 2017 13:52:44 +0900
Subject: [PATCH] Add a test case which starts the game

---
 osu.Game.Tests/Visual/TestCaseOsuGame.cs | 39 ++++++++++++++++++++++++
 osu.Game.Tests/osu.Game.Tests.csproj     |  1 +
 osu.Game/Screens/Loader.cs               |  4 +--
 osu.Game/Screens/Menu/MainMenu.cs        | 11 ++++---
 4 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 osu.Game.Tests/Visual/TestCaseOsuGame.cs

diff --git a/osu.Game.Tests/Visual/TestCaseOsuGame.cs b/osu.Game.Tests/Visual/TestCaseOsuGame.cs
new file mode 100644
index 0000000000..3f869e7378
--- /dev/null
+++ b/osu.Game.Tests/Visual/TestCaseOsuGame.cs
@@ -0,0 +1,39 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Timing;
+using osu.Game.Screens;
+using osu.Game.Screens.Menu;
+using OpenTK.Graphics;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseOsuGame : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(OsuLogo),
+        };
+
+        public TestCaseOsuGame()
+        {
+            var rateAdjustClock = new StopwatchClock(true);
+            var framedClock = new FramedClock(rateAdjustClock);
+            framedClock.ProcessFrame();
+
+            Add(new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.Black,
+            });
+
+            Add(new Loader());
+
+            AddSliderStep("Playback speed", 0.0, 2.0, 1, v => rateAdjustClock.Rate = v);
+        }
+    }
+}
diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj
index 4cc06df609..b1081890c8 100644
--- a/osu.Game.Tests/osu.Game.Tests.csproj
+++ b/osu.Game.Tests/osu.Game.Tests.csproj
@@ -122,6 +122,7 @@
     <Compile Include="Visual\TestCaseNotificationOverlay.cs" />
     <Compile Include="Visual\TestCaseOnScreenDisplay.cs" />
     <Compile Include="Visual\TestCaseAllPlayers.cs" />
+    <Compile Include="Visual\TestCaseOsuGame.cs" />
     <Compile Include="Visual\TestCasePlaySongSelect.cs" />
     <Compile Include="Visual\TestCaseReplay.cs" />
     <Compile Include="Visual\TestCaseReplaySettingsOverlay.cs" />
diff --git a/osu.Game/Screens/Loader.cs b/osu.Game/Screens/Loader.cs
index 6de53aeeb0..6680864368 100644
--- a/osu.Game/Screens/Loader.cs
+++ b/osu.Game/Screens/Loader.cs
@@ -8,7 +8,7 @@ using OpenTK;
 
 namespace osu.Game.Screens
 {
-    internal class Loader : OsuScreen
+    public class Loader : OsuScreen
     {
         public override bool ShowOverlays => false;
 
@@ -30,7 +30,7 @@ namespace osu.Game.Screens
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuGame game)
+        private void load(OsuGameBase game)
         {
             if (game.IsDeployedBuild)
                 LoadComponentAsync(new Disclaimer(), d => Push(d));
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 77e45c4575..7729211c4c 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -59,13 +59,16 @@ namespace osu.Game.Screens.Menu
             };
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OsuGame game)
+        [BackgroundDependencyLoader(true)]
+        private void load(OsuGame game = null)
         {
             LoadComponentAsync(background);
 
-            buttons.OnSettings = game.ToggleSettings;
-            buttons.OnDirect = game.ToggleDirect;
+            if (game != null)
+            {
+                buttons.OnSettings = game.ToggleSettings;
+                buttons.OnDirect = game.ToggleDirect;
+            }
 
             preloadSongSelect();
         }