From 9d30b490ade53ada8771a704a03163c04f15028f Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 11 May 2022 18:26:04 +0300
Subject: [PATCH] Fix intermittent test failures in results screen

---
 .../Visual/Ranking/TestSceneResultsScreen.cs  | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
index a1d51683e4..2a5fc050d3 100644
--- a/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
@@ -103,7 +103,7 @@ namespace osu.Game.Tests.Visual.Ranking
             score.Accuracy = accuracy;
             score.Rank = rank;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen(score)));
+            loadResultsScreen(() => screen = createResultsScreen(score));
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
@@ -113,7 +113,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             UnrankedSoloResultsScreen screen = null;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createUnrankedSoloResultsScreen()));
+            loadResultsScreen(() => screen = createUnrankedSoloResultsScreen());
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
@@ -123,7 +123,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             TestResultsScreen screen = null;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            loadResultsScreen(() => screen = createResultsScreen());
             AddUntilStep("wait for load", () => this.ChildrenOfType<ScorePanelList>().Single().AllPanelsVisible);
 
             AddStep("click expanded panel", () =>
@@ -162,7 +162,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             TestResultsScreen screen = null;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            loadResultsScreen(() => screen = createResultsScreen());
             AddUntilStep("wait for load", () => this.ChildrenOfType<ScorePanelList>().Single().AllPanelsVisible);
 
             AddStep("click expanded panel", () =>
@@ -201,7 +201,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             TestResultsScreen screen = null;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            loadResultsScreen(() => screen = createResultsScreen());
             AddUntilStep("wait for load", () => this.ChildrenOfType<ScorePanelList>().Single().AllPanelsVisible);
 
             ScorePanel expandedPanel = null;
@@ -231,7 +231,7 @@ namespace osu.Game.Tests.Visual.Ranking
 
             var tcs = new TaskCompletionSource<bool>();
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = new DelayedFetchResultsScreen(TestResources.CreateTestScoreInfo(), tcs.Task)));
+            loadResultsScreen(() => screen = new DelayedFetchResultsScreen(TestResources.CreateTestScoreInfo(), tcs.Task));
 
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
 
@@ -255,7 +255,7 @@ namespace osu.Game.Tests.Visual.Ranking
         {
             TestResultsScreen screen = null;
 
-            AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
+            loadResultsScreen(() => screen = createResultsScreen());
             AddUntilStep("wait for load", () => this.ChildrenOfType<ScorePanelList>().Single().AllPanelsVisible);
 
             AddAssert("download button is disabled", () => !screen.ChildrenOfType<DownloadButton>().Last().Enabled.Value);
@@ -276,7 +276,7 @@ namespace osu.Game.Tests.Visual.Ranking
             var ruleset = new RulesetWithNoPerformanceCalculator();
             var score = TestResources.CreateTestScoreInfo(ruleset.RulesetInfo);
 
-            AddStep("load results", () => Child = new TestResultsContainer(createResultsScreen(score)));
+            loadResultsScreen(() => createResultsScreen(score));
             AddUntilStep("wait for load", () => this.ChildrenOfType<ScorePanelList>().Single().AllPanelsVisible);
 
             AddAssert("PP displayed as 0", () =>
@@ -287,6 +287,22 @@ namespace osu.Game.Tests.Visual.Ranking
             });
         }
 
+        private void loadResultsScreen(Func<ResultsScreen> createResults)
+        {
+            ResultsScreen results = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(results = createResults()));
+
+            // expanded panel should be centered the moment results screen is loaded
+            // but can potentially be scrolled away on certain specific load scenarios.
+            // see: https://github.com/ppy/osu/issues/18226
+            AddUntilStep("expanded panel in centre of screen", () =>
+            {
+                var expandedPanel = this.ChildrenOfType<ScorePanel>().Single(p => p.State == PanelState.Expanded);
+                return Precision.AlmostEquals(expandedPanel.ScreenSpaceDrawQuad.Centre.X, results.ScreenSpaceDrawQuad.Centre.X, 1);
+            });
+        }
+
         private TestResultsScreen createResultsScreen(ScoreInfo score = null) => new TestResultsScreen(score ?? TestResources.CreateTestScoreInfo());
 
         private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(TestResources.CreateTestScoreInfo());