From 4013c96ca556410b3d4feddd729bb37f58ac3aa1 Mon Sep 17 00:00:00 2001
From: ansel <79257300125@ya.ru>
Date: Tue, 27 Sep 2022 22:40:53 +0300
Subject: [PATCH] Fix test failures

---
 .../Visual/Online/TestSceneCommentActions.cs  | 15 +++++++-------
 .../Online/TestSceneCommentsContainer.cs      | 20 ++++++++++++++-----
 .../Visual/Online/TestSceneDrawableComment.cs |  5 +++++
 .../TestSceneOfflineCommentsContainer.cs      |  5 +++++
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
index 2ffdc3be27..88e4d6e83b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentActions.cs
@@ -34,9 +34,9 @@ namespace osu.Game.Tests.Visual.Online
         [SetUpSteps]
         public void SetUp()
         {
-            API.Login("test", "test");
             Schedule(() =>
             {
+                API.Login("test", "test");
                 if (dialogOverlay.Parent != null) Remove(dialogOverlay, false);
                 Children = new Container<Drawable>[]
                 {
@@ -55,11 +55,11 @@ namespace osu.Game.Tests.Visual.Online
         {
             addTestComments();
 
-            AddAssert("First comment has button", () =>
+            AddUntilStep("First comment has button", () =>
             {
                 var comments = this.ChildrenOfType<DrawableComment>();
-                var ourComment = comments.Single(x => x.Comment.Id == 1);
-                return ourComment.ChildrenOfType<OsuSpriteText>().Any(x => x.Text == "Delete");
+                var ourComment = comments.SingleOrDefault(x => x.Comment.Id == 1);
+                return ourComment != null && ourComment.ChildrenOfType<OsuSpriteText>().Any(x => x.Text == "Delete");
             });
 
             AddAssert("Second doesn't", () =>
@@ -73,14 +73,15 @@ namespace osu.Game.Tests.Visual.Online
         [Test]
         public void TestDeletion()
         {
-            DrawableComment ourComment = null!;
+            DrawableComment? ourComment = null;
             bool delete = false;
 
             addTestComments();
-            AddStep("Comment exists", () =>
+            AddUntilStep("Comment exists", () =>
             {
                 var comments = this.ChildrenOfType<DrawableComment>();
-                ourComment = comments.Single(x => x.Comment.Id == 1);
+                ourComment = comments.SingleOrDefault(x => x.Comment.Id == 1);
+                return ourComment != null;
             });
             AddStep("It has delete button", () =>
             {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index a94b9e61c0..08881e9718 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -25,17 +25,27 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
+        [Cached]
+        private readonly DialogOverlay dialogOverlay = new DialogOverlay();
+
         private DummyAPIAccess dummyAPI => (DummyAPIAccess)API;
 
         private CommentsContainer commentsContainer;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
-            Child = new BasicScrollContainer
+        {
+            if (dialogOverlay.Parent != null) Remove(dialogOverlay, false);
+            Children = new Drawable[]
             {
-                RelativeSizeAxes = Axes.Both,
-                Child = commentsContainer = new CommentsContainer()
-            });
+                new BasicScrollContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Child = commentsContainer = new CommentsContainer()
+                },
+                dialogOverlay
+            };
+        });
 
         [Test]
         public void TestIdleState()
@@ -139,7 +149,7 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-        private CommentBundle getExampleComments(bool withPinned = false)
+        private static CommentBundle getExampleComments(bool withPinned = false)
         {
             var bundle = new CommentBundle
             {
diff --git a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
index cab0ffa3ba..7253424984 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
@@ -20,11 +20,15 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Purple);
 
+        [Cached]
+        private readonly DialogOverlay dialogOverlay = new DialogOverlay();
+
         private Container container;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            if (dialogOverlay.Parent != null) Remove(dialogOverlay, false);
             Children = new Drawable[]
             {
                 new Box
@@ -37,6 +41,7 @@ namespace osu.Game.Tests.Visual.Online
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                 },
+                dialogOverlay
             };
         });
 
diff --git a/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs
index 07ccfcec88..46bbbd635a 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs
@@ -24,17 +24,22 @@ namespace osu.Game.Tests.Visual.Online
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
+        [Cached]
+        private readonly DialogOverlay dialogOverlay = new DialogOverlay();
+
         private TestCommentsContainer comments;
 
         [SetUp]
         public void SetUp() => Schedule(() =>
         {
+            if (dialogOverlay.Parent != null) Remove(dialogOverlay, false);
             Clear();
             Add(new BasicScrollContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Child = comments = new TestCommentsContainer()
             });
+            Add(dialogOverlay);
         });
 
         [Test]