From 089ec4c7922a18fe4f4da718bbc4ede63ddf6289 Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Sat, 29 Feb 2020 21:16:28 -0800
Subject: [PATCH 01/15] Test scene for mod development

---
 .../TestSceneCatchModSandbox.cs               |  28 +++++
 .../TestSceneManiaModSandbox.cs               |  28 +++++
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   |  20 ++++
 .../TestSceneOsuModSandbox.cs                 |  28 +++++
 .../TestSceneTaikoModSandbox.cs               |  28 +++++
 osu.Game/Tests/Visual/PlayerTestScene.cs      |   4 +-
 osu.Game/Tests/Visual/TestSceneModSandbox.cs  | 108 ++++++++++++++++++
 7 files changed, 242 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
 create mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
 create mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
 create mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
 create mode 100644 osu.Game/Tests/Visual/TestSceneModSandbox.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
new file mode 100644
index 0000000000..3abf8163bd
--- /dev/null
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
@@ -0,0 +1,28 @@
+// 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 System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Catch.Tests
+{
+    [TestFixture]
+    public class TestSceneCatchModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneCatchModSandbox)).ToList();
+
+        public TestSceneCatchModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneCatchModSandbox(Mod mod = null)
+            : base(new CatchRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
new file mode 100644
index 0000000000..2693cebb43
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
@@ -0,0 +1,28 @@
+// 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 System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Mania.Tests
+{
+    [TestFixture]
+    public class TestSceneManiaModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneManiaModSandbox)).ToList();
+
+        public TestSceneManiaModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneManiaModSandbox(Mod mod = null)
+            : base(new ManiaRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
new file mode 100644
index 0000000000..7f09731a11
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -0,0 +1,20 @@
+// 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 System.Linq;
+using osu.Game.Rulesets.Osu.Mods;
+
+namespace osu.Game.Rulesets.Osu.Tests.Mods
+{
+    public class TestSceneOsuModDifficultyAdjust : TestSceneOsuModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
+
+        public TestSceneOsuModDifficultyAdjust()
+            : base(new OsuModDifficultyAdjust())
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
new file mode 100644
index 0000000000..d2a9d1ea6e
--- /dev/null
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
@@ -0,0 +1,28 @@
+// 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 System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Osu.Tests
+{
+    [TestFixture]
+    public class TestSceneOsuModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneOsuModSandbox)).ToList();
+
+        public TestSceneOsuModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneOsuModSandbox(Mod mod = null)
+            : base(new OsuRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
new file mode 100644
index 0000000000..f5481713f5
--- /dev/null
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
@@ -0,0 +1,28 @@
+// 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 System.Linq;
+using NUnit.Framework;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Rulesets.Taiko.Tests
+{
+    [TestFixture]
+    public class TestSceneTaikoModSandbox : TestSceneModSandbox
+    {
+        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneTaikoModSandbox)).ToList();
+
+        public TestSceneTaikoModSandbox()
+            : this(null)
+        {
+        }
+
+        public TestSceneTaikoModSandbox(Mod mod = null)
+            : base(new TaikoRuleset(), mod)
+        {
+        }
+    }
+}
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 7c5ba7d30f..1ca5256353 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
-            AddStep(ruleset.RulesetInfo.Name, loadPlayer);
+            AddStep(ruleset.RulesetInfo.Name, LoadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
 
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Visual
 
         protected virtual bool Autoplay => false;
 
-        private void loadPlayer()
+        protected void LoadPlayer()
         {
             var beatmap = CreateBeatmap(ruleset.RulesetInfo);
 
diff --git a/osu.Game/Tests/Visual/TestSceneModSandbox.cs b/osu.Game/Tests/Visual/TestSceneModSandbox.cs
new file mode 100644
index 0000000000..5c32ebadce
--- /dev/null
+++ b/osu.Game/Tests/Visual/TestSceneModSandbox.cs
@@ -0,0 +1,108 @@
+// 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 System.Linq;
+using System.Reflection;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Game.Configuration;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Overlays.Mods;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.Visual
+{
+    public abstract class TestSceneModSandbox : PlayerTestScene
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(TestSceneModSandbox)
+        };
+
+        protected Mod Mod;
+        private readonly TriangleButton button;
+
+        protected TestSceneModSandbox(Ruleset ruleset, Mod mod = null)
+            : base(ruleset)
+        {
+            Mod = mod ?? new SandboxMod();
+
+            var props = Mod.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
+            var hasSettings = props.Any(prop => prop.GetCustomAttribute<SettingSourceAttribute>(true) != null);
+
+            Child = new FillFlowContainer
+            {
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+                Padding = new MarginPadding(50),
+                Margin = new MarginPadding { Bottom = 20 },
+                Width = 0.4f,
+                Anchor = Anchor.BottomLeft,
+                Origin = Anchor.BottomLeft,
+                Children = new Drawable[]
+                {
+                    new ModControlSection(Mod, Mod.CreateSettingsControls()),
+                    button = new TriangleButton
+                    {
+                        RelativeSizeAxes = Axes.X,
+                        Width = 0.5f,
+                        Text = "Start",
+                        Action = () =>
+                        {
+                            button.Text = hasSettings ? "Apply Settings" : "Restart";
+                            LoadPlayer();
+                        }
+                    }
+                }
+            };
+        }
+
+        [SetUpSteps]
+        public override void SetUpSteps()
+        {
+        }
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            LocalConfig.GetBindable<bool>(OsuSetting.KeyOverlay).Value = true;
+        }
+
+        protected override Player CreatePlayer(Ruleset ruleset)
+        {
+            SelectedMods.Value = SelectedMods.Value.Append(Mod).ToArray();
+
+            return base.CreatePlayer(ruleset);
+        }
+
+        protected class SandboxMod : Mod
+        {
+            public override string Name => "Sandbox Test";
+            public override string Acronym => "ST";
+            public override double ScoreMultiplier => 1.0;
+
+            [SettingSource("Test Setting")]
+            public Bindable<bool> TestSetting1 { get; } = new BindableBool
+            {
+                Default = true,
+                Value = true
+            };
+
+            [SettingSource("Test Setting 2")]
+            public Bindable<float> TestSetting2 { get; } = new BindableFloat
+            {
+                Precision = 0.1f,
+                MinValue = 0,
+                MaxValue = 20
+            };
+        }
+    }
+}

