From 5bc970af0d5d26f655391ed43275e9869dbc15c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 1 Jul 2021 16:55:33 +0900
Subject: [PATCH] Make `TestPlayer` inherit from `SoloPlayer` for more
 flexibility in testing

---
 osu.Game/Screens/Play/SoloPlayer.cs | 10 ++++++++++
 osu.Game/Tests/Visual/TestPlayer.cs | 23 ++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Play/SoloPlayer.cs b/osu.Game/Screens/Play/SoloPlayer.cs
index d0ef4131dc..0099b4c87c 100644
--- a/osu.Game/Screens/Play/SoloPlayer.cs
+++ b/osu.Game/Screens/Play/SoloPlayer.cs
@@ -12,6 +12,16 @@ namespace osu.Game.Screens.Play
 {
     public class SoloPlayer : SubmittingPlayer
     {
+        public SoloPlayer()
+            : this(null)
+        {
+        }
+
+        protected SoloPlayer(PlayerConfiguration configuration = null)
+            : base(configuration)
+        {
+        }
+
         protected override APIRequest<APIScoreToken> CreateTokenRequest()
         {
             if (!(Beatmap.Value.BeatmapInfo.OnlineBeatmapID is int beatmapId))
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index 09da4db952..52eb06bdc6 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -1,14 +1,18 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Game.Online.API;
+using osu.Game.Online.Rooms;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
+using osu.Game.Scoring;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
@@ -16,7 +20,7 @@ namespace osu.Game.Tests.Visual
     /// <summary>
     /// A player that exposes many components that would otherwise not be available, for testing purposes.
     /// </summary>
-    public class TestPlayer : Player
+    public class TestPlayer : SoloPlayer
     {
         protected override bool PauseOnFocusLost { get; }
 
@@ -35,6 +39,9 @@ namespace osu.Game.Tests.Visual
 
         public new HealthProcessor HealthProcessor => base.HealthProcessor;
 
+        public bool TokenCreationRequested { get; private set; }
+        public bool SubmissionRequested { get; private set; }
+
         public new bool PauseCooldownActive => base.PauseCooldownActive;
 
         public readonly List<JudgementResult> Results = new List<JudgementResult>();
@@ -49,6 +56,20 @@ namespace osu.Game.Tests.Visual
             PauseOnFocusLost = pauseOnFocusLost;
         }
 
+        protected override bool HandleTokenRetrievalFailure(Exception exception) => false;
+
+        protected override APIRequest<APIScoreToken> CreateTokenRequest()
+        {
+            TokenCreationRequested = true;
+            return base.CreateTokenRequest();
+        }
+
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
+        {
+            SubmissionRequested = true;
+            return base.CreateSubmissionRequest(score, token);
+        }
+
         protected override void PrepareReplay()
         {
             // Generally, replay generation is handled by whatever is constructing the player.