Merge pull request #174 from scratchcpp/engine_test

Add Engine test

Author: adazem009

src/engine/engine.cpp

@@ -193,7 +193,7 @@ void Engine::startScript(std::shared_ptr<Block> topLevelBlock, std::shared_ptr<T
     }
 }
 
-void libscratchcpp::Engine::broadcast(unsigned int index, VirtualMachine *sourceScript, bool wait)
+void Engine::broadcast(unsigned int index, VirtualMachine *sourceScript, bool wait)
 {
     bool previousSkipFrame = m_skipFrame;
     skipFrame();
@@ -305,7 +305,7 @@ void Engine::breakFrame()
     m_breakFrame = true;
 }
 
-bool libscratchcpp::Engine::breakingCurrentFrame()
+bool Engine::breakingCurrentFrame()
 {
     return m_breakFrame;
 }
@@ -337,6 +337,16 @@ void Engine::registerSection(std::shared_ptr<IBlockSection> section)
     }
 }
 
+std::vector<std::shared_ptr<IBlockSection>> Engine::registeredSections() const
+{
+    std::vector<std::shared_ptr<IBlockSection>> ret;
+
+    for (const auto &[key, value] : m_sections)
+        ret.push_back(key);
+
+    return ret;
+}
+
 unsigned int Engine::functionIndex(BlockFunc f)
 {
     auto it = std::find(m_functions.begin(), m_functions.end(), f);
@@ -346,39 +356,39 @@ unsigned int Engine::functionIndex(BlockFunc f)
     return m_functions.size() - 1;
 }
 
-void libscratchcpp::Engine::addCompileFunction(IBlockSection *section, const std::string &opcode, BlockComp f)
+void Engine::addCompileFunction(IBlockSection *section, const std::string &opcode, BlockComp f)
 {
     auto container = blockSectionContainer(section);
 
     if (container)
         container->addCompileFunction(opcode, f);
 }
 
-void libscratchcpp::Engine::addHatBlock(IBlockSection *section, const std::string &opcode)
+void Engine::addHatBlock(IBlockSection *section, const std::string &opcode)
 {
     auto container = blockSectionContainer(section);
 
     if (container)
         container->addHatBlock(opcode);
 }
 
-void libscratchcpp::Engine::addInput(IBlockSection *section, const std::string &name, int id)
+void Engine::addInput(IBlockSection *section, const std::string &name, int id)
 {
     auto container = blockSectionContainer(section);
 
     if (container)
         container->addInput(name, id);
 }
 
-void libscratchcpp::Engine::addField(IBlockSection *section, const std::string &name, int id)
+void Engine::addField(IBlockSection *section, const std::string &name, int id)
 {
     auto container = blockSectionContainer(section);
 
     if (container)
         container->addField(name, id);
 }
 
-void libscratchcpp::Engine::addFieldValue(IBlockSection *section, const std::string &value, int id)
+void Engine::addFieldValue(IBlockSection *section, const std::string &value, int id)
 {
     auto container = blockSectionContainer(section);
 
@@ -398,6 +408,9 @@ void Engine::setBroadcasts(const std::vector<std::shared_ptr<Broadcast>> &broadc
 
 std::shared_ptr<Broadcast> Engine::broadcastAt(int index) const
 {
+    if (index < 0 || index >= m_broadcasts.size())
+        return nullptr;
+
     return m_broadcasts[index];
 }
 
@@ -423,7 +436,7 @@ int Engine::findBroadcastById(const std::string &broadcastId) const
     return -1;
 }
 
-void libscratchcpp::Engine::addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, std::shared_ptr<Broadcast> broadcast)
+void Engine::addBroadcastScript(std::shared_ptr<Block> whenReceivedBlock, std::shared_ptr<Broadcast> broadcast)
 {
     auto id = findBroadcast(broadcast->name());
     if (m_broadcastMap.count(id) == 1) {
@@ -459,6 +472,9 @@ void Engine::setTargets(const std::vector<std::shared_ptr<Target>> &newTargets)
 
 Target *Engine::targetAt(int index) const
 {
+    if (index < 0 || index >= m_targets.size())
+        return nullptr;
+
     return m_targets[index].get();
 }
 

src/engine/engine.h

@@ -44,6 +44,7 @@ class Engine : public IEngine
         void lockFrame() override;
 
         void registerSection(std::shared_ptr<IBlockSection> section) override;
+        std::vector<std::shared_ptr<IBlockSection>> registeredSections() const;
         unsigned int functionIndex(BlockFunc f) override;
 
         void addCompileFunction(IBlockSection *section, const std::string &opcode, BlockComp f) override;
@@ -70,15 +71,16 @@ class Engine : public IEngine
 
         const std::unordered_map<std::shared_ptr<Block>, std::shared_ptr<Script>> &scripts() const override;
 
+        BlockSectionContainer *blockSectionContainer(const std::string &opcode) const;
+        BlockSectionContainer *blockSectionContainer(IBlockSection *section) const;
+
     private:
         std::shared_ptr<Block> getBlock(const std::string &id);
         std::shared_ptr<Variable> getVariable(const std::string &id);
         std::shared_ptr<List> getList(const std::string &id);
         std::shared_ptr<Broadcast> getBroadcast(const std::string &id);
         std::shared_ptr<Entity> getEntity(const std::string &id);
         std::shared_ptr<IBlockSection> blockSection(const std::string &opcode) const;
-        BlockSectionContainer *blockSectionContainer(const std::string &opcode) const;
-        BlockSectionContainer *blockSectionContainer(IBlockSection *section) const;
 
         std::unordered_map<std::shared_ptr<IBlockSection>, std::unique_ptr<BlockSectionContainer>> m_sections;
         std::vector<std::shared_ptr<Target>> m_targets;

test/CMakeLists.txt

@@ -27,3 +27,4 @@ add_subdirectory(scratchconfiguration)
 add_subdirectory(assets)
 add_subdirectory(script)
 add_subdirectory(extensions)
+add_subdirectory(engine)

test/engine/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_executable(
+  engine_test
+  engine_test.cpp
+  testsection.cpp
+  testsection.h
+)
+
+target_link_libraries(
+  engine_test
+  GTest::gtest_main
+  scratchcpp
+)
+
+gtest_discover_tests(engine_test)