From a02c5710ac07a2486be020a7b0e2d1d4feb035b1 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 10:06:49 +0900
Subject: [PATCH 02/15] Rename base class

---
 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs   | 2 +-
 osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs   | 2 +-
 osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs       | 2 +-
 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs   | 2 +-
 .../{TestSceneModSandbox.cs => ModSandboxTestScene.cs}      | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename osu.Game/Tests/Visual/{TestSceneModSandbox.cs => ModSandboxTestScene.cs} (95%)

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
index 3abf8163bd..3e94121fd7 100644
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
+++ b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchModSandbox : TestSceneModSandbox
+    public class TestSceneCatchModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneCatchModSandbox)).ToList();
 
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
index 2693cebb43..897e7df1e9 100644
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
+++ b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Mania.Tests
 {
     [TestFixture]
-    public class TestSceneManiaModSandbox : TestSceneModSandbox
+    public class TestSceneManiaModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneManiaModSandbox)).ToList();
 
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
index d2a9d1ea6e..9f816ef2ed 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Osu.Tests
 {
     [TestFixture]
-    public class TestSceneOsuModSandbox : TestSceneModSandbox
+    public class TestSceneOsuModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneOsuModSandbox)).ToList();
 
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
index f5481713f5..ef62c7ed56 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
@@ -11,7 +11,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Taiko.Tests
 {
     [TestFixture]
-    public class TestSceneTaikoModSandbox : TestSceneModSandbox
+    public class TestSceneTaikoModSandbox : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneTaikoModSandbox)).ToList();
 
diff --git a/osu.Game/Tests/Visual/TestSceneModSandbox.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
similarity index 95%
rename from osu.Game/Tests/Visual/TestSceneModSandbox.cs
rename to osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 5c32ebadce..bb872123c5 100644
--- a/osu.Game/Tests/Visual/TestSceneModSandbox.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -19,17 +19,17 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class TestSceneModSandbox : PlayerTestScene
+    public abstract class ModSandboxTestScene : PlayerTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(TestSceneModSandbox)
+            typeof(ModSandboxTestScene)
         };
 
         protected Mod Mod;
         private readonly TriangleButton button;
 
-        protected TestSceneModSandbox(Ruleset ruleset, Mod mod = null)
+        protected ModSandboxTestScene(Ruleset ruleset, Mod mod = null)
             : base(ruleset)
         {
             Mod = mod ?? new SandboxMod();

From 5c15704c819ab25868c48f511a26b417a2bb96d0 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 10:28:39 +0900
Subject: [PATCH 03/15] Improve abstract structure for testability

---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs | 96 ++++++--------------
 osu.Game/Tests/Visual/TestReplayPlayer.cs    | 24 +++++
 2 files changed, 50 insertions(+), 70 deletions(-)
 create mode 100644 osu.Game/Tests/Visual/TestReplayPlayer.cs

diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index bb872123c5..84bab6a9b9 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -4,15 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using osu.Framework.Allocation;
-using osu.Framework.Bindables;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Testing;
-using osu.Game.Configuration;
-using osu.Game.Graphics.UserInterface;
-using osu.Game.Overlays.Mods;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
@@ -26,83 +18,47 @@ namespace osu.Game.Tests.Visual
             typeof(ModSandboxTestScene)
         };
 
-        protected Mod Mod;
-        private readonly TriangleButton button;
-
-        protected ModSandboxTestScene(Ruleset ruleset, Mod mod = null)
+        protected ModSandboxTestScene(Ruleset ruleset)
             : base(ruleset)
         {
-            Mod = mod ?? new SandboxMod();
-
-            var props = Mod.GetType().GetProperties(BindingFlags.GetProperty | BindingFlags.Public | BindingFlags.Instance);
-            var hasSettings = props.Any(prop => prop.GetCustomAttribute<SettingSourceAttribute>(true) != null);
-
-            Child = new FillFlowContainer
-            {
-                RelativeSizeAxes = Axes.X,
-                AutoSizeAxes = Axes.Y,
-                Direction = FillDirection.Vertical,
-                Padding = new MarginPadding(50),
-                Margin = new MarginPadding { Bottom = 20 },
-                Width = 0.4f,
-                Anchor = Anchor.BottomLeft,
-                Origin = Anchor.BottomLeft,
-                Children = new Drawable[]
-                {
-                    new ModControlSection(Mod, Mod.CreateSettingsControls()),
-                    button = new TriangleButton
-                    {
-                        RelativeSizeAxes = Axes.X,
-                        Width = 0.5f,
-                        Text = "Start",
-                        Action = () =>
-                        {
-                            button.Text = hasSettings ? "Apply Settings" : "Restart";
-                            LoadPlayer();
-                        }
-                    }
-                }
-            };
         }
 
