Add elapsedTime() method to IStackTimer

Author: adazem009

include/scratchcpp/istacktimer.h

@@ -28,6 +28,9 @@ class LIBSCRATCHCPP_EXPORT IStackTimer
 
         /*! Returns true if the timer has elapsed. */
         virtual bool elapsed() const = 0;
+
+        /*! Returns the elapsed time in seconds. */
+        virtual double elapsedTime() const = 0;
 };
 
 } // namespace libscratchcpp

src/engine/internal/stacktimer.cpp

@@ -43,3 +43,11 @@ bool StackTimer::elapsed() const
 
     return std::chrono::duration_cast<std::chrono::milliseconds>(m_clock->currentSteadyTime() - m_startTime).count() >= m_timeLimit;
 }
+
+double StackTimer::elapsedTime() const
+{
+    if (m_stopped)
+        return 0;
+
+    return std::chrono::duration_cast<std::chrono::milliseconds>(m_clock->currentSteadyTime() - m_startTime).count() / 1000.0;
+}

src/engine/internal/stacktimer.h

@@ -22,6 +22,7 @@ class StackTimer : public IStackTimer
 
         bool stopped() const override;
         bool elapsed() const override;
+        double elapsedTime() const override;
 
     private:
         std::chrono::steady_clock::time_point m_startTime;

test/mocks/stacktimermock.h

@@ -13,4 +13,5 @@ class StackTimerMock : public IStackTimer
 
         MOCK_METHOD(bool, stopped, (), (const, override));
         MOCK_METHOD(bool, elapsed, (), (const, override));
+        MOCK_METHOD(double, elapsedTime, (), (const, override));
 };

test/timer/stacktimer_test.cpp

@@ -20,27 +20,32 @@ TEST(StackTimerTest, StartStopElapsed)
     EXPECT_CALL(clock, currentSteadyTime()).WillOnce(Return(time2));
     timer.start(0.5);
 
-    EXPECT_CALL(clock, currentSteadyTime()).WillOnce(Return(time2));
+    EXPECT_CALL(clock, currentSteadyTime()).Times(2).WillRepeatedly(Return(time2));
     ASSERT_FALSE(timer.elapsed());
     ASSERT_FALSE(timer.stopped());
+    ASSERT_EQ(timer.elapsedTime(), 0);
 
     std::chrono::steady_clock::time_point time3(std::chrono::milliseconds(520));
-    EXPECT_CALL(clock, currentSteadyTime()).WillOnce(Return(time3));
+    EXPECT_CALL(clock, currentSteadyTime()).Times(2).WillRepeatedly(Return(time3));
     ASSERT_FALSE(timer.elapsed());
     ASSERT_FALSE(timer.stopped());
+    ASSERT_EQ(timer.elapsedTime(), 0.447);
 
     std::chrono::steady_clock::time_point time4(std::chrono::milliseconds(573));
-    EXPECT_CALL(clock, currentSteadyTime()).WillOnce(Return(time4));
+    EXPECT_CALL(clock, currentSteadyTime()).Times(2).WillRepeatedly(Return(time4));
     ASSERT_TRUE(timer.elapsed());
     ASSERT_FALSE(timer.stopped());
+    ASSERT_EQ(timer.elapsedTime(), 0.5);
 
     std::chrono::steady_clock::time_point time5(std::chrono::milliseconds(580));
-    EXPECT_CALL(clock, currentSteadyTime()).WillOnce(Return(time5));
+    EXPECT_CALL(clock, currentSteadyTime()).Times(2).WillRepeatedly(Return(time5));
     ASSERT_TRUE(timer.elapsed());
     ASSERT_FALSE(timer.stopped());
+    ASSERT_EQ(timer.elapsedTime(), 0.507);
 
     timer.stop();
     EXPECT_CALL(clock, currentSteadyTime).Times(0);
     ASSERT_FALSE(timer.elapsed());
     ASSERT_TRUE(timer.stopped());
+    ASSERT_EQ(timer.elapsedTime(), 0);
 }