From 3de35a15180fd37a72df6ae3bb72d589797f25ef Mon Sep 17 00:00:00 2001
From: Ryuki <thedjplays.gaming@gmail.com>
Date: Thu, 18 Aug 2022 18:40:02 +0200
Subject: [PATCH] Update calculator and tests to match changes on clocks

---
 .../Gameplay/TestSceneClicksPerSecond.cs      | 22 ++++++++++++++++---
 .../ClicksPerSecondCalculator.cs              |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
index 8a5bd1af0f..69868e07b4 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneClicksPerSecond.cs
@@ -47,7 +47,7 @@ namespace osu.Game.Tests.Visual.Gameplay
                         RelativeSizeAxes = Axes.Both,
                         CachedDependencies = new (Type, object)[]
                         {
-                            (typeof(GameplayClock), mainClock = new MockFrameStableClock(new MockFrameBasedClock())),
+                            (typeof(IGameplayClock), mainClock = new MockFrameStableClock(new MockFrameBasedClock())),
                             (typeof(DrawableRuleset), new MockDrawableRuleset(ruleset, mainClock))
                         }
                     },
@@ -249,17 +249,33 @@ namespace osu.Game.Tests.Visual.Gameplay
             public FrameTimeInfo TimeInfo { get; private set; }
         }
 
-        private class MockFrameStableClock : GameplayClock, IFrameStableClock
+        private class MockFrameStableClock : IGameplayClock, IFrameStableClock
         {
+            internal readonly IFrameBasedClock UnderlyingClock;
+
+            public readonly BindableBool IsPaused = new BindableBool();
+
             public MockFrameStableClock(MockFrameBasedClock underlyingClock)
-                : base(underlyingClock)
             {
+                UnderlyingClock = underlyingClock;
             }
 
             public void Seek(double time) => (UnderlyingClock as MockFrameBasedClock)?.Seek(time);
 
             public IBindable<bool> IsCatchingUp => new Bindable<bool>();
             public IBindable<bool> WaitingOnFrames => new Bindable<bool>();
+            public double CurrentTime => UnderlyingClock.CurrentTime;
+            public double Rate => UnderlyingClock.Rate;
+            public bool IsRunning => UnderlyingClock.IsRunning;
+            public void ProcessFrame() => UnderlyingClock.ProcessFrame();
+
+            public double ElapsedFrameTime => UnderlyingClock.ElapsedFrameTime;
+            public double FramesPerSecond => UnderlyingClock.FramesPerSecond;
+            public FrameTimeInfo TimeInfo => UnderlyingClock.TimeInfo;
+            public double TrueGameplayRate => UnderlyingClock.Rate;
+            public double? StartTime => 0;
+            public IEnumerable<double> NonGameplayAdjustments => Enumerable.Empty<double>();
+            IBindable<bool> IGameplayClock.IsPaused => IsPaused;
         }
 
         private class MockDrawableRuleset : DrawableRuleset
diff --git a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
index 9dc8615fb6..d9c3c6ffec 100644
--- a/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
+++ b/osu.Game/Screens/Play/HUD/ClicksPerSecond/ClicksPerSecondCalculator.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD.ClicksPerSecond
         private InputListener? listener;
 
         [Resolved]
-        private GameplayClock? gameplayClock { get; set; }
+        private IGameplayClock? gameplayClock { get; set; }
 
         [Resolved(canBeNull: true)]
         private DrawableRuleset? drawableRuleset { get; set; }