-        [SetUpSteps]
+        private ModTestCaseData currentTest;
+
         public override void SetUpSteps()
         {
+            foreach (var testCase in CreateTestCases())
+            {
+                AddStep("set test case", () => currentTest = testCase);
+                base.SetUpSteps();
+            }
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            LocalConfig.GetBindable<bool>(OsuSetting.KeyOverlay).Value = true;
-        }
+        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest.Beatmap;
 
         protected override Player CreatePlayer(Ruleset ruleset)
         {
-            SelectedMods.Value = SelectedMods.Value.Append(Mod).ToArray();
+            SelectedMods.Value = SelectedMods.Value.Append(currentTest.Mod).ToArray();
+
+            if (currentTest.Autoplay)
+            {
+                // We're simulating an auto-play via a replay so that the auto-play mod does not interfere
+                var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value);
+                var score = ruleset.GetAutoplayMod().CreateReplayScore(beatmap);
+
+                return new TestReplayPlayer(score, false, false);
+            }
 
             return base.CreatePlayer(ruleset);
         }
 
-        protected class SandboxMod : Mod
+        protected abstract ModTestCaseData[] CreateTestCases();
+
+        protected class ModTestCaseData
         {
-            public override string Name => "Sandbox Test";
-            public override string Acronym => "ST";
-            public override double ScoreMultiplier => 1.0;
-
-            [SettingSource("Test Setting")]
-            public Bindable<bool> TestSetting1 { get; } = new BindableBool
-            {
-                Default = true,
-                Value = true
-            };
-
-            [SettingSource("Test Setting 2")]
-            public Bindable<float> TestSetting2 { get; } = new BindableFloat
-            {
-                Precision = 0.1f,
-                MinValue = 0,
-                MaxValue = 20
-            };
+            public Mod Mod;
+            public bool Autoplay;
+            public IBeatmap Beatmap;
         }
     }
 }
diff --git a/osu.Game/Tests/Visual/TestReplayPlayer.cs b/osu.Game/Tests/Visual/TestReplayPlayer.cs
new file mode 100644
index 0000000000..e99fcc1e37
--- /dev/null
+++ b/osu.Game/Tests/Visual/TestReplayPlayer.cs
@@ -0,0 +1,24 @@
+// 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.Rulesets.UI;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestReplayPlayer : ReplayPlayer
+    {
+        protected override bool PauseOnFocusLost { get; }
+
+        public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
+
+        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
+
+        public TestReplayPlayer(Score score, bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
+            : base(score, allowPause, showResults)
+        {
+            PauseOnFocusLost = pauseOnFocusLost;
+        }
+    }
+}

From 239cfddcbb92503b662d89750953950b6a11a12d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 10:50:41 +0900
Subject: [PATCH 04/15] Improve test scenes/cases

---
 .../TestSceneCatchModSandbox.cs               | 28 -------
 .../TestSceneManiaModSandbox.cs               | 28 -------
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 38 +++++++++-
 .../TestSceneOsuModSandbox.cs                 | 28 -------
 .../TestSceneTaikoModSandbox.cs               | 28 -------
 osu.Game/Tests/Visual/ModSandboxTestScene.cs  | 73 +++++++++++++++----
 6 files changed, 95 insertions(+), 128 deletions(-)
 delete mode 100644 osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
 delete mode 100644 osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
 delete mode 100644 osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
 delete mode 100644 osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs

