From ff60d652ed6094054125990375dc9edc8ea05313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 8 Jan 2021 22:28:21 +0100
Subject: [PATCH] Move out test ongoing operation tracker to higher level

---
 .../Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs   | 6 +-----
 osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs   | 3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
index a6037dcbf2..8b9bffcee1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerReadyButton.cs
@@ -15,7 +15,6 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Online.Rooms;
 using osu.Game.Rulesets;
-using osu.Game.Screens.OnlinePlay;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
@@ -31,9 +30,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
         private BeatmapManager beatmaps;
         private RulesetStore rulesets;
 
-        [Cached]
-        private OngoingOperationTracker ongoingOperationTracker = new OngoingOperationTracker();
-
         private IDisposable readyClickOperation;
 
         [BackgroundDependencyLoader]
@@ -66,7 +62,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 },
                 OnReadyClick = async () =>
                 {
-                    readyClickOperation = ongoingOperationTracker.BeginOperation();
+                    readyClickOperation = OngoingOperationTracker.BeginOperation();
 
                     if (Client.IsHost && Client.LocalUser?.State == MultiplayerUserState.Ready)
                     {
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index da0e39d965..75ddb34685 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -23,6 +23,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
         [Cached]
         public Bindable<FilterCriteria> Filter { get; }
 
+        [Cached]
+        public OngoingOperationTracker OngoingOperationTracker { get; } = new OngoingOperationTracker();
+
         protected override Container<Drawable> Content => content;
         private readonly TestMultiplayerRoomContainer content;