Add answer getter to engine

Author: adazem009

include/scratchcpp/iengine.h

@@ -24,6 +24,7 @@ class Stage;
 class Variable;
 class List;
 class Script;
+class StringPtr;
 class Thread;
 class ITimer;
 class KeyEvent;
@@ -182,6 +183,12 @@ class LIBSCRATCHCPP_EXPORT IEngine
         /*! Call this when a target is clicked. */
         virtual void clickTarget(Target *target) = 0;
 
+        /*!
+         * Returns the answer received from the user.
+         * \see questionAnswered()
+         */
+        virtual const StringPtr *answer() const = 0;
+
         /*! Returns the stage width. */
         virtual unsigned int stageWidth() const = 0;
 

src/engine/internal/engine.cpp

@@ -50,12 +50,20 @@ Engine::Engine() :
     m_clock(Clock::instance().get()),
     m_audioEngine(IAudioEngine::instance())
 {
+    m_answer = string_pool_new();
+    string_assign_cstring(m_answer, "");
+
+    m_questionAnswered.connect([this](const std::string &answer) {
+        // Update answer
+        string_assign_cstring(m_answer, answer.c_str());
+    });
 }
 
 Engine::~Engine()
 {
     m_clones.clear();
     m_sortedDrawables.clear();
+    string_pool_free(m_answer);
 }
 
 void Engine::clear()
@@ -848,6 +856,11 @@ void Engine::clickTarget(Target *target)
     }
 }
 
+const StringPtr *Engine::answer() const
+{
+    return m_answer;
+}
+
 unsigned int Engine::stageWidth() const
 {
     return m_stageWidth;

src/engine/internal/engine.h

@@ -84,6 +84,8 @@ class Engine : public IEngine
 
         void clickTarget(Target *target) override;
 
+        const StringPtr *answer() const override;
+
         unsigned int stageWidth() const override;
         void setStageWidth(unsigned int width) override;
 
@@ -273,6 +275,7 @@ class Engine : public IEngine
         double m_mouseX = 0;
         double m_mouseY = 0;
         bool m_mousePressed = false;
+        StringPtr *m_answer = nullptr;
         unsigned int m_stageWidth = 480;
         unsigned int m_stageHeight = 360;
         int m_cloneLimit = 300;

test/engine/engine_test.cpp

@@ -1694,8 +1694,19 @@ TEST(EngineTest, CreateMissingMonitors)
     }
 }
 
-void questionFunction(const std::string &)
+TEST(EngineTest, Answer)
 {
+    Engine engine;
+    const StringPtr empty("");
+    const StringPtr test("test");
+    const StringPtr *answer = engine.answer();
+
+    ASSERT_TRUE(answer);
+    ASSERT_EQ(string_compare_case_sensitive(answer, &empty), 0);
+
+    engine.questionAnswered()("test");
+    answer = engine.answer();
+    ASSERT_EQ(string_compare_case_sensitive(answer, &test), 0);
 }
 
 TEST(EngineTest, Clones)

test/mocks/enginemock.h

@@ -66,6 +66,8 @@ class EngineMock : public IEngine
 
         MOCK_METHOD(void, clickTarget, (Target * target), (override));
 
+        MOCK_METHOD(const StringPtr *, answer, (), (const, override));
+
         MOCK_METHOD(unsigned int, stageWidth, (), (const, override));
         MOCK_METHOD(void, setStageWidth, (unsigned int), (override));