diff --git a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs b/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
deleted file mode 100644
index 3e94121fd7..0000000000
--- a/osu.Game.Rulesets.Catch.Tests/TestSceneCatchModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Catch.Tests
-{
-    [TestFixture]
-    public class TestSceneCatchModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneCatchModSandbox)).ToList();
-
-        public TestSceneCatchModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneCatchModSandbox(Mod mod = null)
-            : base(new CatchRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
deleted file mode 100644
index 897e7df1e9..0000000000
--- a/osu.Game.Rulesets.Mania.Tests/TestSceneManiaModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Mania.Tests
-{
-    [TestFixture]
-    public class TestSceneManiaModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneManiaModSandbox)).ToList();
-
-        public TestSceneManiaModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneManiaModSandbox(Mod mod = null)
-            : base(new ManiaRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 7f09731a11..46a3c1dff3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -5,16 +5,50 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring;
+using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDifficultyAdjust : TestSceneOsuModSandbox
+    public class TestSceneOsuModDifficultyAdjust : ModSandboxTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
 
         public TestSceneOsuModDifficultyAdjust()
-            : base(new OsuModDifficultyAdjust())
+            : base(new OsuRuleset())
         {
         }
+
+        protected override ModTestCaseData[] CreateTestCases() => new[]
+        {
+            new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
+            {
+                Autoplay = true,
+                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            },
+            new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+            {
+                Autoplay = true,
+                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            },
+            new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+            {
+                Autoplay = true,
+                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            },
+        };
+
+        protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
+
+        private class ScoreAccessibleTestPlayer : TestPlayer
+        {
+            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
+
+            public ScoreAccessibleTestPlayer(Score score)
+                : base(score)
+            {
+            }
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
deleted file mode 100644
index 9f816ef2ed..0000000000
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneOsuModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Osu.Tests
-{
-    [TestFixture]
-    public class TestSceneOsuModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneOsuModSandbox)).ToList();
-
-        public TestSceneOsuModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneOsuModSandbox(Mod mod = null)
-            : base(new OsuRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs b/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
deleted file mode 100644
index ef62c7ed56..0000000000
--- a/osu.Game.Rulesets.Taiko.Tests/TestSceneTaikoModSandbox.cs
+++ /dev/null
@@ -1,28 +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 System.Linq;
-using NUnit.Framework;
-using osu.Game.Rulesets.Mods;
-using osu.Game.Tests.Visual;
-
-namespace osu.Game.Rulesets.Taiko.Tests
-{
-    [TestFixture]
-    public class TestSceneTaikoModSandbox : ModSandboxTestScene
-    {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(TestSceneTaikoModSandbox)).ToList();
-
-        public TestSceneTaikoModSandbox()
-            : this(null)
-        {
-        }
-
-        public TestSceneTaikoModSandbox(Mod mod = null)
-            : base(new TaikoRuleset(), mod)
-        {
-        }
-    }
-}
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 84bab6a9b9..0610a145ae 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -4,9 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Game.Beatmaps;
+using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
@@ -29,36 +32,78 @@ namespace osu.Game.Tests.Visual
         {
             foreach (var testCase in CreateTestCases())
             {
-                AddStep("set test case", () => currentTest = testCase);
+                AddStep(testCase.Name, () => currentTest = testCase);
                 base.SetUpSteps();
+                AddUntilStep("test passed", () => testCase.PassCondition?.Invoke() ?? true);
             }
         }
 
-        protected override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest.Beatmap;
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest?.Beatmap ?? base.CreateBeatmap(ruleset);
 
-        protected override Player CreatePlayer(Ruleset ruleset)
+        protected sealed override Player CreatePlayer(Ruleset ruleset)
         {
             SelectedMods.Value = SelectedMods.Value.Append(currentTest.Mod).ToArray();
 
-            if (currentTest.Autoplay)
-            {
-                // We're simulating an auto-play via a replay so that the auto-play mod does not interfere
-                var beatmap = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value);
-                var score = ruleset.GetAutoplayMod().CreateReplayScore(beatmap);
+            var score = currentTest.Autoplay
+                ? ruleset.GetAutoplayMod().CreateReplayScore(Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value))
+                : new Score { Replay = new Replay() };
 
-                return new TestReplayPlayer(score, false, false);
-            }
-
-            return base.CreatePlayer(ruleset);
+            return CreateReplayPlayer(score);
         }
 
+        /// <summary>
+        /// Creates the test cases for this test scene.
+        /// </summary>
         protected abstract ModTestCaseData[] CreateTestCases();
 
+        /// <summary>
+        /// Creates the <see cref="TestPlayer"/> for a test case.
+        /// </summary>
+        /// <param name="score">The <see cref="Score"/>.</param>
+        protected virtual TestPlayer CreateReplayPlayer(Score score) => new TestPlayer(score);
+
+        protected class TestPlayer : TestReplayPlayer
+        {
+            public TestPlayer(Score score)
+                : base(score, false, false)
+            {
+            }
+        }
+
         protected class ModTestCaseData
         {
-            public Mod Mod;
-            public bool Autoplay;
+            /// <summary>
+            /// Whether to use a replay to simulate an auto-play. True by default.
+            /// </summary>
+            public bool Autoplay = true;
+
+            /// <summary>
+            /// The beatmap for this test case.
+            /// </summary>
+            [CanBeNull]
             public IBeatmap Beatmap;
+
+            /// <summary>
+            /// The conditions that cause this test case to pass.
+            /// </summary>
+            [CanBeNull]
+            public Func<bool> PassCondition;
+
+            /// <summary>
+            /// The name of this test case, displayed in the test browser.
+            /// </summary>
+            public readonly string Name;
+
+            /// <summary>
+            /// The <see cref="Mod"/> this test case tests.
+            /// </summary>
+            public readonly Mod Mod;
+
+            public ModTestCaseData(string name, Mod mod)
+            {
+                Name = name;
+                Mod = mod;
+            }
         }
     }
 }

From ce7cbf29ca1546f4fc8f1d81ca8cbb401537dfdf Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Mon, 2 Mar 2020 12:20:25 +0900
Subject: [PATCH 05/15] Move to using test methods for better separation

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 37 ++++++++++---------
 osu.Game/Tests/Visual/ModSandboxTestScene.cs  | 22 +++++------
 osu.Game/Tests/Visual/PlayerTestScene.cs      | 17 +++++++++
 osu.Game/Tests/Visual/ScreenTestScene.cs      |  2 +-
 4 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 46a3c1dff3..1fc9ccccd1 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
@@ -20,24 +21,26 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
         }
 
