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] 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);