From 653480b2f855d103405f7e4bdd6c041fd5967eed Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 29 Mar 2020 23:29:46 +0900
Subject: [PATCH] Add regression test

---
 .../Visual/Gameplay/TestSceneAllRulesetPlayers.cs |  4 ----
 .../Visual/Gameplay/TestSceneAutoplay.cs          | 15 +++++++++++++--
 osu.Game/Screens/Ranking/ResultsScreen.cs         |  8 ++++----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
index 83a7b896d2..b7dcad3825 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAllRulesetPlayers.cs
@@ -4,7 +4,6 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Framework.Screens;
 using osu.Game.Configuration;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Catch;
@@ -74,9 +73,6 @@ namespace osu.Game.Tests.Visual.Gameplay
             Beatmap.Value = working;
             SelectedMods.Value = new[] { ruleset.GetAllMods().First(m => m is ModNoFail) };
 
-            Player?.Exit();
-            Player = null;
-
             Player = CreatePlayer(ruleset);
 
             LoadScreen(Player);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
index 5ee17aeea2..43fb848ab8 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneAutoplay.cs
@@ -5,8 +5,11 @@ using System.ComponentModel;
 using System.Linq;
 using osu.Framework.Testing;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Play;
 using osu.Game.Screens.Play.Break;
+using osu.Game.Screens.Ranking;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {
@@ -17,8 +20,8 @@ namespace osu.Game.Tests.Visual.Gameplay
 
         protected override Player CreatePlayer(Ruleset ruleset)
         {
-            SelectedMods.Value = SelectedMods.Value.Concat(new[] { ruleset.GetAutoplayMod() }).ToArray();
-            return new TestPlayer(false, false);
+            SelectedMods.Value = new[] { ruleset.GetAutoplayMod() };
+            return new TestPlayer(false);
         }
 
         protected override void AddCheckSteps()
@@ -32,6 +35,14 @@ namespace osu.Game.Tests.Visual.Gameplay
             AddAssert("overlay displays 100% accuracy", () => Player.BreakOverlay.ChildrenOfType<BreakInfo>().Single().AccuracyDisplay.Current.Value == 1);
             AddStep("rewind", () => Player.GameplayClockContainer.Seek(-80000));
             AddUntilStep("key counter reset", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses == 0));
+
+            AddStep("complete", () => Player.GameplayClockContainer.Seek(Player.DrawableRuleset.Objects.Last().GetEndTime()));
+            AddUntilStep("results displayed", () => getResultsScreen() != null);
+
+            AddAssert("score has combo", () => getResultsScreen().Score.Combo > 100);
+            AddAssert("score has no misses", () => getResultsScreen().Score.Statistics[HitResult.Miss] == 0);
+
+            ResultsScreen getResultsScreen() => Stack.CurrentScreen as ResultsScreen;
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/ResultsScreen.cs b/osu.Game/Screens/Ranking/ResultsScreen.cs
index 803b33a998..5e0c30c4c0 100644
--- a/osu.Game/Screens/Ranking/ResultsScreen.cs
+++ b/osu.Game/Screens/Ranking/ResultsScreen.cs
@@ -31,13 +31,13 @@ namespace osu.Game.Screens.Ranking
         [Resolved(CanBeNull = true)]
         private Player player { get; set; }
 
-        private readonly ScoreInfo score;
+        public readonly ScoreInfo Score;
 
         private Drawable bottomPanel;
 
         public ResultsScreen(ScoreInfo score)
         {
-            this.score = score;
+            this.Score = score;
         }
 
         [BackgroundDependencyLoader]
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Ranking
             {
                 new ResultsScrollContainer
                 {
-                    Child = new ScorePanel(score)
+                    Child = new ScorePanel(Score)
                     {
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
@@ -77,7 +77,7 @@ namespace osu.Game.Screens.Ranking
                             Direction = FillDirection.Horizontal,
                             Children = new Drawable[]
                             {
-                                new ReplayDownloadButton(score) { Width = 300 },
+                                new ReplayDownloadButton(Score) { Width = 300 },
                                 new RetryButton { Width = 300 },
                             }
                         }