-        protected override ModTestCaseData[] CreateTestCases() => new[]
+        [Test]
+        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
         {
-            new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
-            {
-                Autoplay = true,
-                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
-            },
-            new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
-            {
-                Autoplay = true,
-                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
-            },
-            new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
-            {
-                Autoplay = true,
-                PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
-            },
-        };
+            Autoplay = true,
+            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+        });
+
+        [Test]
+        public void TestCircleSize10() => CreateModTest(new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        {
+            Autoplay = true,
+            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+        });
+
+        [Test]
+        public void TestApproachRate10() => CreateModTest(new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        {
+            Autoplay = true,
+            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+        });
 
         protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
 
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 0610a145ae..a1fa757452 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -16,6 +16,8 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class ModSandboxTestScene : PlayerTestScene
     {
+        protected sealed override bool HasCustomSteps => true;
+
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
             typeof(ModSandboxTestScene)
@@ -28,14 +30,15 @@ namespace osu.Game.Tests.Visual
 
         private ModTestCaseData currentTest;
 
-        public override void SetUpSteps()
+        protected void CreateModTest(ModTestCaseData testCaseData) => CreateTest(() =>
         {
-            foreach (var testCase in CreateTestCases())
-            {
-                AddStep(testCase.Name, () => currentTest = testCase);
-                base.SetUpSteps();
-                AddUntilStep("test passed", () => testCase.PassCondition?.Invoke() ?? true);
-            }
+            AddStep("set test data", () => currentTest = testCaseData);
+        });
+
+        public override void TearDownSteps()
+        {
+            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? true);
+            base.TearDownSteps();
         }
 
         protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest?.Beatmap ?? base.CreateBeatmap(ruleset);
@@ -51,11 +54,6 @@ namespace osu.Game.Tests.Visual
             return CreateReplayPlayer(score);
         }
 
-        /// <summary>
-        /// Creates the test cases for this test scene.
-        /// </summary>
-        protected abstract ModTestCaseData[] CreateTestCases();
-
         /// <summary>
         /// Creates the <see cref="TestPlayer"/> for a test case.
         /// </summary>
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 1ca5256353..0d5aac8cfd 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.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 System;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.IEnumerableExtensions;
@@ -14,6 +15,11 @@ namespace osu.Game.Tests.Visual
 {
     public abstract class PlayerTestScene : RateAdjustedBeatmapTestScene
     {
+        /// <summary>
+        /// Whether custom test steps are provided. Custom tests should invoke <see cref="CreateTest"/> to create the test steps.
+        /// </summary>
+        protected virtual bool HasCustomSteps { get; } = false;
+
         private readonly Ruleset ruleset;
 
         protected Player Player;
@@ -37,6 +43,17 @@ namespace osu.Game.Tests.Visual
         {
             base.SetUpSteps();
 
+            if (!HasCustomSteps)
+                CreateTest(null);
+        }
+
+        protected void CreateTest(Action action)
+        {
+            if (action != null && !HasCustomSteps)
+                throw new InvalidOperationException($"Cannot add custom test steps without {nameof(HasCustomSteps)} being set.");
+
+            action?.Invoke();
+
             AddStep(ruleset.RulesetInfo.Name, LoadPlayer);
             AddUntilStep("player loaded", () => Player.IsLoaded && Player.Alpha == 1);
         }
diff --git a/osu.Game/Tests/Visual/ScreenTestScene.cs b/osu.Game/Tests/Visual/ScreenTestScene.cs
index feca592049..d26aacf2bc 100644
--- a/osu.Game/Tests/Visual/ScreenTestScene.cs
+++ b/osu.Game/Tests/Visual/ScreenTestScene.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual
         public virtual void SetUpSteps() => addExitAllScreensStep();
 
         [TearDownSteps]
-        public void TearDownSteps() => addExitAllScreensStep();
+        public virtual void TearDownSteps() => addExitAllScreensStep();
 
         private void addExitAllScreensStep()
         {

From 90c2f7bd89620bc05cd0529f3a74780199e2fa0a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 12:13:36 +0900
Subject: [PATCH 06/15] Fail tests by default

---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index a1fa757452..8bfa373e46 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Tests.Visual
 
         public override void TearDownSteps()
         {
-            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? true);
+            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? false);
             base.TearDownSteps();
         }
 

From 1e26df64b6cc022123222e4e104fbb382670037d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 3 Mar 2020 12:58:07 +0900
Subject: [PATCH 07/15] Fix constructor test failures

---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 8bfa373e46..11612d0eca 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -37,7 +37,14 @@ namespace osu.Game.Tests.Visual
 
         public override void TearDownSteps()
         {
-            AddUntilStep("test passed", () => currentTest?.PassCondition?.Invoke() ?? false);
+            AddUntilStep("test passed", () =>
+            {
+                if (currentTest == null)
+                    return true;
+
+                return currentTest.PassCondition?.Invoke() ?? false;
+            });
+
             base.TearDownSteps();
         }
 

From c3f840cc1a5071ee92c758315d5c41ee12cd1dec Mon Sep 17 00:00:00 2001
From: voidedWarranties <wong.zhao@voidedxd.xyz>
Date: Tue, 3 Mar 2020 17:12:01 -0800
Subject: [PATCH 08/15] Fix Autoplay = false and AllowFail behavior

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs         |  6 +++---
 osu.Game/Tests/Visual/ModSandboxTestScene.cs        | 13 ++++++++-----
 osu.Game/Tests/Visual/PlayerTestScene.cs            |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 1fc9ccccd1..20cb9ef05d 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -42,14 +42,14 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
-        protected override TestPlayer CreateReplayPlayer(Score score) => new ScoreAccessibleTestPlayer(score);
+        protected override TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new ScoreAccessibleTestPlayer(score, allowFail);
 
         private class ScoreAccessibleTestPlayer : TestPlayer
         {
             public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
 
-            public ScoreAccessibleTestPlayer(Score score)
-                : base(score)
+            public ScoreAccessibleTestPlayer(Score score, bool allowFail)
+                : base(score, allowFail)
             {
             }
         }
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
index 11612d0eca..8a9cdf009b 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModSandboxTestScene.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Beatmaps;
-using osu.Game.Replays;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Scoring;
@@ -56,22 +55,26 @@ namespace osu.Game.Tests.Visual
 
             var score = currentTest.Autoplay
                 ? ruleset.GetAutoplayMod().CreateReplayScore(Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value))
