Move conditionReturnValue variable to src file in block tests

Author: adazem009

test/blocks/control_blocks_test.cpp

@@ -462,7 +462,7 @@ TEST_F(ControlBlocksTest, WaitUntil)
         builder.addObscuredInput("CONDITION", block);
         builder.build();
 
-        conditionReturnValue = false;
+        setConditionReturnValue(false);
         m_engine->start();
 
         m_engine->step();
@@ -471,7 +471,7 @@ TEST_F(ControlBlocksTest, WaitUntil)
         m_engine->step();
         ASSERT_TRUE(m_engine->isRunning());
 
-        conditionReturnValue = true;
+        setConditionReturnValue(true);
         m_engine->step();
         m_engine->step();
         ASSERT_FALSE(m_engine->isRunning());
@@ -533,15 +533,15 @@ TEST_F(ControlBlocksTest, RepeatUntil)
         builder.addObscuredInput("CONDITION", block);
         builder.build();
 
-        conditionReturnValue = false;
+        setConditionReturnValue(false);
         m_engine->start();
 
         testing::internal::CaptureStdout();
         m_engine->step();
         ASSERT_EQ(testing::internal::GetCapturedStdout().substr(0, 10), "test\ntest\n");
         ASSERT_TRUE(m_engine->isRunning());
 
-        conditionReturnValue = true;
+        setConditionReturnValue(true);
         m_engine->step();
         m_engine->step();
         ASSERT_FALSE(m_engine->isRunning());
@@ -620,15 +620,15 @@ TEST_F(ControlBlocksTest, While)
         builder.addObscuredInput("CONDITION", block);
         builder.build();
 
-        conditionReturnValue = true;
+        setConditionReturnValue(true);
         m_engine->start();
 
         testing::internal::CaptureStdout();
         m_engine->step();
         ASSERT_EQ(testing::internal::GetCapturedStdout().substr(0, 10), "test\ntest\n");
         ASSERT_TRUE(m_engine->isRunning());
 
-        conditionReturnValue = false;
+        setConditionReturnValue(false);
         m_engine->step();
         m_engine->step();
         ASSERT_FALSE(m_engine->isRunning());

test/blocks/util.cpp

@@ -15,6 +15,8 @@
 namespace libscratchcpp
 {
 
+static bool conditionReturnValue = false;
+
 void registerBlocks(IEngine *engine, IExtension *extension)
 {
     engine->addCompileFunction(extension, "test_print", [](Compiler *compiler) -> CompilerValue * {
@@ -51,6 +53,11 @@ void registerBlocks(IEngine *engine, IExtension *extension)
     });
 }
 
+void setConditionReturnValue(bool newValue)
+{
+    conditionReturnValue = newValue;
+}
+
 extern "C" void test_print(const StringPtr *str)
 {
     std::cout << utf8::utf16to8(std::u16string(str->data)) << std::endl;

test/blocks/util.h

@@ -6,8 +6,7 @@ namespace libscratchcpp
 class IEngine;
 class IExtension;
 
-bool conditionReturnValue = false;
-
 void registerBlocks(IEngine *engine, IExtension *extension);
+void setConditionReturnValue(bool newValue);
 
 } // namespace libscratchcpp