Merge pull request #485 from scratchcpp/monitor_section_and_name_setters

Add monitor block section and name setters

Author: adazem009

include/scratchcpp/monitor.h

@@ -38,6 +38,7 @@ class LIBSCRATCHCPP_EXPORT Monitor : public Entity
         void setInterface(IMonitorHandler *iface);
 
         const std::string &name() const;
+        void setName(const std::string &name);
 
         Mode mode() const;
         void setMode(Mode mode);
@@ -48,6 +49,7 @@ class LIBSCRATCHCPP_EXPORT Monitor : public Entity
         void setScript(std::shared_ptr<Script> script);
 
         std::shared_ptr<IBlockSection> blockSection() const;
+        void setBlockSection(std::shared_ptr<IBlockSection> blockSection);
 
         Sprite *sprite() const;
         void setSprite(Sprite *sprite);

src/scratch/monitor.cpp

@@ -41,6 +41,12 @@ const std::string &Monitor::name() const
     return impl->name;
 }
 
+/*! Sets the name of this monitor. */
+void Monitor::setName(const std::string &name)
+{
+    impl->name = name;
+}
+
 /*! Returns the monitor's mode. */
 Monitor::Mode Monitor::mode() const
 {
@@ -80,6 +86,12 @@ std::shared_ptr<IBlockSection> Monitor::blockSection() const
     return impl->blockSection;
 }
 
+/*! Sets the block section of this monitor. */
+void Monitor::setBlockSection(std::shared_ptr<IBlockSection> blockSection)
+{
+    impl->blockSection = blockSection;
+}
+
 /*! Convenience method which calls block()->target(). */
 Sprite *Monitor::sprite() const
 {

test/scratch_classes/CMakeLists.txt

@@ -222,6 +222,8 @@ gtest_discover_tests(comment_test)
 add_executable(
   monitor_test
   monitor_test.cpp
+  testsection.cpp
+  testsection.h
 )
 
 target_link_libraries(

test/scratch_classes/monitor_test.cpp

@@ -9,6 +9,7 @@
 #include <randomgeneratormock.h>
 
 #include "../common.h"
+#include "testsection.h"
 
 using namespace libscratchcpp;
 
@@ -47,6 +48,15 @@ TEST(MonitorTest, Interface)
     monitor.setInterface(&iface);
 }
 
+TEST(MonitorTest, Name)
+{
+    Monitor monitor("", "");
+    ASSERT_TRUE(monitor.name().empty());
+
+    monitor.setName("test");
+    ASSERT_EQ(monitor.name(), "test");
+}
+
 TEST(MonitorTest, Mode)
 {
     Monitor monitor("", "");
@@ -75,6 +85,16 @@ TEST(MonitorTest, Script)
     ASSERT_EQ(monitor.script(), script);
 }
 
+TEST(MonitorTest, BlockSection)
+{
+    Monitor monitor("", "");
+    ASSERT_EQ(monitor.blockSection(), nullptr);
+
+    auto section = std::make_shared<TestSection>();
+    monitor.setBlockSection(section);
+    ASSERT_EQ(monitor.blockSection(), section);
+}
+
 TEST(MonitorTest, Sprite)
 {
     Monitor monitor("", "");

test/scratch_classes/testsection.cpp

@@ -0,0 +1,14 @@
+#include <scratchcpp/iengine.h>
+
+#include "testsection.h"
+
+using namespace libscratchcpp;
+
+std::string TestSection::name() const
+{
+    return "Test";
+}
+
+void TestSection::registerBlocks(IEngine *engine)
+{
+}

test/scratch_classes/testsection.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <scratchcpp/iblocksection.h>
+
+namespace libscratchcpp
+{
+
+class TestSection : public IBlockSection
+{
+    public:
+        std::string name() const override;
+
+        void registerBlocks(IEngine *engine) override;
+};
+
+} // namespace libscratchcpp