-                : new Score { Replay = new Replay() };
+                : null;
 
-            return CreateReplayPlayer(score);
+            return CreateReplayPlayer(score, AllowFail);
         }
 
         /// <summary>
         /// Creates the <see cref="TestPlayer"/> for a test case.
         /// </summary>
         /// <param name="score">The <see cref="Score"/>.</param>
-        protected virtual TestPlayer CreateReplayPlayer(Score score) => new TestPlayer(score);
+        /// <param name="allowFail">Whether the player can fail.</param>
+        protected virtual TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new TestPlayer(score, allowFail);
 
         protected class TestPlayer : TestReplayPlayer
         {
-            public TestPlayer(Score score)
+            protected override bool AllowFail { get; }
+
+            public TestPlayer(Score score, bool allowFail)
                 : base(score, false, false)
             {
+                AllowFail = allowFail;
             }
         }
 
diff --git a/osu.Game/Tests/Visual/PlayerTestScene.cs b/osu.Game/Tests/Visual/PlayerTestScene.cs
index 0d5aac8cfd..17ad6e80df 100644
--- a/osu.Game/Tests/Visual/PlayerTestScene.cs
+++ b/osu.Game/Tests/Visual/PlayerTestScene.cs
@@ -68,6 +68,8 @@ namespace osu.Game.Tests.Visual
 
             Beatmap.Value = CreateWorkingBeatmap(beatmap);
 
