From 415adecdf68c07d8882ca7ecdb2c099d6749243a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 11 Apr 2020 18:02:43 +0900
Subject: [PATCH] Add support for Result fetching

---
 osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs | 8 ++++++--
 osu.Game/Online/API/APIRequest.cs                    | 8 +++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
index bf3e1204d7..5b169cccdf 100644
--- a/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
+++ b/osu.Game.Tests/Online/TestDummyAPIRequestHandling.cs
@@ -10,7 +10,8 @@ namespace osu.Game.Tests.Online
 {
     public class TestDummyAPIRequestHandling : OsuTestScene
     {
-        public TestDummyAPIRequestHandling()
+        [Test]
+        public void TestGenericRequestHandling()
         {
             AddStep("register request handling", () => ((DummyAPIAccess)API).HandleRequest = req =>
             {
@@ -33,7 +34,10 @@ namespace osu.Game.Tests.Online
                 API.Queue(request);
             });
 
-            AddAssert("got response", () => response != null);
+            AddAssert("response event fired", () => response != null);
+
+            AddAssert("request has response", () => request.Result == response);
+        }
         }
     }
 }
diff --git a/osu.Game/Online/API/APIRequest.cs b/osu.Game/Online/API/APIRequest.cs
index 1f0eae4965..34b69b3c09 100644
--- a/osu.Game/Online/API/APIRequest.cs
+++ b/osu.Game/Online/API/APIRequest.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
 using osu.Framework.Logging;
@@ -98,10 +99,15 @@ namespace osu.Game.Online.API
             {
                 if (cancelled) return;
 
-                Success?.Invoke();
+                TriggerSuccess();
             });
         }
 
+        internal void TriggerSuccess()
+        {
+            Success?.Invoke();
+        }
+
         public void Cancel() => Fail(new OperationCanceledException(@"Request cancelled"));
 
         public void Fail(Exception e)