+            SelectedMods.Value = Array.Empty<Mod>();
+
             if (!AllowFail)
             {
                 var noFailMod = ruleset.GetAllMods().FirstOrDefault(m => m is ModNoFail);

From ce3786cfd912b2cff9e7431e13cb7761352de8af Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:11:27 +0900
Subject: [PATCH 09/15] Rename to ModTestScene (is no longer a sandbox)

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs                 | 2 +-
 .../Visual/{ModSandboxTestScene.cs => ModTestScene.cs}      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename osu.Game/Tests/Visual/{ModSandboxTestScene.cs => ModTestScene.cs} (95%)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 20cb9ef05d..c2a7a5003f 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -12,7 +12,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
-    public class TestSceneOsuModDifficultyAdjust : ModSandboxTestScene
+    public class TestSceneOsuModDifficultyAdjust : ModTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
 
diff --git a/osu.Game/Tests/Visual/ModSandboxTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
similarity index 95%
rename from osu.Game/Tests/Visual/ModSandboxTestScene.cs
rename to osu.Game/Tests/Visual/ModTestScene.cs
index 8a9cdf009b..1ff061dfac 100644
--- a/osu.Game/Tests/Visual/ModSandboxTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -13,16 +13,16 @@ using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
-    public abstract class ModSandboxTestScene : PlayerTestScene
+    public abstract class ModTestScene : PlayerTestScene
     {
         protected sealed override bool HasCustomSteps => true;
 
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {
-            typeof(ModSandboxTestScene)
+            typeof(ModTestScene)
         };
 
-        protected ModSandboxTestScene(Ruleset ruleset)
+        protected ModTestScene(Ruleset ruleset)
             : base(ruleset)
         {
         }

From 2a581ef24786102d41709f08cde6747060418ed1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:15:17 +0900
Subject: [PATCH 10/15] Remove required types

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs                  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index c2a7a5003f..4a284022e2 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -1,9 +1,6 @@
 // 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 System.Linq;
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
 using osu.Game.Rulesets.Scoring;
@@ -14,8 +11,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
 {
     public class TestSceneOsuModDifficultyAdjust : ModTestScene
     {
-        public override IReadOnlyList<Type> RequiredTypes => base.RequiredTypes.Append(typeof(OsuModDifficultyAdjust)).ToList();
-
         public TestSceneOsuModDifficultyAdjust()
             : base(new OsuRuleset())
         {

From 0f1f1d1a6b91ce361913fbf2aa8bb6fe8a23fa01 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:18:37 +0900
Subject: [PATCH 11/15] Remove unused "name" parameter

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs               | 6 +++---
 osu.Game/Tests/Visual/ModTestScene.cs                     | 8 +-------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 4a284022e2..8ff55c9728 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -17,21 +17,21 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData("no adjustment", new OsuModDifficultyAdjust())
+        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust())
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestCircleSize10() => CreateModTest(new ModTestCaseData("cs = 10", new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        public void TestCircleSize10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestApproachRate10() => CreateModTest(new ModTestCaseData("ar = 10", new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        public void TestApproachRate10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 1ff061dfac..04f93fc683 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -97,19 +97,13 @@ namespace osu.Game.Tests.Visual
             [CanBeNull]
             public Func<bool> PassCondition;
 
-            /// <summary>
-            /// The name of this test case, displayed in the test browser.
-            /// </summary>
-            public readonly string Name;
-
             /// <summary>
             /// The <see cref="Mod"/> this test case tests.
             /// </summary>
             public readonly Mod Mod;
 
-            public ModTestCaseData(string name, Mod mod)
+            public ModTestCaseData(Mod mod)
             {
-                Name = name;
                 Mod = mod;
             }
         }

From 3b19467eadbcdf0bec89b240a7d981a599391acd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:19:42 +0900
Subject: [PATCH 12/15] ModTestCaseData -> ModTestData

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs            |  6 +++---
 osu.Game/Tests/Visual/ModTestScene.cs                  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 8ff55c9728..427f25fe11 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -17,21 +17,21 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust())
+        public void TestNoAdjustment() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust())
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestCircleSize10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        public void TestCircleSize10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestApproachRate10() => CreateModTest(new ModTestCaseData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        public void TestApproachRate10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
         {
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 04f93fc683..a8b40a5a68 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -27,11 +27,11 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        private ModTestCaseData currentTest;
+        private ModTestData currentTest;
 
-        protected void CreateModTest(ModTestCaseData testCaseData) => CreateTest(() =>
+        protected void CreateModTest(ModTestData testData) => CreateTest(() =>
         {
-            AddStep("set test data", () => currentTest = testCaseData);
+            AddStep("set test data", () => currentTest = testData);
         });
 
         public override void TearDownSteps()
@@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        protected class ModTestCaseData
+        protected class ModTestData
         {
             /// <summary>
             /// Whether to use a replay to simulate an auto-play. True by default.
@@ -102,7 +102,7 @@ namespace osu.Game.Tests.Visual
             /// </summary>
             public readonly Mod Mod;
 
-            public ModTestCaseData(Mod mod)
+            public ModTestData(Mod mod)
             {
                 Mod = mod;
             }

From fadebcdc03188cb171f453153530e55c6be6c7a9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 10:21:25 +0900
Subject: [PATCH 13/15] Move all sets to object initialiser for code formatting
 reasons

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs              | 9 ++++++---
 osu.Game/Tests/Visual/ModTestScene.cs                    | 7 +------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 427f25fe11..e4b1e30bcd 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -17,22 +17,25 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust())
+        public void TestNoAdjustment() => CreateModTest(new ModTestData()
         {
+            Mod = new OsuModDifficultyAdjust(),
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestCircleSize10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { CircleSize = { Value = 10 } })
+        public void TestCircleSize10() => CreateModTest(new ModTestData
         {
+            Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 10 } },
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
-        public void TestApproachRate10() => CreateModTest(new ModTestData(new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } })
+        public void TestApproachRate10() => CreateModTest(new ModTestData
         {
+            Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } },
             Autoplay = true,
             PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
         });
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index a8b40a5a68..3d12001cca 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -100,12 +100,7 @@ namespace osu.Game.Tests.Visual
             /// <summary>
             /// The <see cref="Mod"/> this test case tests.
             /// </summary>
-            public readonly Mod Mod;
-
-            public ModTestData(Mod mod)
-            {
-                Mod = mod;
-            }
+            public Mod Mod;
         }
     }
 }

From 26ce0d05d6f45f07cb6214b3f1036200f98513e6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 11:33:30 +0900
Subject: [PATCH 14/15] Use autoplay mod rather than local replay provider

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 22 ++--------
 osu.Game/Tests/Visual/ModTestScene.cs         | 41 ++++++++-----------
 osu.Game/Tests/Visual/TestReplayPlayer.cs     | 24 -----------
 3 files changed, 21 insertions(+), 66 deletions(-)
 delete mode 100644 osu.Game/Tests/Visual/TestReplayPlayer.cs

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index e4b1e30bcd..0a98f49526 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -3,8 +3,6 @@
 
 using NUnit.Framework;
 using osu.Game.Rulesets.Osu.Mods;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Scoring;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -17,11 +15,11 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         }
 
         [Test]
-        public void TestNoAdjustment() => CreateModTest(new ModTestData()
+        public void TestNoAdjustment() => CreateModTest(new ModTestData
         {
             Mod = new OsuModDifficultyAdjust(),
             Autoplay = true,
-            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
@@ -29,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
         });
 
         [Test]
@@ -37,19 +35,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => ((ScoreAccessibleTestPlayer)Player).ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
         });
-
-        protected override TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new ScoreAccessibleTestPlayer(score, allowFail);
-
-        private class ScoreAccessibleTestPlayer : TestPlayer
-        {
-            public new ScoreProcessor ScoreProcessor => base.ScoreProcessor;
-
-            public ScoreAccessibleTestPlayer(Score score, bool allowFail)
-                : base(score, allowFail)
-            {
-            }
-        }
     }
 }
diff --git a/osu.Game/Tests/Visual/ModTestScene.cs b/osu.Game/Tests/Visual/ModTestScene.cs
index 3d12001cca..9abe543bf6 100644
--- a/osu.Game/Tests/Visual/ModTestScene.cs
+++ b/osu.Game/Tests/Visual/ModTestScene.cs
@@ -3,13 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
@@ -27,52 +24,48 @@ namespace osu.Game.Tests.Visual
         {
         }
 
-        private ModTestData currentTest;
+        private ModTestData currentTestData;
 
         protected void CreateModTest(ModTestData testData) => CreateTest(() =>
         {
-            AddStep("set test data", () => currentTest = testData);
+            AddStep("set test data", () => currentTestData = testData);
         });
 
         public override void TearDownSteps()
         {
             AddUntilStep("test passed", () =>
             {
-                if (currentTest == null)
+                if (currentTestData == null)
                     return true;
 
-                return currentTest.PassCondition?.Invoke() ?? false;
+                return currentTestData.PassCondition?.Invoke() ?? false;
             });
 
             base.TearDownSteps();
         }
 
-        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTest?.Beatmap ?? base.CreateBeatmap(ruleset);
+        protected sealed override IBeatmap CreateBeatmap(RulesetInfo ruleset) => currentTestData?.Beatmap ?? base.CreateBeatmap(ruleset);
 
-        protected sealed override Player CreatePlayer(Ruleset ruleset)
+        protected sealed override TestPlayer CreatePlayer(Ruleset ruleset)
         {
-            SelectedMods.Value = SelectedMods.Value.Append(currentTest.Mod).ToArray();
+            var mods = new List<Mod>(SelectedMods.Value);
 
-            var score = currentTest.Autoplay
-                ? ruleset.GetAutoplayMod().CreateReplayScore(Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, SelectedMods.Value))
-                : null;
+            if (currentTestData.Mod != null)
+                mods.Add(currentTestData.Mod);
+            if (currentTestData.Autoplay)
+                mods.Add(ruleset.GetAutoplayMod());
 
-            return CreateReplayPlayer(score, AllowFail);
+            SelectedMods.Value = mods;
+
+            return new ModTestPlayer(AllowFail);
         }
 
-        /// <summary>
-        /// Creates the <see cref="TestPlayer"/> for a test case.
-        /// </summary>
-        /// <param name="score">The <see cref="Score"/>.</param>
-        /// <param name="allowFail">Whether the player can fail.</param>
-        protected virtual TestPlayer CreateReplayPlayer(Score score, bool allowFail) => new TestPlayer(score, allowFail);
-
-        protected class TestPlayer : TestReplayPlayer
+        protected class ModTestPlayer : TestPlayer
         {
             protected override bool AllowFail { get; }
 
-            public TestPlayer(Score score, bool allowFail)
-                : base(score, false, false)
+            public ModTestPlayer(bool allowFail)
+                : base(false, false)
             {
                 AllowFail = allowFail;
             }
diff --git a/osu.Game/Tests/Visual/TestReplayPlayer.cs b/osu.Game/Tests/Visual/TestReplayPlayer.cs
deleted file mode 100644
index e99fcc1e37..0000000000
--- a/osu.Game/Tests/Visual/TestReplayPlayer.cs
+++ /dev/null
@@ -1,24 +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.Rulesets.UI;
-using osu.Game.Scoring;
-using osu.Game.Screens.Play;
-
-namespace osu.Game.Tests.Visual
-{
-    public class TestReplayPlayer : ReplayPlayer
-    {
-        protected override bool PauseOnFocusLost { get; }
-
-        public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
-
-        public new GameplayClockContainer GameplayClockContainer => base.GameplayClockContainer;
-
-        public TestReplayPlayer(Score score, bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
-            : base(score, allowPause, showResults)
-        {
-            PauseOnFocusLost = pauseOnFocusLost;
-        }
-    }
-}

From 9a12909f09a377f9348a496f0e95a52c2b51cedf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 5 Mar 2020 11:53:04 +0900
Subject: [PATCH 15/15] Test ModDifficultyAdjust is actually taking effect

---
 .../Mods/TestSceneOsuModDifficultyAdjust.cs   | 51 +++++++++++++++++--
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
index 0a98f49526..69415b70e3 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDifficultyAdjust.cs
@@ -1,8 +1,14 @@
 // 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.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Osu.Mods;
+using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Osu.Tests.Mods
@@ -19,7 +25,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust(),
             Autoplay = true,
-            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
+            PassCondition = checkSomeHit
+        });
+
+        [Test]
+        public void TestCircleSize1() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 1 } },
+            Autoplay = true,
+            PassCondition = () => checkSomeHit() && checkObjectsScale(0.78f)
         });
 
         [Test]
@@ -27,7 +41,15 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { CircleSize = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => checkSomeHit() && checkObjectsScale(0.15f)
+        });
+
+        [Test]
+        public void TestApproachRate1() => CreateModTest(new ModTestData
+        {
+            Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 1 } },
+            Autoplay = true,
+            PassCondition = () => checkSomeHit() && checkObjectsPreempt(1680)
         });
 
         [Test]
@@ -35,7 +57,30 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
         {
             Mod = new OsuModDifficultyAdjust { ApproachRate = { Value = 10 } },
             Autoplay = true,
-            PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2
+            PassCondition = () => checkSomeHit() && checkObjectsPreempt(450)
         });
+
+        private bool checkObjectsPreempt(double target)
+        {
+            var objects = Player.ChildrenOfType<DrawableHitCircle>();
+            if (!objects.Any())
+                return false;
+
+            return objects.All(o => o.HitObject.TimePreempt == target);
+        }
+
+        private bool checkObjectsScale(float target)
+        {
+            var objects = Player.ChildrenOfType<DrawableHitCircle>();
+            if (!objects.Any())
+                return false;
+
+            return objects.All(o => Precision.AlmostEquals(o.ChildrenOfType<ShakeContainer>().First().Children.OfType<Container>().Single().Scale.X, target));
+        }
+
+        private bool checkSomeHit()
+        {
+            return Player.ScoreProcessor.JudgedHits >= 2;
+        }
     }
 }